From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juha-Pekka Heikkila Subject: [PATCH 3/3] drm/i915: Unify skylake plane disable Date: Tue, 12 Sep 2017 12:19:40 +0300 Message-ID: <1505207980-18439-4-git-send-email-juhapekka.heikkila@gmail.com> References: <1505207980-18439-1-git-send-email-juhapekka.heikkila@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8F30A6E59A for ; Tue, 12 Sep 2017 09:19:50 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id p37so5609361wrb.5 for ; Tue, 12 Sep 2017 02:19:50 -0700 (PDT) In-Reply-To: <1505207980-18439-1-git-send-email-juhapekka.heikkila@gmail.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 RG9uJ3QgaGFuZGxlIHNreWxha2UgcHJpbWFyeSBwbGFuZSBzZXBhcmF0ZWx5IGFzIGl0IGlzIHNp bWlsYXIKcGxhbmUgYXMgdGhlIG90aGVycy4KClNpZ25lZC1vZmYtYnk6IEp1aGEtUGVra2EgSGVp a2tpbGEgPGp1aGFwZWtrYS5oZWlra2lsYUBnbWFpbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMjEgKystLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9zcHJpdGUuYyAgfCAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMo KyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRl eCA3MzkwMDNkLi5hZmVhZDIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC0zNTUwLDIzICszNTUwLDYgQEAgdTMyIHNrbF9wbGFuZV9jdGwoY29uc3Qgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJcmV0dXJuIHBsYW5lX2N0bDsKIH0KIAotc3RhdGlj IHZvaWQgc2t5bGFrZV9kaXNhYmxlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpw cmltYXJ5LAotCQkJCQkgIHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQotewotCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocHJpbWFyeS0+YmFzZS5kZXYpOwotCWVu dW0gcGxhbmVfaWQgcGxhbmVfaWQgPSBwcmltYXJ5LT5pZDsKLQllbnVtIHBpcGUgcGlwZSA9IHBy aW1hcnktPnBpcGU7Ci0JdW5zaWduZWQgbG9uZyBpcnFmbGFnczsKLQotCXNwaW5fbG9ja19pcnFz YXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKLQotCUk5MTVfV1JJVEVfRlco UExBTkVfQ1RMKHBpcGUsIHBsYW5lX2lkKSwgMCk7Ci0JSTkxNV9XUklURV9GVyhQTEFORV9TVVJG KHBpcGUsIHBsYW5lX2lkKSwgMCk7Ci0JUE9TVElOR19SRUFEX0ZXKFBMQU5FX1NVUkYocGlwZSwg cGxhbmVfaWQpKTsKLQotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUu bG9jaywgaXJxZmxhZ3MpOwotfQotCiBzdGF0aWMgaW50CiBfX2ludGVsX2Rpc3BsYXlfcmVzdW1l KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCSAgICAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUsCkBAIC0xMzE1MCw3ICsxMzEzMyw3IEBAIGludGVsX3ByaW1hcnlfcGxhbmVfY3Jl YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiAJ CW1vZGlmaWVycyA9IHNrbF9mb3JtYXRfbW9kaWZpZXJzX2NjczsKIAogCQlwcmltYXJ5LT51cGRh dGVfcGxhbmUgPSBza2xfdXBkYXRlX3BsYW5lOwotCQlwcmltYXJ5LT5kaXNhYmxlX3BsYW5lID0g c2t5bGFrZV9kaXNhYmxlX3ByaW1hcnlfcGxhbmU7CisJCXByaW1hcnktPmRpc2FibGVfcGxhbmUg PSBza2xfZGlzYWJsZV9wbGFuZTsKIAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g OSkgewogCQlpbnRlbF9wcmltYXJ5X2Zvcm1hdHMgPSBza2xfcHJpbWFyeV9mb3JtYXRzOwogCQlu dW1fZm9ybWF0cyA9IEFSUkFZX1NJWkUoc2tsX3ByaW1hcnlfZm9ybWF0cyk7CkBAIC0xMzE2MCw3 ICsxMzE0Myw3IEBAIGludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiAJCQltb2RpZmllcnMgPSBza2xfZm9y bWF0X21vZGlmaWVyc19ub2NjczsKIAogCQlwcmltYXJ5LT51cGRhdGVfcGxhbmUgPSBza2xfdXBk YXRlX3BsYW5lOwotCQlwcmltYXJ5LT5kaXNhYmxlX3BsYW5lID0gc2t5bGFrZV9kaXNhYmxlX3By aW1hcnlfcGxhbmU7CisJCXByaW1hcnktPmRpc2FibGVfcGxhbmUgPSBza2xfZGlzYWJsZV9wbGFu ZTsKIAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNCkgewogCQlpbnRlbF9wcmlt YXJ5X2Zvcm1hdHMgPSBpOTY1X3ByaW1hcnlfZm9ybWF0czsKIAkJbnVtX2Zvcm1hdHMgPSBBUlJB WV9TSVpFKGk5NjVfcHJpbWFyeV9mb3JtYXRzKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5k ZXggYTY5MGNjNS4uYTkyYzJlMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTE5MTUs NiArMTkxNSw3IEBAIHZvaWQgaW50ZWxfcGlwZV91cGRhdGVfZW5kKHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpuZXdfY3J0Y19zdGF0ZSk7CiB2b2lkIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGlu dGVsX3BsYW5lICpwbGFuZSwKIAkJICAgICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUsCiAJCSAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxh bmVfc3RhdGUpOwordm9pZCBza2xfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBs YW5lLCBzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7CiAKIC8qIGludGVsX3R2LmMgKi8KIHZvaWQg aW50ZWxfdHZfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCAyZWM0MTA4Li4yMjU5OGMyIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMzA1LDcgKzMwNSw3IEBAIHNrbF91cGRhdGVfcGxh bmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZk ZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIH0KIAotc3RhdGljIHZvaWQKK3ZvaWQK IHNrbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsIHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUocGxhbmUtPmJhc2UuZGV2KTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK