From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [PATCH 2/7] drm/i915: Allow intel_plane_disable() to operate on all plane types Date: Thu, 13 Nov 2014 10:43:21 -0800 Message-ID: <1415904206-22548-3-git-send-email-matthew.d.roper@intel.com> References: <1415904206-22548-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1415904206-22548-1-git-send-email-matthew.d.roper@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 Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org V2UnbGwgd2FudCB0byBjYWxsIHRoaXMgZnJvbSB0aGUgdHlwZS1hZ25vc3RpYyBhdG9taWMgcGxh bmUgaGVscGVyCmhvb2tzLiAgU2luY2UgaXQncyBub3Qgc3ByaXRlLXNwZWNpZmljIGFueW1vcmUs IG1vcmUgaXQgdG8KaW50ZWxfZGlzcGxheS5jIGFzIHdlbGwuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0 IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyB8IDIxICsrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9zcHJpdGUuYyAgfCAxMCArLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDI0IGlu c2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwppbmRleCBhOWY5MGI4Li5jNjU5OGU5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCkBAIC0xMzY3OSwzICsxMzY3OSwyNCBAQCB2b2lkIGludGVsX21vZGVzZXRfcHJlY2xv c2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKQogCQlzcGlu X3VubG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7CiAJfQogfQorCit2b2lkIGludGVsX3BsYW5l X2Rpc2FibGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCit7CisJaWYgKCFwbGFuZS0+Y3J0YyB8 fCAhcGxhbmUtPmZiKQorCQlyZXR1cm47CisKKwlzd2l0Y2ggKHBsYW5lLT50eXBlKSB7CisJY2Fz ZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgorCQlpbnRlbF9wcmltYXJ5X3BsYW5lX2Rpc2FibGUo cGxhbmUpOworCQlicmVhazsKKwljYXNlIERSTV9QTEFORV9UWVBFX0NVUlNPUjoKKwkJaW50ZWxf Y3Vyc29yX3BsYW5lX2Rpc2FibGUocGxhbmUpOworCQlicmVhazsKKwljYXNlIERSTV9QTEFORV9U WVBFX09WRVJMQVk6CisJCWludGVsX2Rpc2FibGVfcGxhbmUocGxhbmUpOworCQlicmVhazsKKwlk ZWZhdWx0OgorCQlXQVJOKDEsICJVbmtub3duIHBsYW5lIHR5cGUiKTsKKwl9Cit9CisKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggYmQ1ZWY0ZS4uZGYxNDIwYiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKQEAgLTkyMCw2ICs5MjAsNyBAQCB2b2lkIGludGVsX3ByZXBhcmVfcGFnZV9m bGlwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwbGFuZSk7CiB2b2lkIGludGVsX2Zpbmlz aF9wYWdlX2ZsaXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBpcGUpOwogdm9pZCBpbnRl bF9maW5pc2hfcGFnZV9mbGlwX3BsYW5lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwbGFu ZSk7CiB2b2lkIGludGVsX2NoZWNrX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBp bnQgcGlwZSk7Cit2b2lkIGludGVsX3BsYW5lX2Rpc2FibGUoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUpOwogCiAvKiBzaGFyZWQgZHBsbCBmdW5jdGlvbnMgKi8KIHN0cnVjdCBpbnRlbF9zaGFyZWRf ZHBsbCAqaW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7 CkBAIC0xMTgwLDcgKzExODEsNiBAQCBpbnQgaW50ZWxfcGxhbmVfc2V0X3Byb3BlcnR5KHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICAgICBzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9wLAog CQkJICAgICB1aW50NjRfdCB2YWwpOwogaW50IGludGVsX3BsYW5lX3Jlc3RvcmUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUpOwotdm9pZCBpbnRlbF9wbGFuZV9kaXNhYmxlKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lKTsKIGludCBpbnRlbF9zcHJpdGVfc2V0X2NvbG9ya2V5KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCQkgICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJp dik7CiBpbnQgaW50ZWxfc3ByaXRlX2dldF9jb2xvcmtleShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCB2b2lkICpkYXRhLApAQCAtMTE4OCw2ICsxMTg4LDcgQEAgaW50IGludGVsX3Nwcml0ZV9nZXRf Y29sb3JrZXkoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIGJvb2wgaW50ZWxf cGlwZV91cGRhdGVfc3RhcnQoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCQkgICAgIHVpbnQz Ml90ICpzdGFydF92YmxfY291bnQpOwogdm9pZCBpbnRlbF9waXBlX3VwZGF0ZV9lbmQoc3RydWN0 IGludGVsX2NydGMgKmNydGMsIHUzMiBzdGFydF92YmxfY291bnQpOworaW50IGludGVsX2Rpc2Fi bGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpOwogCiAvKiBpbnRlbF90di5jICovCiB2 b2lkIGludGVsX3R2X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jCmluZGV4IGZjOTZkMTMuLjExNWFjZDMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jCkBAIC0xNDI1LDcgKzE0MjUsNyBAQCBpbnRlbF91cGRhdGVfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlyZXR1cm4g MDsKIH0KIAotc3RhdGljIGludAoraW50CiBpbnRlbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwpA QCAtMTU3NiwxNCArMTU3Niw2IEBAIGludCBpbnRlbF9wbGFuZV9yZXN0b3JlKHN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lKQogCQkJCSAgaW50ZWxfcGxhbmUtPnNyY193LCBpbnRlbF9wbGFuZS0+c3Jj X2gpOwogfQogCi12b2lkIGludGVsX3BsYW5lX2Rpc2FibGUoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUpCi17Ci0JaWYgKCFwbGFuZS0+Y3J0YyB8fCAhcGxhbmUtPmZiKQotCQlyZXR1cm47Ci0KLQlp bnRlbF9kaXNhYmxlX3BsYW5lKHBsYW5lKTsKLX0KLQogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1f cGxhbmVfZnVuY3MgaW50ZWxfcGxhbmVfZnVuY3MgPSB7CiAJLnVwZGF0ZV9wbGFuZSA9IGludGVs X3VwZGF0ZV9wbGFuZSwKIAkuZGlzYWJsZV9wbGFuZSA9IGludGVsX2Rpc2FibGVfcGxhbmUsCi0t IAoxLjguNS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=