From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 5/5] drm/atomic: Add encoder_mask to crtc_state, v2.
Date: Thu,  7 Jan 2016 10:59:22 +0100
Message-ID: <1452160762-30487-6-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1452160762-30487-1-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: <dri-devel-bounces@lists.freedesktop.org>
In-Reply-To: <1452160762-30487-1-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

VGhpcyBhbGxvd3MgaXRlcmF0aW9uIG92ZXIgZW5jb2RlcnMgdXNpbmcgZHJtX2Zvcl9lYWNoX2Vu
Y29kZXJfbWFzawp3aXRob3V0IGluc3BlY3RpbmcgYWxsIGNvbm5lY3Rvcl9zdGF0ZXMsIHdoaWNo
IHJlcXVpcmVzIGNvbm5lY3Rpb25fbXV0ZXguCgpDaGFuZ2VzIHNpbmNlIHYxOgotIEFkZCBhIHNl
dF9iZXN0X2VuY29kZXIgaGVscGVyIGZ1bmN0aW9uIGFuZCB1cGRhdGUgZW5jb2Rlcl9tYXNrIGlu
c2lkZSBpdC4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmto
b3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVs
cGVyLmMgIHwgNDIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgMyArKysKIGluY2x1ZGUvZHJtL2RybV9j
cnRjLmggICAgICAgICAgICAgICB8ICAyICsrCiAzIGZpbGVzIGNoYW5nZWQsIDQ0IGluc2VydGlv
bnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9h
dG9taWNfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwppbmRl
eCA5Yzg0YjNiMzc2MzEuLmEzM2M3YTJhYWE3OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2RybV9hdG9taWNfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVs
cGVyLmMKQEAgLTEyNSw2ICsxMjUsNDEgQEAgZ2V0X2N1cnJlbnRfY3J0Y19mb3JfZW5jb2Rlcihz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXJldHVybiBOVUxMOwogfQogCitzdGF0aWMgdm9pZAor
c2V0X2Jlc3RfZW5jb2RlcihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCSBzdHJ1
Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSwKKwkJIHN0cnVjdCBkcm1fZW5jb2Rl
ciAqZW5jb2RlcikKK3sKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJc3Ry
dWN0IGRybV9jcnRjICpjcnRjOworCisJaWYgKGNvbm5fc3RhdGUtPmJlc3RfZW5jb2Rlcikgewor
CQkvKiBVbnNldCB0aGUgZW5jb2Rlcl9tYXNrIGluIHRoZSBvbGQgY3J0YyBzdGF0ZS4gKi8KKwkJ
Y3J0YyA9IGNvbm5fc3RhdGUtPmNvbm5lY3Rvci0+c3RhdGUtPmNydGM7CisKKwkJV0FSTl9PTigh
Y3J0Yyk7CisJCWlmIChjcnRjKSB7CisJCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfZXhp
c3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7CisKKwkJCWNydGNfc3RhdGUtPmVuY29kZXJf
bWFzayAmPQorCQkJCX4oMSA8PCBkcm1fZW5jb2Rlcl9pbmRleChjb25uX3N0YXRlLT5iZXN0X2Vu
Y29kZXIpKTsKKwkJfQorCX0KKworCWlmIChlbmNvZGVyKSB7CisJCWNydGMgPSBjb25uX3N0YXRl
LT5jcnRjOworCQlXQVJOX09OKCFjcnRjKTsKKwkJaWYgKGNydGMpIHsKKwkJCWNydGNfc3RhdGUg
PSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKworCQkJ
Y3J0Y19zdGF0ZS0+ZW5jb2Rlcl9tYXNrIHw9CisJCQkJMSA8PCBkcm1fZW5jb2Rlcl9pbmRleChl
bmNvZGVyKTsKKwkJfQorCX0KKworCWNvbm5fc3RhdGUtPmJlc3RfZW5jb2RlciA9IGVuY29kZXI7
Cit9CisKIHN0YXRpYyBpbnQKIHN0ZWFsX2VuY29kZXIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUg
KnN0YXRlLAogCSAgICAgIHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwKQEAgLTE2NCw3ICsx
OTksNyBAQCBzdGVhbF9lbmNvZGVyKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJ
aWYgKElTX0VSUihjb25uZWN0b3Jfc3RhdGUpKQogCQkJcmV0dXJuIFBUUl9FUlIoY29ubmVjdG9y
X3N0YXRlKTsKIAotCQljb25uZWN0b3Jfc3RhdGUtPmJlc3RfZW5jb2RlciA9IE5VTEw7CisJCXNl
dF9iZXN0X2VuY29kZXIoc3RhdGUsIGNvbm5lY3Rvcl9zdGF0ZSwgTlVMTCk7CiAJfQogCiAJcmV0
dXJuIDA7CkBAIC0yMTIsNyArMjQ3LDcgQEAgdXBkYXRlX2Nvbm5lY3Rvcl9yb3V0aW5nKHN0cnVj
dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwgaW50IGNvbm5faWR4KQogCQkJCWNvbm5lY3Rvci0+
YmFzZS5pZCwKIAkJCQljb25uZWN0b3ItPm5hbWUpOwogCi0JCWNvbm5lY3Rvcl9zdGF0ZS0+YmVz
dF9lbmNvZGVyID0gTlVMTDsKKwkJc2V0X2Jlc3RfZW5jb2RlcihzdGF0ZSwgY29ubmVjdG9yX3N0
YXRlLCBOVUxMKTsKIAogCQlyZXR1cm4gMDsKIAl9CkBAIC0yNzUsNyArMzEwLDggQEAgdXBkYXRl
X2Nvbm5lY3Rvcl9yb3V0aW5nKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwgaW50IGNv
bm5faWR4KQogCWlmIChXQVJOX09OKCFjb25uZWN0b3Jfc3RhdGUtPmNydGMpKQogCQlyZXR1cm4g
LUVJTlZBTDsKIAotCWNvbm5lY3Rvcl9zdGF0ZS0+YmVzdF9lbmNvZGVyID0gbmV3X2VuY29kZXI7
CisJc2V0X2Jlc3RfZW5jb2RlcihzdGF0ZSwgY29ubmVjdG9yX3N0YXRlLCBuZXdfZW5jb2Rlcik7
CisKIAlpZHggPSBkcm1fY3J0Y19pbmRleChjb25uZWN0b3Jfc3RhdGUtPmNydGMpOwogCiAJY3J0
Y19zdGF0ZSA9IHN0YXRlLT5jcnRjX3N0YXRlc1tpZHhdOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZGlzcGxheS5jCmluZGV4IGQ3Nzk2ODA5MmNlNC4uMmQ5Y2M4NDhmMjk0IDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xNTYwNCw2ICsxNTYwNCw3IEBAIHN0YXRpYyB2b2lk
IGludGVsX3Nhbml0aXplX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJCWNydGMtPmJh
c2Uuc3RhdGUtPmFjdGl2ZSA9IGNydGMtPmFjdGl2ZTsKIAkJY3J0Yy0+YmFzZS5lbmFibGVkID0g
Y3J0Yy0+YWN0aXZlOwogCQljcnRjLT5iYXNlLnN0YXRlLT5jb25uZWN0b3JfbWFzayA9IDA7CisJ
CWNydGMtPmJhc2Uuc3RhdGUtPmVuY29kZXJfbWFzayA9IDA7CiAKIAkJLyogQmVjYXVzZSB3ZSBv
bmx5IGVzdGFibGlzaCB0aGUgY29ubmVjdG9yIC0+IGVuY29kZXIgLT4KIAkJICogY3J0YyBsaW5r
cyBpZiBzb21ldGhpbmcgaXMgYWN0aXZlLCB0aGlzIG1lYW5zIHRoZQpAQCAtMTU4NDMsNiArMTU4
NDQsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0
IGRybV9kZXZpY2UgKmRldikKIAkJCQkgKi8KIAkJCQllbmNvZGVyLT5iYXNlLmNydGMtPnN0YXRl
LT5jb25uZWN0b3JfbWFzayB8PQogCQkJCQkxIDw8IGRybV9jb25uZWN0b3JfaW5kZXgoJmNvbm5l
Y3Rvci0+YmFzZSk7CisJCQkJZW5jb2Rlci0+YmFzZS5jcnRjLT5zdGF0ZS0+ZW5jb2Rlcl9tYXNr
IHw9CisJCQkJCTEgPDwgZHJtX2VuY29kZXJfaW5kZXgoJmVuY29kZXItPmJhc2UpOwogCQkJfQog
CiAJCX0gZWxzZSB7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oIGIvaW5jbHVk
ZS9kcm0vZHJtX2NydGMuaAppbmRleCBjMDIyNmY5NDVkNjIuLjUxMjg3ZjM2YjIxNCAxMDA2NDQK
LS0tIGEvaW5jbHVkZS9kcm0vZHJtX2NydGMuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fY3J0Yy5o
CkBAIC0zMDcsNiArMzA3LDcgQEAgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVuY3M7CiAgKiBA
Y29ubmVjdG9yc19jaGFuZ2VkOiBjb25uZWN0b3JzIHRvIHRoaXMgY3J0YyBoYXZlIGJlZW4gdXBk
YXRlZAogICogQHBsYW5lX21hc2s6IGJpdG1hc2sgb2YgKDEgPDwgZHJtX3BsYW5lX2luZGV4KHBs
YW5lKSkgb2YgYXR0YWNoZWQgcGxhbmVzCiAgKiBAY29ubmVjdG9yX21hc2s6IGJpdG1hc2sgb2Yg
KDEgPDwgZHJtX2Nvbm5lY3Rvcl9pbmRleChjb25uZWN0b3IpKSBvZiBhdHRhY2hlZCBjb25uZWN0
b3JzCisgKiBAZW5jb2Rlcl9tYXNrOiBiaXRtYXNrIG9mICgxIDw8IGRybV9lbmNvZGVyX2luZGV4
KGVuY29kZXIpKSBvZiBhdHRhY2hlZCBlbmNvZGVycwogICogQGxhc3RfdmJsYW5rX2NvdW50OiBm
b3IgaGVscGVycyBhbmQgZHJpdmVycyB0byBjYXB0dXJlIHRoZSB2Ymxhbmsgb2YgdGhlCiAgKiAJ
dXBkYXRlIHRvIGVuc3VyZSBmcmFtZWJ1ZmZlciBjbGVhbnVwIGlzbid0IGRvbmUgdG9vIGVhcmx5
CiAgKiBAYWRqdXN0ZWRfbW9kZTogZm9yIHVzZSBieSBoZWxwZXJzIGFuZCBkcml2ZXJzIHRvIGNv
bXB1dGUgYWRqdXN0ZWQgbW9kZSB0aW1pbmdzCkBAIC0zNDEsNiArMzQyLDcgQEAgc3RydWN0IGRy
bV9jcnRjX3N0YXRlIHsKIAl1MzIgcGxhbmVfbWFzazsKIAogCXUzMiBjb25uZWN0b3JfbWFzazsK
Kwl1MzIgZW5jb2Rlcl9tYXNrOwogCiAJLyogbGFzdF92YmxhbmtfY291bnQ6IGZvciB2Ymxhbmsg
d2FpdHMgYmVmb3JlIGNsZWFudXAgKi8KIAl1MzIgbGFzdF92YmxhbmtfY291bnQ7Ci0tIAoyLjEu
MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl
dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s
aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK