From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 2/4] drm/i915: Move sprite/cursor plane disable
	to intel_sanitize_crtc()
Date: Thu, 10 Sep 2015 18:59:08 +0300
Message-ID: <1441900750-25599-2-git-send-email-ville.syrjala@linux.intel.com>
References: <1441900750-25599-1-git-send-email-ville.syrjala@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTP id 2B8996ECDA
 for <intel-gfx@lists.freedesktop.org>; Thu, 10 Sep 2015 08:59:30 -0700 (PDT)
In-Reply-To: <1441900750-25599-1-git-send-email-ville.syrjala@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1v
dmUgdGhlIHNwcml0ZS9jdXJzb3IgcGxhbmUgZGlzYWJsaW5nIHRvIG9jY3VyIGluIGludGVsX3Nh
bml0aXplX2NydGMoKQp3aGVyZSBpdCBiZWxvbmdzIGluc3RlYWQgb2YgZG9pbmcgaXQgaW4gaW50
ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKCkuCgpUaGUgcGxhbmUgZGlzYWJsaW5nIHdhcyBm
aXJzdCBhZGRlZCBpbgo0Y2YwZWJiZDRmYWZiZGY4ZTY0MzFkYmIzMTVlNTUxMWMzZWZkYzNiIGRy
bS9pOTE1OiBSZXdvcmsgcGxhbmUgcmVhZG91dC4KCkkgZ290IHRoZSBpZGVhIGZyb20gc29tZSBw
YXRjaGVzIGZyb20gUGFydGlrIGFuZC9vciBNYWFydGVuIGJ1dCB0aG9zZQptb3ZlZCBhbHNvIHRo
ZSBwbGFuZSBzdGF0ZSByZWFkb3V0IHRvIGludGVsX3Nhbml0aXplX2NydGMoKSB3aGljaCBpc24n
dApxdWl0ZSByaWdodCBpbiBteSBvcGluaW9uLgoKQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFy
dGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+CkNjOiBQYXRyaWsgSmFrb2Jzc29uIDxwYXRy
aWsuamFrb2Jzc29uQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOk
bMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA0NCArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t
LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkK
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZjU2NzNjOC4uMzcwNzIxMiAx
MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTQ4NzgsOSArMTQ4NzgsMTkg
QEAgc3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0
YykKIAkvKiByZXN0b3JlIHZibGFuayBpbnRlcnJ1cHRzIHRvIGNvcnJlY3Qgc3RhdGUgKi8KIAlk
cm1fY3J0Y192YmxhbmtfcmVzZXQoJmNydGMtPmJhc2UpOwogCWlmIChjcnRjLT5hY3RpdmUpIHsK
KwkJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKKwogCQlkcm1fY2FsY190aW1lc3RhbXBpbmdf
Y29uc3RhbnRzKCZjcnRjLT5iYXNlLCAmY3J0Yy0+YmFzZS5od21vZGUpOwogCQl1cGRhdGVfc2Nh
bmxpbmVfb2Zmc2V0KGNydGMpOwogCQlkcm1fY3J0Y192Ymxhbmtfb24oJmNydGMtPmJhc2UpOwor
CisJCS8qIERpc2FibGUgZXZlcnl0aGluZyBidXQgdGhlIHByaW1hcnkgcGxhbmUgKi8KKwkJZm9y
X2VhY2hfaW50ZWxfcGxhbmVfb25fY3J0YyhkZXYsIGNydGMsIHBsYW5lKSB7CisJCQlpZiAocGxh
bmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9QUklNQVJZKQorCQkJCWNvbnRpbnVlOwor
CisJCQlwbGFuZS0+ZGlzYWJsZV9wbGFuZSgmcGxhbmUtPmJhc2UsICZjcnRjLT5iYXNlKTsKKwkJ
fQogCX0KIAogCS8qIFdlIG5lZWQgdG8gc2FuaXRpemUgdGhlIHBsYW5lIC0+IHBpcGUgbWFwcGlu
ZyBmaXJzdCBiZWNhdXNlIHRoaXMgd2lsbApAQCAtMTUwNDMsMzUgKzE1MDUzLDIxIEBAIHZvaWQg
aTkxNV9yZWRpc2FibGVfdmdhKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaTkxNV9yZWRpc2Fi
bGVfdmdhX3Bvd2VyX29uKGRldik7CiB9CiAKLXN0YXRpYyBib29sIHByaW1hcnlfZ2V0X2h3X3N0
YXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQorc3RhdGljIGJvb2wgcHJpbWFyeV9nZXRfaHdf
c3RhdGUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJp
dmF0ZSAqZGV2X3ByaXYgPSBjcnRjLT5iYXNlLmRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGRy
bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwbGFuZS0+YmFzZS5kZXYpOwogCi0J
cmV0dXJuICEhKEk5MTVfUkVBRChEU1BDTlRSKGNydGMtPnBsYW5lKSkgJiBESVNQTEFZX1BMQU5F
X0VOQUJMRSk7CisJcmV0dXJuIEk5MTVfUkVBRChEU1BDTlRSKHBsYW5lLT5wbGFuZSkpICYgRElT
UExBWV9QTEFORV9FTkFCTEU7CiB9CiAKLXN0YXRpYyB2b2lkIHJlYWRvdXRfcGxhbmVfc3RhdGUo
c3RydWN0IGludGVsX2NydGMgKmNydGMsCi0JCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy
dGNfc3RhdGUpCisvKiBGSVhNRSByZWFkIG91dCBmdWxsIHBsYW5lIHN0YXRlIGZvciBhbGwgcGxh
bmVzICovCitzdGF0aWMgdm9pZCByZWFkb3V0X3BsYW5lX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRj
ICpjcnRjKQogewotCXN0cnVjdCBpbnRlbF9wbGFuZSAqcDsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmVf
c3RhdGUgKnBsYW5lX3N0YXRlOwotCWJvb2wgYWN0aXZlID0gY3J0Y19zdGF0ZS0+YmFzZS5hY3Rp
dmU7CisJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSA9CisJCXRvX2ludGVs
X3BsYW5lX3N0YXRlKGNydGMtPmJhc2UucHJpbWFyeS0+c3RhdGUpOwogCi0JZm9yX2VhY2hfaW50
ZWxfcGxhbmUoY3J0Yy0+YmFzZS5kZXYsIHApIHsKLQkJaWYgKGNydGMtPnBpcGUgIT0gcC0+cGlw
ZSkKLQkJCWNvbnRpbnVlOwotCi0JCXBsYW5lX3N0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUo
cC0+YmFzZS5zdGF0ZSk7Ci0KLQkJaWYgKHAtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9Q
UklNQVJZKQotCQkJcGxhbmVfc3RhdGUtPnZpc2libGUgPSBwcmltYXJ5X2dldF9od19zdGF0ZShj
cnRjKTsKLQkJZWxzZSB7Ci0JCQlpZiAoYWN0aXZlKQotCQkJCXAtPmRpc2FibGVfcGxhbmUoJnAt
PmJhc2UsICZjcnRjLT5iYXNlKTsKLQotCQkJcGxhbmVfc3RhdGUtPnZpc2libGUgPSBmYWxzZTsK
LQkJfQotCX0KKwlwbGFuZV9zdGF0ZS0+dmlzaWJsZSA9CisJCXByaW1hcnlfZ2V0X2h3X3N0YXRl
KHRvX2ludGVsX3BsYW5lKGNydGMtPmJhc2UucHJpbWFyeSkpOwogfQogCiBzdGF0aWMgdm9pZCBp
bnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKQEAg
LTE1MDk0LDcgKzE1MDkwLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3
X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2
ZSA9IGNydGMtPmFjdGl2ZTsKIAkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0Yy0+YWN0aXZlOwog
Ci0JCXJlYWRvdXRfcGxhbmVfc3RhdGUoY3J0YywgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5i
YXNlLnN0YXRlKSk7CisJCXJlYWRvdXRfcGxhbmVfc3RhdGUoY3J0Yyk7CiAKIAkJRFJNX0RFQlVH
X0tNUygiW0NSVEM6JWRdIGh3IHN0YXRlIHJlYWRvdXQ6ICVzXG4iLAogCQkJICAgICAgY3J0Yy0+
YmFzZS5iYXNlLmlkLAotLSAKMi40LjYKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy
ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu
Zm8vaW50ZWwtZ2Z4Cg==