From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Subject: [PATCH 03/35] drm/i915: Use the disable callback for
	disabling planes.
Date: Tue, 21 Apr 2015 17:12:52 +0300
Message-ID: <1429625604-22252-4-git-send-email-ander.conselvan.de.oliveira@intel.com>
References: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@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 mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTP id 8F72D6E5C5
 for <intel-gfx@lists.freedesktop.org>; Tue, 21 Apr 2015 07:13:28 -0700 (PDT)
In-Reply-To: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@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

RnJvbTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv
bT4KClRoaXMgYWxsb3dzIGRpc2FibGluZyBhbGwgcGxhbmVzIGFmZmVjdGluZyBhIGNydGMgd2l0
aG91dCBjYXJpbmcgd2hhdCB0eXBlIGl0IGlzLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5r
aG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEFu
ZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGlu
dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgNSAr
KwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgOTEgKysrKysrLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlvbnMo
KyksIDc2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGY1MDIwYTgu
LjMyNDM5YWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjM4LDYgKzIzOCwxMSBAQCBl
bnVtIGhwZF9waW4gewogI2RlZmluZSBmb3JfZWFjaF9jcnRjKGRldiwgY3J0YykgXAogCWxpc3Rf
Zm9yX2VhY2hfZW50cnkoY3J0YywgJmRldi0+bW9kZV9jb25maWcuY3J0Y19saXN0LCBoZWFkKQog
CisjZGVmaW5lIGZvcl9lYWNoX2ludGVsX3BsYW5lKGRldiwgaW50ZWxfcGxhbmUpIFwKKwlsaXN0
X2Zvcl9lYWNoX2VudHJ5KGludGVsX3BsYW5lLAkJCVwKKwkJCSAgICAmZGV2LT5tb2RlX2NvbmZp
Zy5wbGFuZV9saXN0LAlcCisJCQkgICAgYmFzZS5oZWFkKQorCiAjZGVmaW5lIGZvcl9lYWNoX2lu
dGVsX2NydGMoZGV2LCBpbnRlbF9jcnRjKSBcCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShpbnRlbF9j
cnRjLCAmZGV2LT5tb2RlX2NvbmZpZy5jcnRjX2xpc3QsIGJhc2UuaGVhZCkKIApkaWZmIC0tZ2l0
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDk3ZGI3NWIuLmFjZjM0OTQgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTIyNTQsMzIgKzIyNTQsNiBAQCBzdGF0aWMgdm9p
ZCBpbnRlbF9lbmFibGVfcHJpbWFyeV9od19wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK
IAkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgaW50ZWxfY3J0Yy0+cGlwZSk7CiB9CiAKLS8q
KgotICogaW50ZWxfZGlzYWJsZV9wcmltYXJ5X2h3X3BsYW5lIC0gZGlzYWJsZSB0aGUgcHJpbWFy
eSBoYXJkd2FyZSBwbGFuZQotICogQHBsYW5lOiBwbGFuZSB0byBiZSBkaXNhYmxlZAotICogQGNy
dGM6IGNydGMgZm9yIHRoZSBwbGFuZQotICoKLSAqIERpc2FibGUgQHBsYW5lIG9uIEBjcnRjLCBt
YWtpbmcgc3VyZSB0aGF0IHRoZSBwaXBlIGlzIHJ1bm5pbmcgZmlyc3QuCi0gKi8KLXN0YXRpYyB2
b2lkIGludGVsX2Rpc2FibGVfcHJpbWFyeV9od19wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu
ZSwKLQkJCQkJICAgc3RydWN0IGRybV9jcnRjICpjcnRjKQotewotCXN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYgPSBwbGFuZS0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9
IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19p
bnRlbF9jcnRjKGNydGMpOwotCi0JaWYgKFdBUk5fT04oIWludGVsX2NydGMtPmFjdGl2ZSkpCi0J
CXJldHVybjsKLQotCWlmICghaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkKQotCQlyZXR1cm47
Ci0KLQlpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgPSBmYWxzZTsKLQotCWRldl9wcml2LT5k
aXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lKGNydGMsIHBsYW5lLT5mYiwKLQkJCQkJICAgICAg
IGNydGMtPngsIGNydGMtPnkpOwotfQotCiBzdGF0aWMgYm9vbCBuZWVkX3Z0ZF93YShzdHJ1Y3Qg
ZHJtX2RldmljZSAqZGV2KQogewogI2lmZGVmIENPTkZJR19JTlRFTF9JT01NVQpAQCAtNDU2MSwz
OCArNDUzNSw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9zcHJpdGVfcGxhbmVzKHN0cnVj
dCBkcm1fY3J0YyAqY3J0YykKIAl9CiB9CiAKLS8qCi0gKiBEaXNhYmxlIGEgcGxhbmUgaW50ZXJu
YWxseSB3aXRob3V0IGFjdHVhbGx5IG1vZGlmeWluZyB0aGUgcGxhbmUncyBzdGF0ZS4KLSAqIFRo
aXMgd2lsbCBhbGxvdyB1cyB0byBlYXNpbHkgcmVzdG9yZSB0aGUgcGxhbmUgbGF0ZXIgYnkganVz
dCByZXByb2dyYW1taW5nCi0gKiBpdHMgc3RhdGUuCi0gKi8KLXN0YXRpYyB2b2lkIGRpc2FibGVf
cGxhbmVfaW50ZXJuYWwoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCi17Ci0Jc3RydWN0IGludGVs
X3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKLQlzdHJ1Y3QgZHJt
X3BsYW5lX3N0YXRlICpzdGF0ZSA9Ci0JCXBsYW5lLT5mdW5jcy0+YXRvbWljX2R1cGxpY2F0ZV9z
dGF0ZShwbGFuZSk7Ci0Jc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9zdGF0ZSA9IHRv
X2ludGVsX3BsYW5lX3N0YXRlKHN0YXRlKTsKLQotCWludGVsX3N0YXRlLT52aXNpYmxlID0gZmFs
c2U7Ci0JaW50ZWxfcGxhbmUtPmNvbW1pdF9wbGFuZShwbGFuZSwgaW50ZWxfc3RhdGUpOwotCi0J
aW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZShwbGFuZSwgc3RhdGUpOwotfQotCi1zdGF0aWMgdm9p
ZCBpbnRlbF9kaXNhYmxlX3Nwcml0ZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRjKQotewot
CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7Ci0JZW51bSBwaXBlIHBpcGUgPSB0
b19pbnRlbF9jcnRjKGNydGMpLT5waXBlOwotCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwotCXN0
cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmU7Ci0KLQlkcm1fZm9yX2VhY2hfbGVnYWN5X3Bs
YW5lKHBsYW5lLCAmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0KSB7Ci0JCWludGVsX3BsYW5l
ID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwotCQlpZiAocGxhbmUtPmZiICYmIGludGVsX3BsYW5l
LT5waXBlID09IHBpcGUpCi0JCQlkaXNhYmxlX3BsYW5lX2ludGVybmFsKHBsYW5lKTsKLQl9Ci19
Ci0KIHZvaWQgaHN3X2VuYWJsZV9pcHMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7CiAJc3Ry
dWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwpAQCAtNDc0Niw2ICs0Njg4LDcg
QEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhzdHJ1Y3QgZHJtX2NydGMg
KmNydGMpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJt
X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRl
bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwlzdHJ1Y3QgaW50ZWxf
cGxhbmUgKmludGVsX3BsYW5lOwogCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAogCWlu
dGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhjcnRjKTsKQEAgLTQ3NTYsOSArNDY5OSwx
NSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0
YyAqY3J0YykKIAloc3dfZGlzYWJsZV9pcHMoaW50ZWxfY3J0Yyk7CiAKIAlpbnRlbF9jcnRjX2Rw
bXNfb3ZlcmxheShpbnRlbF9jcnRjLCBmYWxzZSk7Ci0JaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29y
KGNydGMsIGZhbHNlKTsKLQlpbnRlbF9kaXNhYmxlX3Nwcml0ZV9wbGFuZXMoY3J0Yyk7Ci0JaW50
ZWxfZGlzYWJsZV9wcmltYXJ5X2h3X3BsYW5lKGNydGMtPnByaW1hcnksIGNydGMpOworCWludGVs
X2NydGMtPnByaW1hcnlfZW5hYmxlZCA9IGZhbHNlOworCWZvcl9lYWNoX2ludGVsX3BsYW5lKGRl
diwgaW50ZWxfcGxhbmUpIHsKKwkJaWYgKGludGVsX3BsYW5lLT5waXBlID09IHBpcGUpIHsKKwkJ
CXN0cnVjdCBkcm1fY3J0YyAqZnJvbSA9IGludGVsX3BsYW5lLT5iYXNlLmNydGM7CisKKwkJCWlu
dGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lKCZpbnRlbF9wbGFuZS0+YmFzZSwKKwkJCQkJCSAgIGZy
b20gPzogY3J0YywgdHJ1ZSk7CisJCX0KKwl9CiAKIAkvKgogCSAqIEZJWE1FOiBPbmNlIHdlIGdy
b3cgcHJvcGVyIG51Y2xlYXIgZmxpcCBzdXBwb3J0IG91dCBvZiB0aGlzIHdlIG5lZWQKQEAgLTEz
MjI0LDI0ICsxMzE3MywxNCBAQCBpbnRlbF9jb21taXRfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJt
X3BsYW5lICpwbGFuZSwKIAljcnRjLT55ID0gc3JjLT55MSA+PiAxNjsKIAogCWlmIChpbnRlbF9j
cnRjLT5hY3RpdmUpIHsKLQkJaWYgKHN0YXRlLT52aXNpYmxlKSB7CisJCWludGVsX2NydGMtPnBy
aW1hcnlfZW5hYmxlZCA9IHN0YXRlLT52aXNpYmxlOworCisJCWlmIChzdGF0ZS0+dmlzaWJsZSkK
IAkJCS8qIEZJWE1FOiBraWxsIHRoaXMgZmFzdGJvb3QgaGFjayAqLwogCQkJaW50ZWxfdXBkYXRl
X3BpcGVfc2l6ZShpbnRlbF9jcnRjKTsKIAotCQkJaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVk
ID0gdHJ1ZTsKLQotCQkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3ByaW1hcnlfcGxhbmUoY3J0
YywgcGxhbmUtPmZiLAotCQkJCQljcnRjLT54LCBjcnRjLT55KTsKLQkJfSBlbHNlIHsKLQkJCS8q
Ci0JCQkgKiBJZiBjbGlwcGluZyByZXN1bHRzIGluIGEgbm9uLXZpc2libGUgcHJpbWFyeSBwbGFu
ZSwKLQkJCSAqIHdlJ2xsIGRpc2FibGUgdGhlIHByaW1hcnkgcGxhbmUuICBOb3RlIHRoYXQgdGhp
cyBpcwotCQkJICogYSBiaXQgZGlmZmVyZW50IHRoYW4gd2hhdCBoYXBwZW5zIGlmIHVzZXJzcGFj
ZQotCQkJICogZXhwbGljaXRseSBkaXNhYmxlcyB0aGUgcGxhbmUgYnkgcGFzc2luZyBmYj0wCi0J
CQkgKiBiZWNhdXNlIHBsYW5lLT5mYiBzdGlsbCBnZXRzIHNldCBhbmQgcGlubmVkLgotCQkJICov
Ci0JCQlpbnRlbF9kaXNhYmxlX3ByaW1hcnlfaHdfcGxhbmUocGxhbmUsIGNydGMpOwotCQl9CisJ
CWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lKGNydGMsIHBsYW5lLT5mYiwK
KwkJCQkJCSAgICAgICBjcnRjLT54LCBjcnRjLT55KTsKIAl9CiB9CiAKLS0gCjIuMS4wCgpfX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp
bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy
ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=