From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juha-Pekka Heikkila Subject: [PATCH 2/3] drm/i915: Unify skylake plane update Date: Tue, 29 Aug 2017 12:48:03 +0300 Message-ID: <1504000084-25457-3-git-send-email-juhapekka.heikkila@gmail.com> References: <1504000084-25457-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-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 19A866E0E6 for ; Tue, 29 Aug 2017 09:48:24 +0000 (UTC) Received: by mail-pf0-x243.google.com with SMTP id a2so2014838pfj.4 for ; Tue, 29 Aug 2017 02:48:24 -0700 (PDT) In-Reply-To: <1504000084-25457-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 L2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgODEgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMyArKwogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdl ZCwgNiBpbnNlcnRpb25zKCspLCA4MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKaW5kZXggZjkyMmUyZi4uOTA4MmEyYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwpAQCAtMzUzNCw4MyArMzUzNCw2IEBAIHUzMiBza2xfcGxhbmVfY3RsKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXJldHVybiBwbGFuZV9j dGw7CiB9CiAKLXN0YXRpYyB2b2lkIHNreWxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0 IGludGVsX3BsYW5lICpwbGFuZSwKLQkJCQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlLAotCQkJCQkgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFu ZV9zdGF0ZSkKLXsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KHBsYW5lLT5iYXNlLmRldik7Ci0Jc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9j cnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7Ci0JY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZl ciAqZmIgPSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKLQllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0g cGxhbmUtPmlkOwotCWVudW0gcGlwZSBwaXBlID0gcGxhbmUtPnBpcGU7Ci0JdTMyIHBsYW5lX2N0 bCA9IHBsYW5lX3N0YXRlLT5jdGw7Ci0JdW5zaWduZWQgaW50IHJvdGF0aW9uID0gcGxhbmVfc3Rh dGUtPmJhc2Uucm90YXRpb247Ci0JdTMyIHN0cmlkZSA9IHNrbF9wbGFuZV9zdHJpZGUoZmIsIDAs IHJvdGF0aW9uKTsKLQl1MzIgYXV4X3N0cmlkZSA9IHNrbF9wbGFuZV9zdHJpZGUoZmIsIDEsIHJv dGF0aW9uKTsKLQl1MzIgc3VyZl9hZGRyID0gcGxhbmVfc3RhdGUtPm1haW4ub2Zmc2V0OwotCWlu dCBzY2FsZXJfaWQgPSBwbGFuZV9zdGF0ZS0+c2NhbGVyX2lkOwotCWludCBzcmNfeCA9IHBsYW5l X3N0YXRlLT5tYWluLng7Ci0JaW50IHNyY195ID0gcGxhbmVfc3RhdGUtPm1haW4ueTsKLQlpbnQg c3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmcGxhbmVfc3RhdGUtPmJhc2Uuc3JjKSA+PiAxNjsKLQlp bnQgc3JjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnBsYW5lX3N0YXRlLT5iYXNlLnNyYykgPj4gMTY7 Ci0JaW50IGRzdF94ID0gcGxhbmVfc3RhdGUtPmJhc2UuZHN0LngxOwotCWludCBkc3RfeSA9IHBs YW5lX3N0YXRlLT5iYXNlLmRzdC55MTsKLQlpbnQgZHN0X3cgPSBkcm1fcmVjdF93aWR0aCgmcGxh bmVfc3RhdGUtPmJhc2UuZHN0KTsKLQlpbnQgZHN0X2ggPSBkcm1fcmVjdF9oZWlnaHQoJnBsYW5l X3N0YXRlLT5iYXNlLmRzdCk7Ci0JdW5zaWduZWQgbG9uZyBpcnFmbGFnczsKLQotCS8qIFNpemVz IGFyZSAwIGJhc2VkICovCi0Jc3JjX3ctLTsKLQlzcmNfaC0tOwotCWRzdF93LS07Ci0JZHN0X2gt LTsKLQotCWNydGMtPmRzcGFkZHJfb2Zmc2V0ID0gc3VyZl9hZGRyOwotCi0JY3J0Yy0+YWRqdXN0 ZWRfeCA9IHNyY194OwotCWNydGMtPmFkanVzdGVkX3kgPSBzcmNfeTsKLQotCXNwaW5fbG9ja19p cnFzYXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKLQotCWlmIChJU19HRU1J TklMQUtFKGRldl9wcml2KSB8fCBJU19DQU5OT05MQUtFKGRldl9wcml2KSkgewotCQlJOTE1X1dS SVRFX0ZXKFBMQU5FX0NPTE9SX0NUTChwaXBlLCBwbGFuZV9pZCksCi0JCQkgICAgICBQTEFORV9D T0xPUl9QSVBFX0dBTU1BX0VOQUJMRSB8Ci0JCQkgICAgICBQTEFORV9DT0xPUl9QSVBFX0NTQ19F TkFCTEUgfAotCQkJICAgICAgUExBTkVfQ09MT1JfUExBTkVfR0FNTUFfRElTQUJMRSk7Ci0JfQot Ci0JSTkxNV9XUklURV9GVyhQTEFORV9DVEwocGlwZSwgcGxhbmVfaWQpLCBwbGFuZV9jdGwpOwot CUk5MTVfV1JJVEVfRlcoUExBTkVfT0ZGU0VUKHBpcGUsIHBsYW5lX2lkKSwgKHNyY195IDw8IDE2 KSB8IHNyY194KTsKLQlJOTE1X1dSSVRFX0ZXKFBMQU5FX1NUUklERShwaXBlLCBwbGFuZV9pZCks IHN0cmlkZSk7Ci0JSTkxNV9XUklURV9GVyhQTEFORV9TSVpFKHBpcGUsIHBsYW5lX2lkKSwgKHNy Y19oIDw8IDE2KSB8IHNyY193KTsKLQlJOTE1X1dSSVRFX0ZXKFBMQU5FX0FVWF9ESVNUKHBpcGUs IHBsYW5lX2lkKSwKLQkJICAgICAgKHBsYW5lX3N0YXRlLT5hdXgub2Zmc2V0IC0gc3VyZl9hZGRy KSB8IGF1eF9zdHJpZGUpOwotCUk5MTVfV1JJVEVfRlcoUExBTkVfQVVYX09GRlNFVChwaXBlLCBw bGFuZV9pZCksCi0JCSAgICAgIChwbGFuZV9zdGF0ZS0+YXV4LnkgPDwgMTYpIHwgcGxhbmVfc3Rh dGUtPmF1eC54KTsKLQotCWlmIChzY2FsZXJfaWQgPj0gMCkgewotCQl1aW50MzJfdCBwc19jdHJs ID0gMDsKLQotCQlXQVJOX09OKCFkc3RfdyB8fCAhZHN0X2gpOwotCQlwc19jdHJsID0gUFNfU0NB TEVSX0VOIHwgUFNfUExBTkVfU0VMKHBsYW5lX2lkKSB8Ci0JCQljcnRjX3N0YXRlLT5zY2FsZXJf c3RhdGUuc2NhbGVyc1tzY2FsZXJfaWRdLm1vZGU7Ci0JCUk5MTVfV1JJVEVfRlcoU0tMX1BTX0NU UkwocGlwZSwgc2NhbGVyX2lkKSwgcHNfY3RybCk7Ci0JCUk5MTVfV1JJVEVfRlcoU0tMX1BTX1BX Ul9HQVRFKHBpcGUsIHNjYWxlcl9pZCksIDApOwotCQlJOTE1X1dSSVRFX0ZXKFNLTF9QU19XSU5f UE9TKHBpcGUsIHNjYWxlcl9pZCksIChkc3RfeCA8PCAxNikgfCBkc3RfeSk7Ci0JCUk5MTVfV1JJ VEVfRlcoU0tMX1BTX1dJTl9TWihwaXBlLCBzY2FsZXJfaWQpLCAoZHN0X3cgPDwgMTYpIHwgZHN0 X2gpOwotCQlJOTE1X1dSSVRFX0ZXKFBMQU5FX1BPUyhwaXBlLCBwbGFuZV9pZCksIDApOwotCX0g ZWxzZSB7Ci0JCUk5MTVfV1JJVEVfRlcoUExBTkVfUE9TKHBpcGUsIHBsYW5lX2lkKSwgKGRzdF95 IDw8IDE2KSB8IGRzdF94KTsKLQl9Ci0KLQlJOTE1X1dSSVRFX0ZXKFBMQU5FX1NVUkYocGlwZSwg cGxhbmVfaWQpLAotCQkgICAgICBpbnRlbF9wbGFuZV9nZ3R0X29mZnNldChwbGFuZV9zdGF0ZSkg KyBzdXJmX2FkZHIpOwotCi0JUE9TVElOR19SRUFEX0ZXKFBMQU5FX1NVUkYocGlwZSwgcGxhbmVf aWQpKTsKLQotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUubG9jaywg aXJxZmxhZ3MpOwotfQotCiBzdGF0aWMgdm9pZCBza3lsYWtlX2Rpc2FibGVfcHJpbWFyeV9wbGFu ZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnByaW1hcnksCiAJCQkJCSAgc3RydWN0IGludGVsX2NydGMg KmNydGMpCiB7CkBAIC0xMzI2NSw3ICsxMzE4OCw3IEBAIGludGVsX3ByaW1hcnlfcGxhbmVfY3Jl YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiAJ CW51bV9mb3JtYXRzID0gQVJSQVlfU0laRShza2xfcHJpbWFyeV9mb3JtYXRzKTsKIAkJbW9kaWZp ZXJzID0gc2tsX2Zvcm1hdF9tb2RpZmllcnNfY2NzOwogCi0JCXByaW1hcnktPnVwZGF0ZV9wbGFu ZSA9IHNreWxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmU7CisJCXByaW1hcnktPnVwZGF0ZV9wbGFu ZSA9IHNrbF91cGRhdGVfcGxhbmU7CiAJCXByaW1hcnktPmRpc2FibGVfcGxhbmUgPSBza3lsYWtl X2Rpc2FibGVfcHJpbWFyeV9wbGFuZTsKIAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikg Pj0gOSkgewogCQlpbnRlbF9wcmltYXJ5X2Zvcm1hdHMgPSBza2xfcHJpbWFyeV9mb3JtYXRzOwpA QCAtMTMyNzUsNyArMTMxOTgsNyBAQCBpbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcGlwZSBwaXBlKQogCQllbHNlCiAJCQlt b2RpZmllcnMgPSBza2xfZm9ybWF0X21vZGlmaWVyc19ub2NjczsKIAotCQlwcmltYXJ5LT51cGRh dGVfcGxhbmUgPSBza3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lOworCQlwcmltYXJ5LT51cGRh dGVfcGxhbmUgPSBza2xfdXBkYXRlX3BsYW5lOwogCQlwcmltYXJ5LT5kaXNhYmxlX3BsYW5lID0g c2t5bGFrZV9kaXNhYmxlX3ByaW1hcnlfcGxhbmU7CiAJfSBlbHNlIGlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDQpIHsKIAkJaW50ZWxfcHJpbWFyeV9mb3JtYXRzID0gaTk2NV9wcmltYXJ5X2Zv cm1hdHM7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDBkMGFiZWQxLi4xZWZkNjEyIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTg4Nyw2ICsxODg3LDkgQEAgaW50IGludGVs X3Nwcml0ZV9zZXRfY29sb3JrZXkoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwK IAkJCSAgICAgIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2KTsKIHZvaWQgaW50ZWxfcGlwZV91 cGRhdGVfc3RhcnQoc3RydWN0IGludGVsX2NydGMgKmNydGMpOwogdm9pZCBpbnRlbF9waXBlX3Vw ZGF0ZV9lbmQoc3RydWN0IGludGVsX2NydGMgKmNydGMpOwordm9pZCBza2xfdXBkYXRlX3BsYW5l KHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCisJCSAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKnBsYW5lX3N0YXRlKTsKIAogLyogaW50ZWxfdHYuYyAqLwogdm9pZCBpbnRlbF90dl9p bml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Nwcml0ZS5jCmluZGV4IDUyNDkzM2IuLmVmMTY1MTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Nwcml0ZS5jCkBAIC0yMjUsNyArMjI1LDcgQEAgdm9pZCBpbnRlbF9waXBlX3VwZGF0ZV9l bmQoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAjZW5kaWYKIH0KIAotc3RhdGljIHZvaWQKK3Zv aWQKIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAkJIGNvbnN0 IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkgY29uc3Qgc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK