From: Chandra Konduru Subject: [PATCH 21/21] drm/i915: Enable skylake sprite plane scaling using shared scalers Date: Sat, 14 Mar 2015 22:55:46 -0700 Message-ID: <1426398946-5900-22-git-send-email-chandra.konduru@intel.com> References: <1426398946-5900-1-git-send-email-chandra.konduru@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 3EE426E4A6 for ; Sat, 14 Mar 2015 22:56:40 -0700 (PDT) In-Reply-To: <1426398946-5900-1-git-send-email-chandra.konduru@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: ander.conselvan.de.oliveira@intel.com, daniel.vetter@intel.com List-Id: intel-gfx@lists.freedesktop.org VGhpcyBwYXRjaCBlbmFibGVzIHNreWxha2Ugc3ByaXRlIHBsYW5lIGRpc3BsYXkgc2NhbGluZyB1 c2luZyBzaGFyZWQKc2NhbGVycyBhdG9taWMgZGVzZ2luLgoKU2lnbmVkLW9mZi1ieTogQ2hhbmRy YSBLb25kdXJ1IDxjaGFuZHJhLmtvbmR1cnVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Nwcml0ZS5jIHwgICA3OSArKysrKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDYxIGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggMDE5NDM5MC4uZTM5NWEwMiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNs dWRlIDxkcm0vZHJtX2NydGMuaD4KICNpbmNsdWRlIDxkcm0vZHJtX2ZvdXJjYy5oPgogI2luY2x1 ZGUgPGRybS9kcm1fcmVjdC5oPgorI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljLmg+CiAjaW5jbHVk ZSA8ZHJtL2RybV9wbGFuZV9oZWxwZXIuaD4KICNpbmNsdWRlICJpbnRlbF9kcnYuaCIKICNpbmNs dWRlIDxkcm0vaTkxNV9kcm0uaD4KQEAgLTE5MSw2ICsxOTIsOCBAQCBza2xfdXBkYXRlX3BsYW5l KHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWNv bnN0IGludCBwbGFuZSA9IGludGVsX3BsYW5lLT5wbGFuZSArIDE7CiAJdTMyIHBsYW5lX2N0bCwg c3RyaWRlX2RpdjsKIAlpbnQgcGl4ZWxfc2l6ZSA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKGZiLT5w aXhlbF9mb3JtYXQsIDApOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlID0g dG9faW50ZWxfY3J0YyhjcnRjKS0+Y29uZmlnOworCWludCBzY2FsZXJfaWQ7CiAKIAlwbGFuZV9j dGwgPSBJOTE1X1JFQUQoUExBTkVfQ1RMKHBpcGUsIHBsYW5lKSk7CiAKQEAgLTI3NCwxNiArMjc3 LDM5IEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5lLCBzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RyaWRlX2RpdiA9IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1l bnQoZGV2LCBmYi0+bW9kaWZpZXJbMF0sCiAJCQkJCSAgICAgICBmYi0+cGl4ZWxfZm9ybWF0KTsK IAorCXNrbF9kZXRhY2hfc2NhbGVyKGNydGMsIGRybV9wbGFuZSk7CisJc2NhbGVyX2lkID0gdG9f aW50ZWxfcGxhbmVfc3RhdGUoZHJtX3BsYW5lLT5zdGF0ZSktPnNjYWxlcl9pZDsKKwogCS8qIFNp emVzIGFyZSAwIGJhc2VkICovCiAJc3JjX3ctLTsKIAlzcmNfaC0tOwogCWNydGNfdy0tOwogCWNy dGNfaC0tOwogCisJLyogcHJvZ3JhbSBwbGFuZSBzY2FsZXIgKi8KKwlpZiAoc2NhbGVyX2lkID49 IDApIHsKKwkJdWludDMyX3QgcHNfY3RybCA9IDA7CisKKwkJRFJNX0RFQlVHX0tNUygicGxhbmUg PSAlZCBQU19QTEFORV9TRUwocGxhbmUpID0gMHgleFxuIiwgcGxhbmUsCisJCQlQU19QTEFORV9T RUwocGxhbmUpKTsKKwkJcHNfY3RybCA9IFBTX1NDQUxFUl9FTiB8IFBTX1BMQU5FX1NFTChwbGFu ZSkgfAorCQkJY3J0Y19zdGF0ZS0+c2NhbGVyX3N0YXRlLnNjYWxlcnNbc2NhbGVyX2lkXS5tb2Rl IHwKKwkJCWNydGNfc3RhdGUtPnNjYWxlcl9zdGF0ZS5zY2FsZXJzW3NjYWxlcl9pZF0uZmlsdGVy OworCQlJOTE1X1dSSVRFKFNLTF9QU19DVFJMKHBpcGUsIHNjYWxlcl9pZCksIHBzX2N0cmwpOwor CQlJOTE1X1dSSVRFKFNLTF9QU19QV1JfR0FURShwaXBlLCBzY2FsZXJfaWQpLCAwKTsKKwkJSTkx NV9XUklURShTS0xfUFNfV0lOX1BPUyhwaXBlLCBzY2FsZXJfaWQpLCAoY3J0Y194IDw8IDE2KSB8 IGNydGNfeSk7CisJCUk5MTVfV1JJVEUoU0tMX1BTX1dJTl9TWihwaXBlLCBzY2FsZXJfaWQpLAor CQkJKChjcnRjX3cgKyAxKSA8PCAxNil8KGNydGNfaCArIDEpKTsKKworCQlJOTE1X1dSSVRFKFBM QU5FX1BPUyhwaXBlLCBwbGFuZSksIDApOworCQlJOTE1X1dSSVRFKFBMQU5FX1NJWkUocGlwZSwg cGxhbmUpLCAoc3JjX2ggPDwgMTYpIHwgc3JjX3cpOworCX0gZWxzZSB7CisJCUk5MTVfV1JJVEUo UExBTkVfUE9TKHBpcGUsIHBsYW5lKSwgKGNydGNfeSA8PCAxNikgfCBjcnRjX3gpOworCQlJOTE1 X1dSSVRFKFBMQU5FX1NJWkUocGlwZSwgcGxhbmUpLCAoY3J0Y19oIDw8IDE2KSB8IGNydGNfdyk7 CisJfQorCiAJSTkxNV9XUklURShQTEFORV9PRkZTRVQocGlwZSwgcGxhbmUpLCAoeSA8PCAxNikg fCB4KTsKIAlJOTE1X1dSSVRFKFBMQU5FX1NUUklERShwaXBlLCBwbGFuZSksIGZiLT5waXRjaGVz WzBdIC8gc3RyaWRlX2Rpdik7Ci0JSTkxNV9XUklURShQTEFORV9QT1MocGlwZSwgcGxhbmUpLCAo Y3J0Y195IDw8IDE2KSB8IGNydGNfeCk7Ci0JSTkxNV9XUklURShQTEFORV9TSVpFKHBpcGUsIHBs YW5lKSwgKGNydGNfaCA8PCAxNikgfCBjcnRjX3cpOwogCUk5MTVfV1JJVEUoUExBTkVfQ1RMKHBp cGUsIHBsYW5lKSwgcGxhbmVfY3RsKTsKIAlJOTE1X1dSSVRFKFBMQU5FX1NVUkYocGlwZSwgcGxh bmUpLCBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKSk7CiAJUE9TVElOR19SRUFEKFBMQU5F X1NVUkYocGlwZSwgcGxhbmUpKTsKQEAgLTMwNSw2ICszMzEsOCBAQCBza2xfZGlzYWJsZV9wbGFu ZShzdHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlJ OTE1X1dSSVRFKFBMQU5FX0NUTChwaXBlLCBwbGFuZSksIDApOwogCVBPU1RJTkdfUkVBRChQTEFO RV9DVEwocGlwZSwgcGxhbmUpKTsKIAorCXNrbF9kZXRhY2hfc2NhbGVyKGNydGMsIGRybV9wbGFu ZSk7CisKIAlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MoZHJtX3BsYW5lLCBjcnRjLCAw LCAwLCAwLCBmYWxzZSwgZmFsc2UpOwogfQogCkBAIC0xMDg4LDcgKzExMTYsOSBAQCBzdGF0aWMg aW50CiBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ CQkgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKKwlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gcGxhbmUtPmRldjsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRv X2ludGVsX2NydGMoc3RhdGUtPmJhc2UuY3J0Yyk7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGU7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVs X3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5iYXNl LmZiOwogCWludCBjcnRjX3gsIGNydGNfeTsKQEAgLTEwOTcsMTEgKzExMjcsMTYgQEAgaW50ZWxf Y2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBkcm1f cmVjdCAqc3JjID0gJnN0YXRlLT5zcmM7CiAJc3RydWN0IGRybV9yZWN0ICpkc3QgPSAmc3RhdGUt PmRzdDsKIAljb25zdCBzdHJ1Y3QgZHJtX3JlY3QgKmNsaXAgPSAmc3RhdGUtPmNsaXA7CisJc3Ry dWN0IGludGVsX2NydGNfc2NhbGVyX3N0YXRlICpzY2FsZXJfc3RhdGU7CiAJaW50IGhzY2FsZSwg dnNjYWxlOwogCWludCBtYXhfc2NhbGUsIG1pbl9zY2FsZTsKIAlpbnQgcGl4ZWxfc2l6ZTsKKwlp bnQgcmV0OwogCiAJaW50ZWxfY3J0YyA9IGludGVsX2NydGMgPyBpbnRlbF9jcnRjIDogdG9faW50 ZWxfY3J0YyhwbGFuZS0+Y3J0Yyk7CisJY3J0Y19zdGF0ZSA9IHN0YXRlLT5iYXNlLnN0YXRlID8K KwkJaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLT5iYXNlLnN0YXRlLCBpbnRlbF9j cnRjKSA6IE5VTEw7CisJc2NhbGVyX3N0YXRlID0gY3J0Y19zdGF0ZSA/ICZjcnRjX3N0YXRlLT5z Y2FsZXJfc3RhdGUgOiBOVUxMOwogCiAJaWYgKCFmYikgewogCQlzdGF0ZS0+dmlzaWJsZSA9IGZh bHNlOwpAQCAtMTEyOCw2ICsxMTYzLDExIEBAIGludGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAltYXhfc2NhbGUgPSBpbnRlbF9wbGFuZS0+bWF4X2Rvd25z Y2FsZSA8PCAxNjsKIAltaW5fc2NhbGUgPSBpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID8gMSA6ICgx IDw8IDE2KTsKIAorCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5ICYmIHNjYWxlcl9zdGF0 ZSAmJiBzY2FsZXJfc3RhdGUtPm51bV9zY2FsZXJzKSB7CisJCW1pbl9zY2FsZSA9IDE7CisJCW1h eF9zY2FsZSA9ICgxMDAgPDwgMTYpIC8gc2NhbGVyX3N0YXRlLT5zY2FsZXJzWzBdLm1pbl9oc3I7 CisJfQorCiAJZHJtX3JlY3Rfcm90YXRlKHNyYywgZmItPndpZHRoIDw8IDE2LCBmYi0+aGVpZ2h0 IDw8IDE2LAogCQkJc3RhdGUtPmJhc2Uucm90YXRpb24pOwogCkBAIC0xMjIzLDE4ICsxMjYzLDE4 IEBAIGludGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJ d2lkdGhfYnl0ZXMgPSAoKHNyY194ICogcGl4ZWxfc2l6ZSkgJiA2MykgKwogCQkJCQlzcmNfdyAq IHBpeGVsX3NpemU7CiAKLQkJaWYgKHNyY193ID4gMjA0OCB8fCBzcmNfaCA+IDIwNDggfHwKLQkJ ICAgIHdpZHRoX2J5dGVzID4gNDA5NiB8fCBmYi0+cGl0Y2hlc1swXSA+IDQwOTYpIHsKKwkJaWYg KElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgOSAmJiAoc3JjX3cgPiAyMDQ4IHx8IHNyY19oID4gMjA0 OCB8fAorCQkgICAgd2lkdGhfYnl0ZXMgPiA0MDk2IHx8IGZiLT5waXRjaGVzWzBdID4gNDA5Nikp IHsKIAkJCURSTV9ERUJVR19LTVMoIlNvdXJjZSBkaW1lbnNpb25zIGV4Y2VlZCBoYXJkd2FyZSBs aW1pdHNcbiIpOwogCQkJcmV0dXJuIC1FSU5WQUw7CiAJCX0KIAl9CiAKIAlpZiAoc3RhdGUtPnZp c2libGUpIHsKLQkJc3JjLT54MSA9IHNyY194OwotCQlzcmMtPngyID0gc3JjX3ggKyBzcmNfdzsK LQkJc3JjLT55MSA9IHNyY195OwotCQlzcmMtPnkyID0gc3JjX3kgKyBzcmNfaDsKKwkJc3JjLT54 MSA9IHNyY194IDw8IDE2OworCQlzcmMtPngyID0gKHNyY194ICsgc3JjX3cpIDw8IDE2OworCQlz cmMtPnkxID0gc3JjX3kgPDwgMTY7CisJCXNyYy0+eTIgPSAoc3JjX3kgKyBzcmNfaCkgPDwgMTY7 CiAJfQogCiAJZHN0LT54MSA9IGNydGNfeDsKQEAgLTEyNzEsNiArMTMxMSwxMyBAQCBmaW5pc2g6 CiAJCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dtID0gdHJ1ZTsKIAl9CiAKKwlpZiAoSU5U RUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgeworCQlyZXQgPSBza2xfdXBkYXRlX3NjYWxlcl91c2Vy cyhpbnRlbF9jcnRjLCBjcnRjX3N0YXRlLCBpbnRlbF9wbGFuZSwKKwkJCXN0YXRlKTsKKwkJaWYg KHJldCkKKwkJCXJldHVybiByZXQ7CisJfQorCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTEzMDEsMTAg KzEzNDgsMTAgQEAgaW50ZWxfY29tbWl0X3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwKIAkJCWNydGNfeSA9IHN0YXRlLT5kc3QueTE7CiAJCQljcnRjX3cgPSBkcm1fcmVjdF93 aWR0aCgmc3RhdGUtPmRzdCk7CiAJCQljcnRjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnN0YXRlLT5k c3QpOwotCQkJc3JjX3ggPSBzdGF0ZS0+c3JjLngxOwotCQkJc3JjX3kgPSBzdGF0ZS0+c3JjLnkx OwotCQkJc3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmc3RhdGUtPnNyYyk7Ci0JCQlzcmNfaCA9IGRy bV9yZWN0X2hlaWdodCgmc3RhdGUtPnNyYyk7CisJCQlzcmNfeCA9IHN0YXRlLT5zcmMueDEgPj4g MTY7CisJCQlzcmNfeSA9IHN0YXRlLT5zcmMueTEgPj4gMTY7CisJCQlzcmNfdyA9IGRybV9yZWN0 X3dpZHRoKCZzdGF0ZS0+c3JjKSA+PiAxNjsKKwkJCXNyY19oID0gZHJtX3JlY3RfaGVpZ2h0KCZz dGF0ZS0+c3JjKSA+PiAxNjsKIAkJCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUocGxhbmUsIGNy dGMsIGZiLCBvYmosCiAJCQkJCQkgIGNydGNfeCwgY3J0Y195LCBjcnRjX3csIGNydGNfaCwKIAkJ CQkJCSAgc3JjX3gsIHNyY195LCBzcmNfdywgc3JjX2gpOwpAQCAtMTQ5MywxMiArMTU0MCw4IEBA IGludGVsX3BsYW5lX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUs IGludCBwbGFuZSkKIAkJfQogCQlicmVhazsKIAljYXNlIDk6Ci0JCS8qCi0JCSAqIEZJWE1FOiBT a3lsYWtlIHBsYW5lcyBjYW4gYmUgc2NhbGVkICh3aXRoIHNvbWUgcmVzdHJpY3Rpb25zKSwKLQkJ ICogYnV0IHRoaXMgaXMgZm9yIGFub3RoZXIgdGltZS4KLQkJICovCi0JCWludGVsX3BsYW5lLT5j YW5fc2NhbGUgPSBmYWxzZTsKLQkJaW50ZWxfcGxhbmUtPm1heF9kb3duc2NhbGUgPSAxOworCQlp bnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0gdHJ1ZTsKKwkJaW50ZWxfcGxhbmUtPm1heF9kb3duc2Nh bGUgPSAyOyAvKiB1cGRhdGVkIGxhdGVyICovCiAJCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUg PSBza2xfdXBkYXRlX3BsYW5lOwogCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZSA9IHNrbF9k aXNhYmxlX3BsYW5lOwogCQlpbnRlbF9wbGFuZS0+dXBkYXRlX2NvbG9ya2V5ID0gc2tsX3VwZGF0 ZV9jb2xvcmtleTsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==