From mboxrd@z Thu Jan  1 00:00:00 1970
From: Lyude <lyude@redhat.com>
Subject: [PATCH 2/5] drm/i915: Move CRTC updating in
	atomic_commit into it's own hook
Date: Wed, 26 Oct 2016 15:36:34 -0400
Message-ID: <1477510599-14843-3-git-send-email-lyude@redhat.com>
References: <1477510599-14843-1-git-send-email-lyude@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
In-Reply-To: <1477510599-14843-1-git-send-email-lyude@redhat.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: stable@vger.kernel.org
Cc: Lyude <lyude@redhat.com>, David Airlie <airlied@linux.ie>, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>, dri-devel@lists.freedesktop.org, Daniel Vetter <daniel.vetter@intel.com>
List-Id: dri-devel@lists.freedesktop.org

Y29tbWl0IDg5NmU1YmIwMjJiY2U2NGUyOWNlMmUxYjJmYzJhNzQ3NmQzMTFhMTUgdXBzdHJlYW0K
ClNpbmNlIHdlIGhhdmUgdG8gd3JpdGUgZGRiIGFsbG9jYXRpb25zIGF0IHRoZSBzYW1lIHRpbWUg
YXMgd2UgZG8gb3RoZXIKcGxhbmUgdXBkYXRlcywgd2UncmUgZ29pbmcgdG8gbmVlZCB0byBiZSBh
YmxlIHRvIGNvbnRyb2wgdGhlIG9yZGVyIGluCndoaWNoIHdlIGV4ZWN1dGUgbW9kZXNldHMgb24g
ZWFjaCBwaXBlLiBUaGUgZWFzaWVzdCB3YXkgdG8gZG8gdGhpcyBpcyB0bwpqdXN0IGZhY3RvciB0
aGlzIHNlY3Rpb24gb2YgaW50ZWxfYXRvbWljX2NvbW1pdF90YWlsKCkKKGludGVsX2F0b21pY19j
b21taXQoKSBmb3Igc3RhYmxlIGJyYW5jaGVzKSBpbnRvIGl0J3Mgb3duIGZ1bmN0aW9uLCBhbmQK
YWRkIGFuIGFwcHJvcHJpYXRlIGRpc3BsYXkgZnVuY3Rpb24gaG9vayBmb3IgaXQuCgpCYXNlZCBv
ZmYgb2YgTWF0dCBSb3BlJ3Mgc3VnZ2VzdGlvbnMKCkNoYW5nZXMgc2luY2UgdjE6CiAtIERyb3Ag
cGlwZV9jb25maWctPmJhc2UuYWN0aXZlIGNoZWNrIGluIGludGVsX3VwZGF0ZV9jcnRjcygpIHNp
bmNlIHdlCiAgIGNoZWNrIHRoYXQgYmVmb3JlIGNhbGxpbmcgdGhlIGZ1bmN0aW9uCgpTaWduZWQt
b2ZmLWJ5OiBMeXVkZSA8Y3BhdWxAcmVkaGF0LmNvbT4KUmV2aWV3ZWQtYnk6IE1hdHQgUm9wZXIg
PG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5
cmphbGFAbGludXguaW50ZWwuY29tPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBp
bnRlbC5jb20+CkNjOiBSYWRoYWtyaXNobmEgU3JpcGFkYSA8cmFkaGFrcmlzaG5hLnNyaXBhZGFA
aW50ZWwuY29tPgpDYzogSGFucyBkZSBHb2VkZSA8aGRlZ29lZGVAcmVkaGF0LmNvbT4KClNpZ25l
ZC1vZmYtYnk6IEx5dWRlIDxseXVkZUByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVu
IExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpMaW5rOiBodHRw
Oi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8xNDcxOTYxNTY1LTI4NTQw
LTEtZ2l0LXNlbmQtZW1haWwtY3BhdWxAcmVkaGF0LmNvbQotLS0KIGRyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZHJ2LmggICAgICB8ICAyICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp
c3BsYXkuYyB8IDc0ICsrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogMiBmaWxl
cyBjaGFuZ2VkLCA1NCBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9kcnYuaAppbmRleCBmNjhjNzg5Li5hZDc1ZGJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2
LmgKQEAgLTYzMSw2ICs2MzEsOCBAQCBzdHJ1Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7CiAJ
CQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiAJdm9pZCAoKmNydGNf
ZW5hYmxlKShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogCXZvaWQgKCpjcnRjX2Rpc2FibGUpKHN0
cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CisJdm9pZCAoKnVwZGF0ZV9jcnRjcykoc3RydWN0IGRybV9h
dG9taWNfc3RhdGUgKnN0YXRlLAorCQkJICAgICB1bnNpZ25lZCBpbnQgKmNydGNfdmJsYW5rX21h
c2spOwogCXZvaWQgKCphdWRpb19jb2RlY19lbmFibGUpKHN0cnVjdCBkcm1fY29ubmVjdG9yICpj
b25uZWN0b3IsCiAJCQkJICAgc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQkJICAg
Y29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUpOwpkaWZmIC0tZ2l0
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDFhZTU4N2YuLmUyYzQ2ZWIgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzNjgyLDYgKzEzNjgyLDUyIEBAIHN0YXRpYyBi
b29sIG5lZWRzX3ZibGFua193YWl0KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl
KQogCXJldHVybiBmYWxzZTsKIH0KIAorc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX2NydGMoc3Ry
dWN0IGRybV9jcnRjICpjcnRjLAorCQkJICAgICAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0
YXRlLAorCQkJICAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKKwkJ
CSAgICAgIHVuc2lnbmVkIGludCAqY3J0Y192YmxhbmtfbWFzaykKK3sKKwlzdHJ1Y3QgZHJtX2Rl
dmljZSAqZGV2ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp
diA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2lu
dGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0g
dG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7CisJYm9vbCBtb2Rlc2V0ID0gbmVlZHNf
bW9kZXNldChjcnRjLT5zdGF0ZSk7CisKKwlpZiAobW9kZXNldCkgeworCQl1cGRhdGVfc2Nhbmxp
bmVfb2Zmc2V0KGludGVsX2NydGMpOworCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2VuYWJsZShj
cnRjKTsKKwl9IGVsc2UgeworCQlpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKHRvX2ludGVsX2NydGNf
c3RhdGUob2xkX2NydGNfc3RhdGUpKTsKKwl9CisKKwlpZiAoZHJtX2F0b21pY19nZXRfZXhpc3Rp
bmdfcGxhbmVfc3RhdGUoc3RhdGUsIGNydGMtPnByaW1hcnkpKSB7CisJCWludGVsX2ZiY19lbmFi
bGUoCisJCSAgICBpbnRlbF9jcnRjLCBwaXBlX2NvbmZpZywKKwkJICAgIHRvX2ludGVsX3BsYW5l
X3N0YXRlKGNydGMtPnByaW1hcnktPnN0YXRlKSk7CisJfQorCisJZHJtX2F0b21pY19oZWxwZXJf
Y29tbWl0X3BsYW5lc19vbl9jcnRjKG9sZF9jcnRjX3N0YXRlKTsKKworCWlmIChuZWVkc192Ymxh
bmtfd2FpdChwaXBlX2NvbmZpZykpCisJCSpjcnRjX3ZibGFua19tYXNrIHw9IGRybV9jcnRjX21h
c2soY3J0Yyk7Cit9CisKK3N0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9jcnRjcyhzdHJ1Y3QgZHJt
X2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCQkgICAgICAgdW5zaWduZWQgaW50ICpjcnRjX3ZibGFu
a19tYXNrKQoreworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKKwlzdHJ1Y3QgZHJtX2NydGNfc3Rh
dGUgKm9sZF9jcnRjX3N0YXRlOworCWludCBpOworCisJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShz
dGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKKwkJaWYgKCFjcnRjLT5zdGF0ZS0+YWN0
aXZlKQorCQkJY29udGludWU7CisKKwkJaW50ZWxfdXBkYXRlX2NydGMoY3J0Yywgc3RhdGUsIG9s
ZF9jcnRjX3N0YXRlLAorCQkJCSAgY3J0Y192YmxhbmtfbWFzayk7CisJfQorfQorCiBzdGF0aWMg
dm9pZCBpbnRlbF9hdG9taWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0
YXRlKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2OwpAQCAtMTM3ODAs
MTcgKzEzODI2LDkgQEAgc3RhdGljIHZvaWQgaW50ZWxfYXRvbWljX2NvbW1pdF90YWlsKHN0cnVj
dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJaW50ZWxfbW9kZXNldF92ZXJpZnlfZGlzYWJs
ZWQoZGV2KTsKIAl9CiAKLQkvKiBOb3cgZW5hYmxlIHRoZSBjbG9ja3MsIHBsYW5lLCBwaXBlLCBh
bmQgY29ubmVjdG9ycyB0aGF0IHdlIHNldCB1cC4gKi8KKwkvKiBDb21wbGV0ZSB0aGUgZXZlbnRz
IGZvciBwaXBlcyB0aGF0IGhhdmUgbm93IGJlZW4gZGlzYWJsZWQgKi8KIAlmb3JfZWFjaF9jcnRj
X2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgaSkgewotCQlzdHJ1Y3QgaW50
ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJCWJvb2wgbW9kZXNl
dCA9IG5lZWRzX21vZGVzZXQoY3J0Yy0+c3RhdGUpOwotCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0
ZSAqcGlwZV9jb25maWcgPQotCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7Ci0K
LQkJaWYgKG1vZGVzZXQgJiYgY3J0Yy0+c3RhdGUtPmFjdGl2ZSkgewotCQkJdXBkYXRlX3NjYW5s
aW5lX29mZnNldCh0b19pbnRlbF9jcnRjKGNydGMpKTsKLQkJCWRldl9wcml2LT5kaXNwbGF5LmNy
dGNfZW5hYmxlKGNydGMpOwotCQl9CiAKIAkJLyogQ29tcGxldGUgZXZlbnRzIGZvciBub3cgZGlz
YWJsZSBwaXBlcyBoZXJlLiAqLwogCQlpZiAobW9kZXNldCAmJiAhY3J0Yy0+c3RhdGUtPmFjdGl2
ZSAmJiBjcnRjLT5zdGF0ZS0+ZXZlbnQpIHsKQEAgLTEzODAwLDIxICsxMzgzOCwxMSBAQCBzdGF0
aWMgdm9pZCBpbnRlbF9hdG9taWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUg
KnN0YXRlKQogCiAJCQljcnRjLT5zdGF0ZS0+ZXZlbnQgPSBOVUxMOwogCQl9Ci0KLQkJaWYgKCFt
b2Rlc2V0KQotCQkJaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZSh0b19pbnRlbF9jcnRjX3N0YXRlKG9s
ZF9jcnRjX3N0YXRlKSk7Ci0KLQkJaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUgJiYKLQkJICAgIGRy
bV9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5lX3N0YXRlKHN0YXRlLCBjcnRjLT5wcmltYXJ5KSkK
LQkJCWludGVsX2ZiY19lbmFibGUoaW50ZWxfY3J0YywgcGlwZV9jb25maWcsIHRvX2ludGVsX3Bs
YW5lX3N0YXRlKGNydGMtPnByaW1hcnktPnN0YXRlKSk7Ci0KLQkJaWYgKGNydGMtPnN0YXRlLT5h
Y3RpdmUpCi0JCQlkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfcGxhbmVzX29uX2NydGMob2xkX2Ny
dGNfc3RhdGUpOwotCi0JCWlmIChwaXBlX2NvbmZpZy0+YmFzZS5hY3RpdmUgJiYgbmVlZHNfdmJs
YW5rX3dhaXQocGlwZV9jb25maWcpKQotCQkJY3J0Y192YmxhbmtfbWFzayB8PSAxIDw8IGk7CiAJ
fQogCisJLyogTm93IGVuYWJsZSB0aGUgY2xvY2tzLCBwbGFuZSwgcGlwZSwgYW5kIGNvbm5lY3Rv
cnMgdGhhdCB3ZSBzZXQgdXAuICovCisJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX2NydGNzKHN0
YXRlLCAmY3J0Y192YmxhbmtfbWFzayk7CisKIAkvKiBGSVhNRTogV2Ugc2hvdWxkIGNhbGwgZHJt
X2F0b21pY19oZWxwZXJfY29tbWl0X2h3X2RvbmUoKSBoZXJlCiAJICogYWxyZWFkeSwgYnV0IHN0
aWxsIG5lZWQgdGhlIHN0YXRlIGZvciB0aGUgZGVsYXllZCBvcHRpbWl6YXRpb24uIFRvCiAJICog
Zml4IHRoaXM6CkBAIC0xNTI3NSw2ICsxNTMwMyw4IEBAIHZvaWQgaW50ZWxfaW5pdF9kaXNwbGF5
X2hvb2tzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJZGV2X3ByaXYtPmRp
c3BsYXkuY3J0Y19kaXNhYmxlID0gaTl4eF9jcnRjX2Rpc2FibGU7CiAJfQogCisJZGV2X3ByaXYt
PmRpc3BsYXkudXBkYXRlX2NydGNzID0gaW50ZWxfdXBkYXRlX2NydGNzOworCiAJLyogUmV0dXJu
cyB0aGUgY29yZSBkaXNwbGF5IGNsb2NrIHNwZWVkICovCiAJaWYgKElTX1NLWUxBS0UoZGV2X3By
aXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2Rp
c3BsYXlfY2xvY2tfc3BlZWQgPQotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp
c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu
L2xpc3RpbmZvL2ludGVsLWdmeAo=