From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 2/8] drm/i915: Add a way to disable planes
	without updating state
Date: Wed, 15 Apr 2015 16:34:40 +0200
Message-ID: <1429108486-22008-2-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1429108486-22008-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTP id 70C826E0D0
 for <intel-gfx@lists.freedesktop.org>; Wed, 15 Apr 2015 07:35:14 -0700 (PDT)
In-Reply-To: <1429108486-22008-1-git-send-email-maarten.lankhorst@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
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

VGhpcyBpcyB1c2VkIGJ5IHRoZSBuZXh0IGNvbW1pdCB0byBkaXNhYmxlIGFsbCBwbGFuZXMgb24g
YSBjcnRjCndpdGhvdXQgY2FyaW5nIHdoYXQgdHlwZSBpdCBpcy4KClNpZ25lZC1vZmYtYnk6IE1h
YXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQog
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzggKysrKysrKysrKysrKysr
KysrKysrKysrKysrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAg
ICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgMTYgKysr
KysrKy0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDQ0IGluc2VydGlvbnMoKyksIDEyIGRlbGV0
aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA3NWFmYTZlZjIy
YzcuLjg0ZTIxZWZlMTBjZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt
MjY2OSw3ICsyNjY5LDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfcHJpbWFyeV9wbGFuZShz
dHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJdTMyIHJlZyA9IERTUENOVFIocGxhbmUpOwogCWludCBw
aXhlbF9zaXplOwogCi0JaWYgKCFpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQpIHsKKwlpZiAo
IWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCB8fCAhZmIpIHsKIAkJSTkxNV9XUklURShyZWcs
IDApOwogCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkKIAkJCUk5MTVfV1JJVEUoRFNQ
U1VSRihwbGFuZSksIDApOwpAQCAtMjc5OCw3ICsyNzk4LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxh
a2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXUzMiByZWcg
PSBEU1BDTlRSKHBsYW5lKTsKIAlpbnQgcGl4ZWxfc2l6ZTsKIAotCWlmICghaW50ZWxfY3J0Yy0+
cHJpbWFyeV9lbmFibGVkKSB7CisJaWYgKCFpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgfHwg
IWZiKSB7CiAJCUk5MTVfV1JJVEUocmVnLCAwKTsKIAkJSTkxNV9XUklURShEU1BTVVJGKHBsYW5l
KSwgMCk7CiAJCVBPU1RJTkdfUkVBRChyZWcpOwpAQCAtMjk3Niw3ICsyOTc2LDcgQEAgc3RhdGlj
IHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMs
CiAJdW5zaWduZWQgbG9uZyBzdXJmX2FkZHI7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CiAK
LQlpZiAoIWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCkgeworCWlmICghaW50ZWxfY3J0Yy0+
cHJpbWFyeV9lbmFibGVkIHx8ICFmYikgewogCQlJOTE1X1dSSVRFKFBMQU5FX0NUTChwaXBlLCAw
KSwgMCk7CiAJCUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBlLCAwKSwgMCk7CiAJCVBPU1RJTkdf
UkVBRChQTEFORV9DVEwocGlwZSwgMCkpOwpAQCAtMTI5NzgsNiArMTI5NzgsMjAgQEAgaW50ZWxf
Y29tbWl0X3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJfQogfQogCitz
dGF0aWMgdm9pZAoraW50ZWxfZGlzYWJsZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg
KnBsYW5lLAorCQkJICAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJCSAgICBib29sIGZvcmNl
KQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OworCXN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisKKwlpZiAoIWZvcmNl
KQorCQl0b19pbnRlbF9jcnRjKGNydGMpLT5wcmltYXJ5X2VuYWJsZWQgPSBmYWxzZTsKKworCWRl
dl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lKGNydGMsIE5VTEwsIDAsIDApOwor
fQorCiBzdGF0aWMgdm9pZCBpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMg
KmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKQEAgLTEzMTE5
LDYgKzEzMTMzLDcgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmludGVsX3ByaW1hcnlfcGxh
bmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJcHJpbWFyeS0+cGxhbmUgPSBwaXBl
OwogCXByaW1hcnktPmNoZWNrX3BsYW5lID0gaW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZTsKIAlw
cmltYXJ5LT5jb21taXRfcGxhbmUgPSBpbnRlbF9jb21taXRfcHJpbWFyeV9wbGFuZTsKKwlwcmlt
YXJ5LT5kaXNhYmxlX3BsYW5lID0gaW50ZWxfZGlzYWJsZV9wcmltYXJ5X3BsYW5lOwogCXByaW1h
cnktPmNrZXkuZmxhZ3MgPSBJOTE1X1NFVF9DT0xPUktFWV9OT05FOwogCWlmIChIQVNfRkJDKGRl
dikgJiYgSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA0KQogCQlwcmltYXJ5LT5wbGFuZSA9ICFwaXBl
OwpAQCAtMTMyMjQsNiArMTMyMzksMjIgQEAgZmluaXNoOgogfQogCiBzdGF0aWMgdm9pZAoraW50
ZWxfZGlzYWJsZV9jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkgICBz
dHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCQkgICBib29sIGZvcmNlKQoreworCXN0cnVjdCBpbnRl
bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKworCWlmICghZm9yY2Up
IHsKKwkJcGxhbmUtPmZiID0gTlVMTDsKKwkJaW50ZWxfY3J0Yy0+Y3Vyc29yX2JvID0gTlVMTDsK
KwkJaW50ZWxfY3J0Yy0+Y3Vyc29yX2FkZHIgPSAwOworCX0KKworCWludGVsX2NydGNfdXBkYXRl
X2N1cnNvcihjcnRjLCBmYWxzZSk7Cit9CisKK3N0YXRpYyB2b2lkCiBpbnRlbF9jb21taXRfY3Vy
c29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICBzdHJ1Y3QgaW50ZWxfcGxh
bmVfc3RhdGUgKnN0YXRlKQogewpAQCAtMTMyODIsNiArMTMzMTMsNyBAQCBzdGF0aWMgc3RydWN0
IGRybV9wbGFuZSAqaW50ZWxfY3Vyc29yX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2LAogCXN0YXRlLT5zY2FsZXJfaWQgPSAtMTsKIAljdXJzb3ItPmNoZWNrX3BsYW5lID0gaW50
ZWxfY2hlY2tfY3Vyc29yX3BsYW5lOwogCWN1cnNvci0+Y29tbWl0X3BsYW5lID0gaW50ZWxfY29t
bWl0X2N1cnNvcl9wbGFuZTsKKwljdXJzb3ItPmRpc2FibGVfcGxhbmUgPSBpbnRlbF9kaXNhYmxl
X2N1cnNvcl9wbGFuZTsKIAogCWRybV91bml2ZXJzYWxfcGxhbmVfaW5pdChkZXYsICZjdXJzb3It
PmJhc2UsIDAsCiAJCQkJICZpbnRlbF9wbGFuZV9mdW5jcywKZGlmZiAtLWdpdCBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2
LmgKaW5kZXggZWMxMjk0OGU3NmFhLi4yN2RiZDgxNDU2MTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2Rydi5oCkBAIC01OTcsNyArNTk3LDcgQEAgc3RydWN0IGludGVsX3BsYW5lIHsKIAkJCSAgICAg
dWludDMyX3QgeCwgdWludDMyX3QgeSwKIAkJCSAgICAgdWludDMyX3Qgc3JjX3csIHVpbnQzMl90
IHNyY19oKTsKIAl2b2lkICgqZGlzYWJsZV9wbGFuZSkoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs
Ci0JCQkgICAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOworCQkJICAgICAgc3RydWN0IGRybV9j
cnRjICpjcnRjLCBib29sIGZvcmNlKTsKIAlpbnQgKCpjaGVja19wbGFuZSkoc3RydWN0IGRybV9w
bGFuZSAqcGxhbmUsCiAJCQkgICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKTsKIAl2
b2lkICgqY29tbWl0X3BsYW5lKShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggNjEyZDhlMGIzZTAyLi42MzE2NDU0MjA2ODMgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0zMTMsMTEgKzMxMywxMSBAQCBza2xfdXBk
YXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwgc3RydWN0IGRybV9jcnRjICpj
cnRjLAogfQogCiBzdGF0aWMgdm9pZAotc2tsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFu
ZSAqZHJtX3BsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCitza2xfZGlzYWJsZV9wbGFuZShz
dHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBmb3Jj
ZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZHJtX3BsYW5lLT5kZXY7CisJc3RydWN0
IGRybV9kZXZpY2UgKmRldiA9IGRwbGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX3BsYW5lICppbnRl
bF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKGRybV9wbGFuZSk7CisJc3RydWN0IGludGVsX3BsYW5l
ICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKGRwbGFuZSk7CiAJY29uc3QgaW50IHBpcGUg
PSBpbnRlbF9wbGFuZS0+cGlwZTsKIAljb25zdCBpbnQgcGxhbmUgPSBpbnRlbF9wbGFuZS0+cGxh
bmUgKyAxOwogCkBAIC0zMjcsNyArMzI3LDcgQEAgc2tsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRy
bV9wbGFuZSAqZHJtX3BsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJSTkxNV9XUklURShQ
TEFORV9TVVJGKHBpcGUsIHBsYW5lKSwgMCk7CiAJUE9TVElOR19SRUFEKFBMQU5FX1NVUkYocGlw
ZSwgcGxhbmUpKTsKIAotCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkcm1fcGxhbmUs
IGNydGMsIDAsIDAsIDAsIGZhbHNlLCBmYWxzZSk7CisJaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRl
cm1hcmtzKGRwbGFuZSwgY3J0YywgMCwgMCwgMCwgZmFsc2UsIGZhbHNlKTsKIH0KIAogc3RhdGlj
IHZvaWQKQEAgLTQ5OSw3ICs0OTksNyBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxh
bmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogfQogCiBzdGF0aWMgdm9pZAotdmx2
X2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMg
KmNydGMpCit2bHZfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVj
dCBkcm1fY3J0YyAqY3J0YywgYm9vbCBmb3JjZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
ID0gZHBsYW5lLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2
LT5kZXZfcHJpdmF0ZTsKQEAgLTY0NSw3ICs2NDUsNyBAQCBpdmJfdXBkYXRlX3BsYW5lKHN0cnVj
dCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiB9CiAKIHN0YXRpYyB2
b2lkCi1pdmJfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRy
bV9jcnRjICpjcnRjKQoraXZiX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs
IHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBmb3JjZSkKIHsKIAlzdHJ1Y3QgZHJtX2Rldmlj
ZSAqZGV2ID0gcGxhbmUtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg
PSBkZXYtPmRldl9wcml2YXRlOwpAQCAtNzc2LDcgKzc3Niw3IEBAIGlsa191cGRhdGVfcGxhbmUo
c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIH0KIAogc3Rh
dGljIHZvaWQKLWlsa19kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1
Y3QgZHJtX2NydGMgKmNydGMpCitpbGtfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw
bGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLCBib29sIGZvcmNlKQogewogCXN0cnVjdCBkcm1f
ZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf
cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC0xMDc3LDcgKzEwNzcsNyBAQCBpbnRlbF9jb21t
aXRfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJCQkJICBjcnRjX3gs
IGNydGNfeSwgY3J0Y193LCBjcnRjX2gsCiAJCQkJCQkgIHNyY194LCBzcmNfeSwgc3JjX3csIHNy
Y19oKTsKIAkJfSBlbHNlIHsKLQkJCWludGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lKHBsYW5lLCBj
cnRjKTsKKwkJCWludGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lKHBsYW5lLCBjcnRjLCBmYWxzZSk7
CiAJCX0KIAl9CiB9Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m
by9pbnRlbC1nZngK