From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH 02/35] drm/i915: Add a way to disable planes without updating state Date: Tue, 21 Apr 2015 17:12:51 +0300 Message-ID: <1429625604-22252-3-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: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id E7A3D6E5C5 for ; Tue, 21 Apr 2015 07:13:26 -0700 (PDT) In-Reply-To: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv bT4KClRoaXMgaXMgdXNlZCBieSB0aGUgbmV4dCBjb21taXQgdG8gZGlzYWJsZSBhbGwgcGxhbmVz IG9uIGEgY3J0Ywp3aXRob3V0IGNhcmluZyB3aGF0IHR5cGUgaXQgaXMuCgpTaWduZWQtb2ZmLWJ5 OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpS ZXZpZXdlZC1ieTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4u ZGUub2xpdmVpcmFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyB8IDM4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3Nwcml0ZS5jICB8IDE2ICsrKysrKystLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2Vk LCA0NCBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKaW5kZXggMzA5NGIwOC4uOTdkYjc1YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwpAQCAtMjY5NCw3ICsyNjk0LDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRh dGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJdTMyIHJlZyA9IERTUENO VFIocGxhbmUpOwogCWludCBwaXhlbF9zaXplOwogCi0JaWYgKCFpbnRlbF9jcnRjLT5wcmltYXJ5 X2VuYWJsZWQpIHsKKwlpZiAoIWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCB8fCAhZmIpIHsK IAkJSTkxNV9XUklURShyZWcsIDApOwogCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkK IAkJCUk5MTVfV1JJVEUoRFNQU1VSRihwbGFuZSksIDApOwpAQCAtMjgyMyw3ICsyODIzLDcgQEAg c3RhdGljIHZvaWQgaXJvbmxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRj ICpjcnRjLAogCXUzMiByZWcgPSBEU1BDTlRSKHBsYW5lKTsKIAlpbnQgcGl4ZWxfc2l6ZTsKIAot CWlmICghaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkKSB7CisJaWYgKCFpbnRlbF9jcnRjLT5w cmltYXJ5X2VuYWJsZWQgfHwgIWZiKSB7CiAJCUk5MTVfV1JJVEUocmVnLCAwKTsKIAkJSTkxNV9X UklURShEU1BTVVJGKHBsYW5lKSwgMCk7CiAJCVBPU1RJTkdfUkVBRChyZWcpOwpAQCAtMzAwMSw3 ICszMDAxLDcgQEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCiAJdW5zaWduZWQgbG9uZyBzdXJmX2FkZHI7CiAJc3RydWN0IGRy bV9wbGFuZSAqcGxhbmU7CiAKLQlpZiAoIWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCkgewor CWlmICghaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkIHx8ICFmYikgewogCQlJOTE1X1dSSVRF KFBMQU5FX0NUTChwaXBlLCAwKSwgMCk7CiAJCUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBlLCAw KSwgMCk7CiAJCVBPU1RJTkdfUkVBRChQTEFORV9DVEwocGlwZSwgMCkpOwpAQCAtMTMyNDUsNiAr MTMyNDUsMjAgQEAgaW50ZWxfY29tbWl0X3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsCiAJfQogfQogCitzdGF0aWMgdm9pZAoraW50ZWxfZGlzYWJsZV9wcmltYXJ5X3BsYW5l KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJICAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK KwkJCSAgICBib29sIGZvcmNlKQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CisKKwlpZiAoIWZvcmNlKQorCQl0b19pbnRlbF9jcnRjKGNydGMpLT5wcmltYXJ5X2VuYWJs ZWQgPSBmYWxzZTsKKworCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lKGNy dGMsIE5VTEwsIDAsIDApOworfQorCiBzdGF0aWMgdm9pZCBpbnRlbF9iZWdpbl9jcnRjX2NvbW1p dChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNy dGMtPmRldjsKQEAgLTEzMzg2LDYgKzEzNDAwLDcgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUg KmludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJcHJp bWFyeS0+cGxhbmUgPSBwaXBlOwogCXByaW1hcnktPmNoZWNrX3BsYW5lID0gaW50ZWxfY2hlY2tf cHJpbWFyeV9wbGFuZTsKIAlwcmltYXJ5LT5jb21taXRfcGxhbmUgPSBpbnRlbF9jb21taXRfcHJp bWFyeV9wbGFuZTsKKwlwcmltYXJ5LT5kaXNhYmxlX3BsYW5lID0gaW50ZWxfZGlzYWJsZV9wcmlt YXJ5X3BsYW5lOwogCXByaW1hcnktPmNrZXkuZmxhZ3MgPSBJOTE1X1NFVF9DT0xPUktFWV9OT05F OwogCWlmIChIQVNfRkJDKGRldikgJiYgSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA0KQogCQlwcmlt YXJ5LT5wbGFuZSA9ICFwaXBlOwpAQCAtMTM0OTEsNiArMTM1MDYsMjIgQEAgZmluaXNoOgogfQog CiBzdGF0aWMgdm9pZAoraW50ZWxfZGlzYWJsZV9jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUsCisJCQkgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCQkgICBib29sIGZvcmNl KQoreworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRj KTsKKworCWlmICghZm9yY2UpIHsKKwkJcGxhbmUtPmZiID0gTlVMTDsKKwkJaW50ZWxfY3J0Yy0+ Y3Vyc29yX2JvID0gTlVMTDsKKwkJaW50ZWxfY3J0Yy0+Y3Vyc29yX2FkZHIgPSAwOworCX0KKwor CWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihjcnRjLCBmYWxzZSk7Cit9CisKK3N0YXRpYyB2b2lk CiBpbnRlbF9jb21taXRfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJ ICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQogewpAQCAtMTM1NDksNiArMTM1ODAs NyBAQCBzdGF0aWMgc3RydWN0IGRybV9wbGFuZSAqaW50ZWxfY3Vyc29yX3BsYW5lX2NyZWF0ZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0YXRlLT5zY2FsZXJfaWQgPSAtMTsKIAljdXJzb3It PmNoZWNrX3BsYW5lID0gaW50ZWxfY2hlY2tfY3Vyc29yX3BsYW5lOwogCWN1cnNvci0+Y29tbWl0 X3BsYW5lID0gaW50ZWxfY29tbWl0X2N1cnNvcl9wbGFuZTsKKwljdXJzb3ItPmRpc2FibGVfcGxh bmUgPSBpbnRlbF9kaXNhYmxlX2N1cnNvcl9wbGFuZTsKIAogCWRybV91bml2ZXJzYWxfcGxhbmVf aW5pdChkZXYsICZjdXJzb3ItPmJhc2UsIDAsCiAJCQkJICZpbnRlbF9wbGFuZV9mdW5jcywKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggOWZiMmQwYi4uNDI1NDhiYyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKQEAgLTU5Nyw3ICs1OTcsNyBAQCBzdHJ1Y3QgaW50ZWxfcGxhbmUgewog CQkJICAgICB1aW50MzJfdCB4LCB1aW50MzJfdCB5LAogCQkJICAgICB1aW50MzJfdCBzcmNfdywg dWludDMyX3Qgc3JjX2gpOwogCXZvaWQgKCpkaXNhYmxlX3BsYW5lKShzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSwKLQkJCSAgICAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CisJCQkgICAgICBzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsIGJvb2wgZm9yY2UpOwogCWludCAoKmNoZWNrX3BsYW5lKShzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3Rh dGUpOwogCXZvaWQgKCpjb21taXRfcGxhbmUpKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCA2MTJkOGUwLi42MzE2NDU0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMzEzLDExICszMTMsMTEgQEAgc2tsX3VwZGF0 ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0 YywKIH0KIAogc3RhdGljIHZvaWQKLXNrbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg KmRybV9wbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjKQorc2tsX2Rpc2FibGVfcGxhbmUoc3Ry dWN0IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGJvb2wgZm9yY2Up CiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRybV9wbGFuZS0+ZGV2OworCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSBkcGxhbmUtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxf cGxhbmUgPSB0b19pbnRlbF9wbGFuZShkcm1fcGxhbmUpOworCXN0cnVjdCBpbnRlbF9wbGFuZSAq aW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShkcGxhbmUpOwogCWNvbnN0IGludCBwaXBlID0g aW50ZWxfcGxhbmUtPnBpcGU7CiAJY29uc3QgaW50IHBsYW5lID0gaW50ZWxfcGxhbmUtPnBsYW5l ICsgMTsKIApAQCAtMzI3LDcgKzMyNyw3IEBAIHNrbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1f cGxhbmUgKmRybV9wbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjKQogCUk5MTVfV1JJVEUoUExB TkVfU1VSRihwaXBlLCBwbGFuZSksIDApOwogCVBPU1RJTkdfUkVBRChQTEFORV9TVVJGKHBpcGUs IHBsYW5lKSk7CiAKLQlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MoZHJtX3BsYW5lLCBj cnRjLCAwLCAwLCAwLCBmYWxzZSwgZmFsc2UpOworCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJt YXJrcyhkcGxhbmUsIGNydGMsIDAsIDAsIDAsIGZhbHNlLCBmYWxzZSk7CiB9CiAKIHN0YXRpYyB2 b2lkCkBAIC00OTksNyArNDk5LDcgQEAgdmx2X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5l ICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIH0KIAogc3RhdGljIHZvaWQKLXZsdl9k aXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpj cnRjKQordmx2X2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsIGJvb2wgZm9yY2UpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGRwbGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ ZGV2X3ByaXZhdGU7CkBAIC02NDUsNyArNjQ1LDcgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogfQogCiBzdGF0aWMgdm9p ZAotaXZiX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKK2l2Yl9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBz dHJ1Y3QgZHJtX2NydGMgKmNydGMsIGJvb2wgZm9yY2UpCiB7CiAJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IHBsYW5lLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTc3Niw3ICs3NzYsNyBAQCBpbGtfdXBkYXRlX3BsYW5lKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiB9CiAKIHN0YXRp YyB2b2lkCi1pbGtfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0 IGRybV9jcnRjICpjcnRjKQoraWxrX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBmb3JjZSkKIHsKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gcGxhbmUtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBkZXYtPmRldl9wcml2YXRlOwpAQCAtMTA3Nyw3ICsxMDc3LDcgQEAgaW50ZWxfY29tbWl0 X3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCQkJCSAgY3J0Y194LCBj cnRjX3ksIGNydGNfdywgY3J0Y19oLAogCQkJCQkJICBzcmNfeCwgc3JjX3ksIHNyY193LCBzcmNf aCk7CiAJCX0gZWxzZSB7Ci0JCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShwbGFuZSwgY3J0 Yyk7CisJCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShwbGFuZSwgY3J0YywgZmFsc2UpOwog CQl9CiAJfQogfQotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==