From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH i-g-t v4 2/7] lib/igt_kms: Change output->pending_crtc_idx_mask to output->pending_pipe Date: Fri, 29 Sep 2017 11:59:32 +0200 Message-ID: <20170929095937.15702-3-maarten.lankhorst@linux.intel.com> References: <20170929095937.15702-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D2736EAA0 for ; Fri, 29 Sep 2017 09:59:41 +0000 (UTC) In-Reply-To: <20170929095937.15702-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org aWd0X291dHB1dF9zZXRfcGlwZSB3aXRoIFBJUEVfQU5ZIHVzZWQgdG8gbWVhbiB0aGF0IHdlIGJp bmQgdGhlIG91dHB1dAp0byBhbnkgcGlwZSwgYnV0IHRoaXMgaXMgbm93IGEgZGVwcmVjYXRlZCBh bGlhcyBmb3IgUElQRV9OT05FLCBhbmQKbWVhbnMgdGhlIG91dHB1dCB3aWxsIGJlIHVuYm91bmQu CgpCZWNhdXNlIG9mIHRoaXMgaXQncyBiZXR0ZXIgdG8gY2hhbmdlIG91dHB1dC0+cGVuZGluZ19j cnRjX2lkeF9tYXNrIHRvCmFuIGVudW0gcGlwZSwgYmVjYXVzZSBvbmx5IGEgc2luZ2xlIGNob2lj ZSBtYXkgYmUgZ2l2ZW4gZm9yIGEgcGlwZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hv cnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogbGliL2lndF9rbXMu YyAgICAgICAgICAgICAgICAgfCA0NiArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiBsaWIvaWd0X2ttcy5oICAgICAgICAgICAgICAgICB8ICAyICstCiB0ZXN0cy9r bXNfYXRvbWljX3RyYW5zaXRpb24uYyB8ICA0ICsrLS0KIHRlc3RzL2ttc19idXN5LmMgICAgICAg ICAgICAgIHwgIDIgKy0KIHRlc3RzL2ttc19jdXJzb3JfbGVnYWN5LmMgICAgIHwgIDIgKy0KIDUg ZmlsZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvbGliL2lndF9rbXMuYyBiL2xpYi9pZ3Rfa21zLmMKaW5kZXggN2JjYWZjMDcyZjcwLi5h NWRiNmJjNDkzYzIgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3Rfa21zLmMKKysrIGIvbGliL2lndF9rbXMu YwpAQCAtMTU2MSw5ICsxNTYxLDEwIEBAIHN0YXRpYyB2b2lkIGlndF9kaXNwbGF5X2xvZ19zaGlm dChpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBpbnQgc2hpZnQpCiBzdGF0aWMgdm9pZCBpZ3Rfb3V0 cHV0X3JlZnJlc2goaWd0X291dHB1dF90ICpvdXRwdXQpCiB7CiAJaWd0X2Rpc3BsYXlfdCAqZGlz cGxheSA9IG91dHB1dC0+ZGlzcGxheTsKLQl1bnNpZ25lZCBsb25nIGNydGNfaWR4X21hc2s7CisJ dW5zaWduZWQgbG9uZyBjcnRjX2lkeF9tYXNrID0gMDsKIAotCWNydGNfaWR4X21hc2sgPSBvdXRw dXQtPnBlbmRpbmdfY3J0Y19pZHhfbWFzazsKKwlpZiAob3V0cHV0LT5wZW5kaW5nX3BpcGUgIT0g UElQRV9OT05FKQorCQljcnRjX2lkeF9tYXNrID0gMSA8PCBvdXRwdXQtPnBlbmRpbmdfcGlwZTsK IAogCWttc3Rlc3RfZnJlZV9jb25uZWN0b3JfY29uZmlnKCZvdXRwdXQtPmNvbmZpZyk7CiAKQEAg LTE1ODcsMTEgKzE1ODgsOCBAQCBzdGF0aWMgdm9pZCBpZ3Rfb3V0cHV0X3JlZnJlc2goaWd0X291 dHB1dF90ICpvdXRwdXQpCiAJCQkJCQkgICAgQlJPQURDQVNUX1JHQl9GVUxMKTsKIAl9CiAKLQlp ZiAob3V0cHV0LT5jb25maWcucGlwZSA9PSBQSVBFX05PTkUpCi0JCXJldHVybjsKLQogCUxPRyhk aXNwbGF5LCAiJXM6IFNlbGVjdGluZyBwaXBlICVzXG4iLCBvdXRwdXQtPm5hbWUsCi0JICAgIGtt c3Rlc3RfcGlwZV9uYW1lKG91dHB1dC0+Y29uZmlnLnBpcGUpKTsKKwkgICAga21zdGVzdF9waXBl X25hbWUob3V0cHV0LT5wZW5kaW5nX3BpcGUpKTsKIH0KIAogc3RhdGljIGJvb2wKQEAgLTE4MzAs NyArMTgyOCw3IEBAIHZvaWQgaWd0X2Rpc3BsYXlfaW5pdChpZ3RfZGlzcGxheV90ICpkaXNwbGF5 LCBpbnQgZHJtX2ZkKQogCQkgKiBhIHBpcGUgaXMgc2V0IHdpdGggaWd0X291dHB1dF9zZXRfcGlw ZSgpLgogCQkgKi8KIAkJb3V0cHV0LT5mb3JjZV9yZXByb2JlID0gdHJ1ZTsKLQkJb3V0cHV0LT5w ZW5kaW5nX2NydGNfaWR4X21hc2sgPSAwOworCQlvdXRwdXQtPnBlbmRpbmdfcGlwZSA9IFBJUEVf Tk9ORTsKIAkJb3V0cHV0LT5pZCA9IHJlc291cmNlcy0+Y29ubmVjdG9yc1tpXTsKIAkJb3V0cHV0 LT5kaXNwbGF5ID0gZGlzcGxheTsKIApAQCAtMTk2MCwxMCArMTk1OCwxMiBAQCBzdGF0aWMgdm9p ZCBpZ3RfZGlzcGxheV9yZWZyZXNoKGlndF9kaXNwbGF5X3QgKmRpc3BsYXkpCiAJZm9yIChpID0g MDsgaSA8IGRpc3BsYXktPm5fb3V0cHV0czsgaSsrKSB7CiAJCW91dHB1dCA9ICZkaXNwbGF5LT5v dXRwdXRzW2ldOwogCi0JCWlmIChwaXBlc19pbl91c2UgJiBvdXRwdXQtPnBlbmRpbmdfY3J0Y19p ZHhfbWFzaykKLQkJCWdvdG8gcmVwb3J0X2R1cDsKKwkJaWYgKG91dHB1dC0+cGVuZGluZ19waXBl ICE9IFBJUEVfTk9ORSkgeworCQkJaWYgKHBpcGVzX2luX3VzZSAmICgxIDw8IG91dHB1dC0+cGVu ZGluZ19waXBlKSkKKwkJCQlnb3RvIHJlcG9ydF9kdXA7CiAKLQkJcGlwZXNfaW5fdXNlIHw9IG91 dHB1dC0+cGVuZGluZ19jcnRjX2lkeF9tYXNrOworCQkJcGlwZXNfaW5fdXNlIHw9IDEgPDwgb3V0 cHV0LT5wZW5kaW5nX3BpcGU7CisJCX0KIAogCQlpZiAob3V0cHV0LT5mb3JjZV9yZXByb2JlKQog CQkJaWd0X291dHB1dF9yZWZyZXNoKG91dHB1dCk7CkBAIC0xOTc1LDExICsxOTc1LDExIEBAIHJl cG9ydF9kdXA6CiAJZm9yICg7IGkgPiAwOyBpLS0pIHsKIAkJaWd0X291dHB1dF90ICpiID0gJmRp c3BsYXktPm91dHB1dHNbaSAtIDFdOwogCi0JCWlndF9hc3NlcnRfZihvdXRwdXQtPnBlbmRpbmdf Y3J0Y19pZHhfbWFzayAhPQotCQkJICAgICBiLT5wZW5kaW5nX2NydGNfaWR4X21hc2ssCisJCWln dF9hc3NlcnRfZihvdXRwdXQtPnBlbmRpbmdfcGlwZSAhPQorCQkJICAgICBiLT5wZW5kaW5nX3Bp cGUsCiAJCQkgICAgICIlcyBhbmQgJXMgYXJlIGJvdGggdHJ5aW5nIHRvIHVzZSBwaXBlICVzXG4i LAogCQkJICAgICBpZ3Rfb3V0cHV0X25hbWUob3V0cHV0KSwgaWd0X291dHB1dF9uYW1lKGIpLAot CQkJICAgICBrbXN0ZXN0X3BpcGVfbmFtZShmZnMoYi0+cGVuZGluZ19jcnRjX2lkeF9tYXNrKSAt IDEpKTsKKwkJCSAgICAga21zdGVzdF9waXBlX25hbWUob3V0cHV0LT5wZW5kaW5nX3BpcGUpKTsK IAl9CiB9CiAKQEAgLTE5ODgsNyArMTk4OCw3IEBAIHN0YXRpYyBpZ3RfcGlwZV90ICppZ3Rfb3V0 cHV0X2dldF9kcml2aW5nX3BpcGUoaWd0X291dHB1dF90ICpvdXRwdXQpCiAJaWd0X2Rpc3BsYXlf dCAqZGlzcGxheSA9IG91dHB1dC0+ZGlzcGxheTsKIAllbnVtIHBpcGUgcGlwZTsKIAotCWlmICgh b3V0cHV0LT5wZW5kaW5nX2NydGNfaWR4X21hc2spIHsKKwlpZiAob3V0cHV0LT5wZW5kaW5nX3Bp cGUgPT0gUElQRV9OT05FKSB7CiAJCS8qCiAJCSAqIFRoZSB1c2VyIGhhc24ndCBzcGVjaWZpZWQg YSBwaXBlIHRvIHVzZSwgcmV0dXJuIG5vbmUuCiAJCSAqLwpAQCAtMTk5OCw3ICsxOTk4LDcgQEAg c3RhdGljIGlndF9waXBlX3QgKmlndF9vdXRwdXRfZ2V0X2RyaXZpbmdfcGlwZShpZ3Rfb3V0cHV0 X3QgKm91dHB1dCkKIAkJICogT3RoZXJ3aXNlLCByZXR1cm4gdGhlIHBlbmRpbmcgcGlwZSAoaWUg dGhlIHBpcGUgdGhhdCBzaG91bGQKIAkJICogZHJpdmUgdGhpcyBvdXRwdXQgYWZ0ZXIgdGhlIGNv bW1pdCgpCiAJCSAqLwotCQlwaXBlID0gZmZzKG91dHB1dC0+cGVuZGluZ19jcnRjX2lkeF9tYXNr KSAtIDE7CisJCXBpcGUgPSBvdXRwdXQtPnBlbmRpbmdfcGlwZTsKIAl9CiAKIAlpZ3RfYXNzZXJ0 KHBpcGUgPj0gMCAmJiBwaXBlIDwgZGlzcGxheS0+bl9waXBlcyk7CkBAIC0yMDUxLDcgKzIwNTEs NyBAQCBzdGF0aWMgaWd0X291dHB1dF90ICppZ3RfcGlwZV9nZXRfb3V0cHV0KGlndF9waXBlX3Qg KnBpcGUpCiAJZm9yIChpID0gMDsgaSA8IGRpc3BsYXktPm5fb3V0cHV0czsgaSsrKSB7CiAJCWln dF9vdXRwdXRfdCAqb3V0cHV0ID0gJmRpc3BsYXktPm91dHB1dHNbaV07CiAKLQkJaWYgKG91dHB1 dC0+cGVuZGluZ19jcnRjX2lkeF9tYXNrID09ICgxIDw8IHBpcGUtPnBpcGUpKQorCQlpZiAob3V0 cHV0LT5wZW5kaW5nX3BpcGUgPT0gcGlwZS0+cGlwZSkKIAkJCXJldHVybiBvdXRwdXQ7CiAJfQog CkBAIC0yODYwLDIyICsyODYwLDE4IEBAIHZvaWQgaWd0X291dHB1dF9zZXRfcGlwZShpZ3Rfb3V0 cHV0X3QgKm91dHB1dCwgZW51bSBwaXBlIHBpcGUpCiAKIAlpZ3RfYXNzZXJ0KG91dHB1dC0+bmFt ZSk7CiAKLQlpZiAob3V0cHV0LT5wZW5kaW5nX2NydGNfaWR4X21hc2spIHsKKwlpZiAob3V0cHV0 LT5wZW5kaW5nX3BpcGUgIT0gUElQRV9OT05FKSB7CiAJCW9sZF9waXBlID0gaWd0X291dHB1dF9n ZXRfZHJpdmluZ19waXBlKG91dHB1dCk7CiAKIAkJb2xkX3BpcGUtPm1vZGVfY2hhbmdlZCA9IHRy dWU7CiAJfQogCi0JaWYgKHBpcGUgPT0gUElQRV9OT05FKSB7Ci0JCUxPRyhkaXNwbGF5LCAiJXM6 IHNldF9waXBlKGFueSlcbiIsIGlndF9vdXRwdXRfbmFtZShvdXRwdXQpKTsKLQkJb3V0cHV0LT5w ZW5kaW5nX2NydGNfaWR4X21hc2sgPSAwOwotCX0gZWxzZSB7Ci0JCUxPRyhkaXNwbGF5LCAiJXM6 IHNldF9waXBlKCVzKVxuIiwgaWd0X291dHB1dF9uYW1lKG91dHB1dCksCi0JCSAgICBrbXN0ZXN0 X3BpcGVfbmFtZShwaXBlKSk7Ci0JCW91dHB1dC0+cGVuZGluZ19jcnRjX2lkeF9tYXNrID0gMSA8 PCBwaXBlOworCUxPRyhkaXNwbGF5LCAiJXM6IHNldF9waXBlKCVzKVxuIiwgaWd0X291dHB1dF9u YW1lKG91dHB1dCksCisJICAgIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpKTsKKwlvdXRwdXQtPnBl bmRpbmdfcGlwZSA9IHBpcGU7CiAKKwlpZiAocGlwZSAhPSBQSVBFX05PTkUpCiAJCWRpc3BsYXkt PnBpcGVzW3BpcGVdLm1vZGVfY2hhbmdlZCA9IHRydWU7Ci0JfQogCiAJb3V0cHV0LT5jb25maWcu cGlwZV9jaGFuZ2VkID0gdHJ1ZTsKIApkaWZmIC0tZ2l0IGEvbGliL2lndF9rbXMuaCBiL2xpYi9p Z3Rfa21zLmgKaW5kZXggNjIxOTdkY2ZlYTdiLi44ZGMxMThjOTYxYjcgMTAwNjQ0Ci0tLSBhL2xp Yi9pZ3Rfa21zLmgKKysrIGIvbGliL2lndF9rbXMuaApAQCAtMzYxLDcgKzM2MSw3IEBAIHR5cGVk ZWYgc3RydWN0IHsKIAlzdHJ1Y3Qga21zdGVzdF9jb25uZWN0b3JfY29uZmlnIGNvbmZpZzsKIAlj aGFyICpuYW1lOwogCWJvb2wgZm9yY2VfcmVwcm9iZTsKLQl1bnNpZ25lZCBsb25nIHBlbmRpbmdf Y3J0Y19pZHhfbWFzazsKKwllbnVtIHBpcGUgcGVuZGluZ19waXBlOwogCWJvb2wgdXNlX292ZXJy aWRlX21vZGU7CiAJZHJtTW9kZU1vZGVJbmZvIG92ZXJyaWRlX21vZGU7CiB9IGlndF9vdXRwdXRf dDsKZGlmZiAtLWdpdCBhL3Rlc3RzL2ttc19hdG9taWNfdHJhbnNpdGlvbi5jIGIvdGVzdHMva21z X2F0b21pY190cmFuc2l0aW9uLmMKaW5kZXggNDg4MjNhMDlhZWQyLi4yYWU3NWYyZDY2MzAgMTAw NjQ0Ci0tLSBhL3Rlc3RzL2ttc19hdG9taWNfdHJhbnNpdGlvbi5jCisrKyBiL3Rlc3RzL2ttc19h dG9taWNfdHJhbnNpdGlvbi5jCkBAIC02NDQsNyArNjQ0LDcgQEAgc3RhdGljIHVuc2lnbmVkIHNl dF9jb21iaW5hdGlvbnMoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgdW5zaWduZWQgbWFzaywgc3Ry dWN0IGkKIAkJZXZlbnRfbWFzayB8PSAxIDw8IHBpcGU7CiAKIAkJZm9yX2VhY2hfdmFsaWRfb3V0 cHV0X29uX3BpcGUoZGlzcGxheSwgcGlwZSwgb3V0cHV0KSB7Ci0JCQlpZiAob3V0cHV0LT5wZW5k aW5nX2NydGNfaWR4X21hc2spCisJCQlpZiAob3V0cHV0LT5wZW5kaW5nX3BpcGUgIT0gUElQRV9O T05FKQogCQkJCWNvbnRpbnVlOwogCiAJCQltb2RlID0gaWd0X291dHB1dF9nZXRfbW9kZShvdXRw dXQpOwpAQCAtNzI2LDcgKzcyNiw3IEBAIHN0YXRpYyB2b2lkIHJ1bl9tb2Rlc2V0X3Rlc3RzKGln dF9kaXNwbGF5X3QgKmRpc3BsYXksIGludCBob3dtYW55LCBib29sIG5vbmJsb2NrCiAJCQlwaXBl X2NyY3NbaV0gPSBpZ3RfcGlwZV9jcmNfbmV3KGRpc3BsYXktPmRybV9mZCwgaSwgSU5URUxfUElQ RV9DUkNfU09VUkNFX0FVVE8pOwogCiAJCWZvcl9lYWNoX3ZhbGlkX291dHB1dF9vbl9waXBlKGRp c3BsYXksIGksIG91dHB1dCkgewotCQkJaWYgKG91dHB1dC0+cGVuZGluZ19jcnRjX2lkeF9tYXNr KQorCQkJaWYgKG91dHB1dC0+cGVuZGluZ19waXBlICE9IFBJUEVfTk9ORSkKIAkJCQljb250aW51 ZTsKIAogCQkJaWd0X291dHB1dF9zZXRfcGlwZShvdXRwdXQsIGkpOwpkaWZmIC0tZ2l0IGEvdGVz dHMva21zX2J1c3kuYyBiL3Rlc3RzL2ttc19idXN5LmMKaW5kZXggZjQzMGJlYWY3MzczLi4wODI4 YThiMzhhMDYgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19idXN5LmMKKysrIGIvdGVzdHMva21zX2J1 c3kuYwpAQCAtNDEsNyArNDEsNyBAQCBzZXRfZmJfb25fY3J0YyhpZ3RfZGlzcGxheV90ICpkcHks IGludCBwaXBlLCBzdHJ1Y3QgaWd0X2ZiICpmYikKIAkJZHJtTW9kZU1vZGVJbmZvUHRyIG1vZGU7 CiAJCWlndF9wbGFuZV90ICpwcmltYXJ5OwogCi0JCWlmIChvdXRwdXQtPnBlbmRpbmdfY3J0Y19p ZHhfbWFzaykKKwkJaWYgKG91dHB1dC0+cGVuZGluZ19waXBlICE9IFBJUEVfTk9ORSkKIAkJCWNv bnRpbnVlOwogCiAJCWlndF9vdXRwdXRfc2V0X3BpcGUob3V0cHV0LCBwaXBlKTsKZGlmZiAtLWdp dCBhL3Rlc3RzL2ttc19jdXJzb3JfbGVnYWN5LmMgYi90ZXN0cy9rbXNfY3Vyc29yX2xlZ2FjeS5j CmluZGV4IDY1YTAwMWE5ZGVjMC4uZmM3NTI2ODMzNjczIDEwMDY0NAotLS0gYS90ZXN0cy9rbXNf Y3Vyc29yX2xlZ2FjeS5jCisrKyBiL3Rlc3RzL2ttc19jdXJzb3JfbGVnYWN5LmMKQEAgLTE1NSw3 ICsxNTUsNyBAQCBzdGF0aWMgaWd0X291dHB1dF90ICpzZXRfZmJfb25fY3J0YyhpZ3RfZGlzcGxh eV90ICpkaXNwbGF5LCBlbnVtIHBpcGUgcGlwZSwgc3RydQogCQlkcm1Nb2RlTW9kZUluZm9QdHIg bW9kZTsKIAkJaWd0X3BsYW5lX3QgKnByaW1hcnk7CiAKLQkJaWYgKG91dHB1dC0+cGVuZGluZ19j cnRjX2lkeF9tYXNrKQorCQlpZiAob3V0cHV0LT5wZW5kaW5nX3BpcGUgIT0gUElQRV9OT05FKQog CQkJY29udGludWU7CiAKIAkJaWd0X291dHB1dF9zZXRfcGlwZShvdXRwdXQsIHBpcGUpOwotLSAK Mi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK