From: ville.syrjala@linux.intel.com Subject: [PATCH 02/14] drm/i915: Use skl_plane_ctl() for the SKL "sprite" planes Date: Fri, 17 Mar 2017 23:17:56 +0200 Message-ID: <20170317211808.14693-3-ville.syrjala@linux.intel.com> References: <20170317211808.14693-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id B54676EDBD for ; Fri, 17 Mar 2017 21:18:18 +0000 (UTC) In-Reply-To: <20170317211808.14693-1-ville.syrjala@linux.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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk9u IFNLTCB0aGUgcGxhbmVzIGFyZSB1bmlmb3JtIHNvIHRoZSAic3ByaXRlcyIgY2FuIHVzZSB0aGUK cHJpbWFyeSBwbGFuZSBjb2RlIHBlcmZlY3RseSBmaW5lLiBUaGUgb25seSBkaWZmZXJlbmNlIHdl CmhhdmUgaXMgdGhlIGNvbG9yIGtleSBoYW5kbGluZywgYnV0IHNpbmNlIHdlIG5ldmVyIGVuYWJs ZSB0aGF0CmZvciB0aGUgcHJpbWFyeSBwbGFuZSB0aGUgc2FtZSBjb2RlIHdvcmtzIGp1c3QgZmlu ZS4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5p bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTYg KysrKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwg IDUgKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDE4ICstLS0t LS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAyNSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNmRkZjVjOTBk MTVjLi44YTlmMWJkMjFlMGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAg LTMyNTQsNyArMzI1NCw3IEBAIHUzMiBza2xfcGxhbmVfc3RyaWRlKGNvbnN0IHN0cnVjdCBkcm1f ZnJhbWVidWZmZXIgKmZiLCBpbnQgcGxhbmUsCiAJcmV0dXJuIHN0cmlkZTsKIH0KIAotdTMyIHNr bF9wbGFuZV9jdGxfZm9ybWF0KHVpbnQzMl90IHBpeGVsX2Zvcm1hdCkKK3N0YXRpYyB1MzIgc2ts X3BsYW5lX2N0bF9mb3JtYXQodWludDMyX3QgcGl4ZWxfZm9ybWF0KQogewogCXN3aXRjaCAocGl4 ZWxfZm9ybWF0KSB7CiAJY2FzZSBEUk1fRk9STUFUX0M4OgpAQCAtMzI5NSw3ICszMjk1LDcgQEAg dTMyIHNrbF9wbGFuZV9jdGxfZm9ybWF0KHVpbnQzMl90IHBpeGVsX2Zvcm1hdCkKIAlyZXR1cm4g MDsKIH0KIAotdTMyIHNrbF9wbGFuZV9jdGxfdGlsaW5nKHVpbnQ2NF90IGZiX21vZGlmaWVyKQor c3RhdGljIHUzMiBza2xfcGxhbmVfY3RsX3RpbGluZyh1aW50NjRfdCBmYl9tb2RpZmllcikKIHsK IAlzd2l0Y2ggKGZiX21vZGlmaWVyKSB7CiAJY2FzZSBEUk1fRk9STUFUX01PRF9OT05FOgpAQCAt MzMxMyw3ICszMzEzLDcgQEAgdTMyIHNrbF9wbGFuZV9jdGxfdGlsaW5nKHVpbnQ2NF90IGZiX21v ZGlmaWVyKQogCXJldHVybiAwOwogfQogCi11MzIgc2tsX3BsYW5lX2N0bF9yb3RhdGlvbih1bnNp Z25lZCBpbnQgcm90YXRpb24pCitzdGF0aWMgdTMyIHNrbF9wbGFuZV9jdGxfcm90YXRpb24odW5z aWduZWQgaW50IHJvdGF0aW9uKQogewogCXN3aXRjaCAocm90YXRpb24pIHsKIAljYXNlIERSTV9S T1RBVEVfMDoKQEAgLTMzMzUsMTMgKzMzMzUsMTQgQEAgdTMyIHNrbF9wbGFuZV9jdGxfcm90YXRp b24odW5zaWduZWQgaW50IHJvdGF0aW9uKQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgdTMyIHNr bF9wbGFuZV9jdGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCi0J CQkgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKK3UzMiBza2xf cGxhbmVfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkg IGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0KIAkJdG9faTkxNShwbGFuZV9zdGF0ZS0+YmFz ZS5wbGFuZS0+ZGV2KTsKIAljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5l X3N0YXRlLT5iYXNlLmZiOwogCXVuc2lnbmVkIGludCByb3RhdGlvbiA9IHBsYW5lX3N0YXRlLT5i YXNlLnJvdGF0aW9uOworCWNvbnN0IHN0cnVjdCBkcm1faW50ZWxfc3ByaXRlX2NvbG9ya2V5ICpr ZXkgPSAmcGxhbmVfc3RhdGUtPmNrZXk7CiAJdTMyIHBsYW5lX2N0bDsKIAogCXBsYW5lX2N0bCA9 IFBMQU5FX0NUTF9FTkFCTEU7CkBAIC0zMzU3LDYgKzMzNTgsMTEgQEAgc3RhdGljIHUzMiBza2xf cGxhbmVfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXBs YW5lX2N0bCB8PSBza2xfcGxhbmVfY3RsX3RpbGluZyhmYi0+bW9kaWZpZXIpOwogCXBsYW5lX2N0 bCB8PSBza2xfcGxhbmVfY3RsX3JvdGF0aW9uKHJvdGF0aW9uKTsKIAorCWlmIChrZXktPmZsYWdz ICYgSTkxNV9TRVRfQ09MT1JLRVlfREVTVElOQVRJT04pCisJCXBsYW5lX2N0bCB8PSBQTEFORV9D VExfS0VZX0VOQUJMRV9ERVNUSU5BVElPTjsKKwllbHNlIGlmIChrZXktPmZsYWdzICYgSTkxNV9T RVRfQ09MT1JLRVlfU09VUkNFKQorCQlwbGFuZV9jdGwgfD0gUExBTkVfQ1RMX0tFWV9FTkFCTEVf U09VUkNFOworCiAJcmV0dXJuIHBsYW5lX2N0bDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aAppbmRleCA1MTIyOGZlNDI4M2IuLjQ1ZTU1YjQ1ZTc3MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKQEAgLTE0NDUsOSArMTQ0NSw4IEBAIHN0YXRpYyBpbmxpbmUgdTMyIGludGVsX3BsYW5l X2dndHRfb2Zmc2V0KGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiAJcmV0 dXJuIGk5MTVfZ2d0dF9vZmZzZXQoc3RhdGUtPnZtYSk7CiB9CiAKLXUzMiBza2xfcGxhbmVfY3Rs X2Zvcm1hdCh1aW50MzJfdCBwaXhlbF9mb3JtYXQpOwotdTMyIHNrbF9wbGFuZV9jdGxfdGlsaW5n KHVpbnQ2NF90IGZiX21vZGlmaWVyKTsKLXUzMiBza2xfcGxhbmVfY3RsX3JvdGF0aW9uKHVuc2ln bmVkIGludCByb3RhdGlvbik7Cit1MzIgc2tsX3BsYW5lX2N0bChjb25zdCBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKKwkJICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh dGUgKnBsYW5lX3N0YXRlKTsKIHUzMiBza2xfcGxhbmVfc3RyaWRlKGNvbnN0IHN0cnVjdCBkcm1f ZnJhbWVidWZmZXIgKmZiLCBpbnQgcGxhbmUsCiAJCSAgICAgdW5zaWduZWQgaW50IHJvdGF0aW9u KTsKIGludCBza2xfY2hlY2tfcGxhbmVfc3VyZmFjZShzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg KnBsYW5lX3N0YXRlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggYjkzMWQw YmQ3YTY0Li40NTVhOWVkNDQyMDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBA IC0yMzIsMjMgKzIzMiw3IEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJt X3BsYW5lLAogCXVpbnQzMl90IHNyY19oID0gZHJtX3JlY3RfaGVpZ2h0KCZwbGFuZV9zdGF0ZS0+ YmFzZS5zcmMpID4+IDE2OwogCXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7CiAKLQlwbGFuZV9jdGwg PSBQTEFORV9DVExfRU5BQkxFOwotCi0JaWYgKCFJU19HRU1JTklMQUtFKGRldl9wcml2KSkgewot CQlwbGFuZV9jdGwgfD0KLQkJCVBMQU5FX0NUTF9QSVBFX0dBTU1BX0VOQUJMRSB8Ci0JCQlQTEFO RV9DVExfUElQRV9DU0NfRU5BQkxFIHwKLQkJCVBMQU5FX0NUTF9QTEFORV9HQU1NQV9ESVNBQkxF OwotCX0KLQotCXBsYW5lX2N0bCB8PSBza2xfcGxhbmVfY3RsX2Zvcm1hdChmYi0+Zm9ybWF0LT5m b3JtYXQpOwotCXBsYW5lX2N0bCB8PSBza2xfcGxhbmVfY3RsX3RpbGluZyhmYi0+bW9kaWZpZXIp OwotCXBsYW5lX2N0bCB8PSBza2xfcGxhbmVfY3RsX3JvdGF0aW9uKHJvdGF0aW9uKTsKLQotCWlm IChrZXktPmZsYWdzICYgSTkxNV9TRVRfQ09MT1JLRVlfREVTVElOQVRJT04pCi0JCXBsYW5lX2N0 bCB8PSBQTEFORV9DVExfS0VZX0VOQUJMRV9ERVNUSU5BVElPTjsKLQllbHNlIGlmIChrZXktPmZs YWdzICYgSTkxNV9TRVRfQ09MT1JLRVlfU09VUkNFKQotCQlwbGFuZV9jdGwgfD0gUExBTkVfQ1RM X0tFWV9FTkFCTEVfU09VUkNFOworCXBsYW5lX2N0bCA9IHNrbF9wbGFuZV9jdGwoY3J0Y19zdGF0 ZSwgcGxhbmVfc3RhdGUpOwogCiAJLyogU2l6ZXMgYXJlIDAgYmFzZWQgKi8KIAlzcmNfdy0tOwot LSAKMi4xMC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK