From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 5/5] drm/atomic: Add encoder_mask to crtc_state, v3. Date: Thu, 28 Jan 2016 15:04:58 +0100 Message-ID: <56AA200A.6070501@linux.intel.com> References: <1452160762-30487-1-git-send-email-maarten.lankhorst@linux.intel.com> <1452160762-30487-6-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1452160762-30487-6-git-send-email-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: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyBhbGxvd3MgaXRlcmF0aW9uIG92ZXIgZW5jb2RlcnMgd2l0aG91dCByZXF1aXJpbmcgY29u bmVjdGlvbl9tdXRleC4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gQWRkIGEgc2V0X2Jlc3RfZW5jb2Rl ciBoZWxwZXIgZnVuY3Rpb24gYW5kIHVwZGF0ZSBlbmNvZGVyX21hc2sgaW5zaWRlCiAgaXQuCkNo YW5nZXMgc2luY2UgdjI6Ci0gUmVsYXggdGhlIFdBUk5fT04oIWNydGMpLCB3aXRoIGV4cGxhbmF0 aW9uLgotIENhbGwgc2V0X2Jlc3RfZW5jb2RlciB3aGVuIGNvbm5lY3RvciBpcyBtb3ZlZCBiZXR3 ZWVuIGNydGMncy4KLSBBZGQgc29tZSBwYXJhbm9pYSB0byBzdGVhbF9lbmNvZGVyIHRvIHByZXZl bnQgYWNjaWRlbnRhbGx5IHNldHRpbmcKICBiZXN0X2VuY29kZXIgdG8gTlVMTC4KClNpZ25lZC1v ZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5j b20+Ci0tLQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMg Yi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwppbmRleCA5Yzg0YjNiMzc2MzEu LjM5MWIzNzgzZTM0MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVs cGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKQEAgLTEyNSw2 ICsxMjUsNDcgQEAgZ2V0X2N1cnJlbnRfY3J0Y19mb3JfZW5jb2RlcihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCXJldHVybiBOVUxMOwogfQogCitzdGF0aWMgdm9pZAorc2V0X2Jlc3RfZW5jb2Rl cihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCSBzdHJ1Y3QgZHJtX2Nvbm5lY3Rv cl9zdGF0ZSAqY29ubl9zdGF0ZSwKKwkJIHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKK3sK KwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjICpj cnRjOworCisJaWYgKGNvbm5fc3RhdGUtPmJlc3RfZW5jb2RlcikgeworCQkvKiBVbnNldCB0aGUg ZW5jb2Rlcl9tYXNrIGluIHRoZSBvbGQgY3J0YyBzdGF0ZS4gKi8KKwkJY3J0YyA9IGNvbm5fc3Rh dGUtPmNvbm5lY3Rvci0+c3RhdGUtPmNydGM7CisKKwkJLyogQSBOVUxMIGNydGMgaXMgYW4gZXJy b3IgaGVyZSBiZWNhdXNlIHdlIHNob3VsZCBoYXZlCisJCSAqICBkdXBsaWNhdGVkIGEgTlVMTCBi ZXN0X2VuY29kZXIgd2hlbiBjcnRjIHdhcyBOVUxMLgorCQkgKiBBcyBhbiBleGNlcHRpb24gcmVz dG9yaW5nIGR1cGxpY2F0ZWQgYXRvbWljIHN0YXRlCisJCSAqIGR1cmluZyByZXN1bWUgaXMgYWxs b3dlZCwgc28gZG9uJ3Qgd2FybiB3aGVuCisJCSAqIGJlc3RfZW5jb2RlciBpcyBlcXVhbCB0byBl bmNvZGVyIHdlIGludGVuZCB0byBzZXQuCisJCSAqLworCQlXQVJOX09OKCFjcnRjICYmIGVuY29k ZXIgIT0gY29ubl9zdGF0ZS0+YmVzdF9lbmNvZGVyKTsKKwkJaWYgKGNydGMpIHsKKwkJCWNydGNf c3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsK KworCQkJY3J0Y19zdGF0ZS0+ZW5jb2Rlcl9tYXNrICY9CisJCQkJfigxIDw8IGRybV9lbmNvZGVy X2luZGV4KGNvbm5fc3RhdGUtPmJlc3RfZW5jb2RlcikpOworCQl9CisJfQorCisJaWYgKGVuY29k ZXIpIHsKKwkJY3J0YyA9IGNvbm5fc3RhdGUtPmNydGM7CisJCVdBUk5fT04oIWNydGMpOworCQlp ZiAoY3J0YykgeworCQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNf c3RhdGUoc3RhdGUsIGNydGMpOworCisJCQljcnRjX3N0YXRlLT5lbmNvZGVyX21hc2sgfD0KKwkJ CQkxIDw8IGRybV9lbmNvZGVyX2luZGV4KGVuY29kZXIpOworCQl9CisJfQorCisJY29ubl9zdGF0 ZS0+YmVzdF9lbmNvZGVyID0gZW5jb2RlcjsKK30KKwogc3RhdGljIGludAogc3RlYWxfZW5jb2Rl cihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJICAgICAgc3RydWN0IGRybV9lbmNv ZGVyICplbmNvZGVyLApAQCAtMTY0LDcgKzIwNSwxMCBAQCBzdGVhbF9lbmNvZGVyKHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJaWYgKElTX0VSUihjb25uZWN0b3Jfc3RhdGUpKQog CQkJcmV0dXJuIFBUUl9FUlIoY29ubmVjdG9yX3N0YXRlKTsKIAotCQljb25uZWN0b3Jfc3RhdGUt PmJlc3RfZW5jb2RlciA9IE5VTEw7CisJCWlmIChjb25uZWN0b3Jfc3RhdGUtPmJlc3RfZW5jb2Rl ciAhPSBlbmNvZGVyKQorCQkJY29udGludWU7CisKKwkJc2V0X2Jlc3RfZW5jb2RlcihzdGF0ZSwg Y29ubmVjdG9yX3N0YXRlLCBOVUxMKTsKIAl9CiAKIAlyZXR1cm4gMDsKQEAgLTIxMiw3ICsyNTYs NyBAQCB1cGRhdGVfY29ubmVjdG9yX3JvdXRpbmcoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlLCBpbnQgY29ubl9pZHgpCiAJCQkJY29ubmVjdG9yLT5iYXNlLmlkLAogCQkJCWNvbm5lY3Rv ci0+bmFtZSk7CiAKLQkJY29ubmVjdG9yX3N0YXRlLT5iZXN0X2VuY29kZXIgPSBOVUxMOworCQlz ZXRfYmVzdF9lbmNvZGVyKHN0YXRlLCBjb25uZWN0b3Jfc3RhdGUsIE5VTEwpOwogCiAJCXJldHVy biAwOwogCX0KQEAgLTI0MSw2ICsyODUsOCBAQCB1cGRhdGVfY29ubmVjdG9yX3JvdXRpbmcoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLCBpbnQgY29ubl9pZHgpCiAJfQogCiAJaWYgKG5l d19lbmNvZGVyID09IGNvbm5lY3Rvcl9zdGF0ZS0+YmVzdF9lbmNvZGVyKSB7CisJCXNldF9iZXN0 X2VuY29kZXIoc3RhdGUsIGNvbm5lY3Rvcl9zdGF0ZSwgbmV3X2VuY29kZXIpOworCiAJCURSTV9E RUJVR19BVE9NSUMoIltDT05ORUNUT1I6JWQ6JXNdIGtlZXBzIFtFTkNPREVSOiVkOiVzXSwgbm93 IG9uIFtDUlRDOiVkOiVzXVxuIiwKIAkJCQkgY29ubmVjdG9yLT5iYXNlLmlkLAogCQkJCSBjb25u ZWN0b3ItPm5hbWUsCkBAIC0yNzUsNyArMzIxLDggQEAgdXBkYXRlX2Nvbm5lY3Rvcl9yb3V0aW5n KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwgaW50IGNvbm5faWR4KQogCWlmIChXQVJO X09OKCFjb25uZWN0b3Jfc3RhdGUtPmNydGMpKQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCWNvbm5l Y3Rvcl9zdGF0ZS0+YmVzdF9lbmNvZGVyID0gbmV3X2VuY29kZXI7CisJc2V0X2Jlc3RfZW5jb2Rl cihzdGF0ZSwgY29ubmVjdG9yX3N0YXRlLCBuZXdfZW5jb2Rlcik7CisKIAlpZHggPSBkcm1fY3J0 Y19pbmRleChjb25uZWN0b3Jfc3RhdGUtPmNydGMpOwogCiAJY3J0Y19zdGF0ZSA9IHN0YXRlLT5j cnRjX3N0YXRlc1tpZHhdOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGQ3 Nzk2ODA5MmNlNC4uMmQ5Y2M4NDhmMjk0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCkBAIC0xNTYwNCw2ICsxNTYwNCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX2Ny dGMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJCWNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSA9 IGNydGMtPmFjdGl2ZTsKIAkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0Yy0+YWN0aXZlOwogCQlj cnRjLT5iYXNlLnN0YXRlLT5jb25uZWN0b3JfbWFzayA9IDA7CisJCWNydGMtPmJhc2Uuc3RhdGUt PmVuY29kZXJfbWFzayA9IDA7CiAKIAkJLyogQmVjYXVzZSB3ZSBvbmx5IGVzdGFibGlzaCB0aGUg Y29ubmVjdG9yIC0+IGVuY29kZXIgLT4KIAkJICogY3J0YyBsaW5rcyBpZiBzb21ldGhpbmcgaXMg YWN0aXZlLCB0aGlzIG1lYW5zIHRoZQpAQCAtMTU4NDMsNiArMTU4NDQsOCBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAkJCQkgKi8KIAkJCQllbmNvZGVyLT5iYXNlLmNydGMtPnN0YXRlLT5jb25uZWN0b3JfbWFzayB8 PQogCQkJCQkxIDw8IGRybV9jb25uZWN0b3JfaW5kZXgoJmNvbm5lY3Rvci0+YmFzZSk7CisJCQkJ ZW5jb2Rlci0+YmFzZS5jcnRjLT5zdGF0ZS0+ZW5jb2Rlcl9tYXNrIHw9CisJCQkJCTEgPDwgZHJt X2VuY29kZXJfaW5kZXgoJmVuY29kZXItPmJhc2UpOwogCQkJfQogCiAJCX0gZWxzZSB7CmRpZmYg LS1naXQgYS9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oIGIvaW5jbHVkZS9kcm0vZHJtX2NydGMuaApp bmRleCBjMDIyNmY5NDVkNjIuLjUxMjg3ZjM2YjIxNCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0v ZHJtX2NydGMuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oCkBAIC0zMDcsNiArMzA3LDcg QEAgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVuY3M7CiAgKiBAY29ubmVjdG9yc19jaGFuZ2Vk OiBjb25uZWN0b3JzIHRvIHRoaXMgY3J0YyBoYXZlIGJlZW4gdXBkYXRlZAogICogQHBsYW5lX21h c2s6IGJpdG1hc2sgb2YgKDEgPDwgZHJtX3BsYW5lX2luZGV4KHBsYW5lKSkgb2YgYXR0YWNoZWQg cGxhbmVzCiAgKiBAY29ubmVjdG9yX21hc2s6IGJpdG1hc2sgb2YgKDEgPDwgZHJtX2Nvbm5lY3Rv cl9pbmRleChjb25uZWN0b3IpKSBvZiBhdHRhY2hlZCBjb25uZWN0b3JzCisgKiBAZW5jb2Rlcl9t YXNrOiBiaXRtYXNrIG9mICgxIDw8IGRybV9lbmNvZGVyX2luZGV4KGVuY29kZXIpKSBvZiBhdHRh Y2hlZCBlbmNvZGVycwogICogQGxhc3RfdmJsYW5rX2NvdW50OiBmb3IgaGVscGVycyBhbmQgZHJp dmVycyB0byBjYXB0dXJlIHRoZSB2Ymxhbmsgb2YgdGhlCiAgKiAJdXBkYXRlIHRvIGVuc3VyZSBm cmFtZWJ1ZmZlciBjbGVhbnVwIGlzbid0IGRvbmUgdG9vIGVhcmx5CiAgKiBAYWRqdXN0ZWRfbW9k ZTogZm9yIHVzZSBieSBoZWxwZXJzIGFuZCBkcml2ZXJzIHRvIGNvbXB1dGUgYWRqdXN0ZWQgbW9k ZSB0aW1pbmdzCkBAIC0zNDEsNiArMzQyLDcgQEAgc3RydWN0IGRybV9jcnRjX3N0YXRlIHsKIAl1 MzIgcGxhbmVfbWFzazsKIAogCXUzMiBjb25uZWN0b3JfbWFzazsKKwl1MzIgZW5jb2Rlcl9tYXNr OwogCiAJLyogbGFzdF92YmxhbmtfY291bnQ6IGZvciB2Ymxhbmsgd2FpdHMgYmVmb3JlIGNsZWFu dXAgKi8KIAl1MzIgbGFzdF92YmxhbmtfY291bnQ7CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=