From: Chandra Konduru Subject: [PATCH 19/20] drm/i915: Enable skylake primary plane scaling using shared scalers Date: Wed, 1 Apr 2015 19:59:48 -0700 Message-ID: <1427943589-6254-20-git-send-email-chandra.konduru@intel.com> References: <1427943589-6254-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 0CF4472167 for ; Wed, 1 Apr 2015 20:00:41 -0700 (PDT) In-Reply-To: <1427943589-6254-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 VGhpcyBwYXRjaCBlbmFibGVzIHNreWxha2UgcHJpbWFyeSBwbGFuZSBkaXNwbGF5IHNjYWxpbmcg dXNpbmcgc2hhcmVkCnNjYWxlcnMgYXRvbWljIGRlc2dpbi4KCnYyOgotdXNlIHNpbmdsZSBjb3B5 IG9mIHNjYWxlciBsaW1pdHMgKE1hdHQpCgp2MzoKLW1vdmUgZGV0YWNoX3NjYWxlcnMgdG8gY3J0 YyBjb21taXQgcGF0aCAoTWF0dCkKLXVzZSB2YWx1ZXMgaW4gcGxhbmVfc3RhdGUtPnNyYyBhcyBy ZWd1bGFyIGludGVnZXJzIChtZSkKClNpZ25lZC1vZmYtYnk6IENoYW5kcmEgS29uZHVydSA8Y2hh bmRyYS5rb25kdXJ1QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9h dG9taWMuYyAgfCAgICA1ICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IHwgICA3MiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCiAyIGZpbGVzIGNoYW5n ZWQsIDcxIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9hdG9taWMuYwppbmRleCA3YjhlZmQ0Li5mMTRjNjBlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9hdG9taWMuYwpAQCAtMTY3LDcgKzE2Nyw3IEBAIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXBsYW5lLT5zdGF0ZS0+c3RhdGUgPSBOVUxMOwogCX0K IAotCS8qIHN3YXAgY3J0Y19zdGF0ZSAqLworCS8qIHN3YXAgY3J0Y19zY2FsZXJfc3RhdGUgKi8K IAlmb3IgKGkgPSAwOyBpIDwgZGV2LT5tb2RlX2NvbmZpZy5udW1fY3J0YzsgaSsrKSB7CiAJCXN0 cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5jcnRjc1tpXTsKIAkJaWYgKCFjcnRjKSB7CkBA IC0xNzYsNiArMTc2LDkgQEAgaW50IGludGVsX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAogCQl0b19pbnRlbF9jcnRjKGNydGMpLT5jb25maWctPnNjYWxlcl9zdGF0ZSA9 CiAJCQl0b19pbnRlbF9jcnRjX3N0YXRlKHN0YXRlLT5jcnRjX3N0YXRlc1tpXSktPnNjYWxlcl9z dGF0ZTsKKworCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkKKwkJCXNrbF9kZXRhY2hf c2NhbGVycyh0b19pbnRlbF9jcnRjKGNydGMpKTsKIAl9CiAKIAlkcm1fYXRvbWljX2hlbHBlcl9j b21taXRfcGxhbmVzKGRldiwgc3RhdGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CmluZGV4IDY2NGI3ZmIuLjRlOWQ5ZjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTI5NzgsNiArMjk3OCwxNCBAQCBzdGF0aWMgdm9pZCBza3lsYWtlX3VwZGF0ZV9wcmlt YXJ5X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlpbnQgcGlwZSA9IGludGVsX2NydGMt PnBpcGU7CiAJdTMyIHBsYW5lX2N0bCwgc3RyaWRlX2RpdjsKIAl1bnNpZ25lZCBsb25nIHN1cmZf YWRkcjsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9IGludGVsX2NydGMt PmNvbmZpZzsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCWludCBz cmNfeCA9IDAsIHNyY195ID0gMCwgc3JjX3cgPSAwLCBzcmNfaCA9IDA7CisJaW50IGRzdF94ID0g MCwgZHN0X3kgPSAwLCBkc3RfdyA9IDAsIGRzdF9oID0gMDsKKwlpbnQgc2NhbGVyX2lkID0gLTE7 CisKKwlwbGFuZV9zdGF0ZSA9IGNydGMtPnByaW1hcnkgPworCQl0b19pbnRlbF9wbGFuZV9zdGF0 ZShjcnRjLT5wcmltYXJ5LT5zdGF0ZSkgOiBOVUxMOwogCiAJaWYgKCFpbnRlbF9jcnRjLT5wcmlt YXJ5X2VuYWJsZWQpIHsKIAkJSTkxNV9XUklURShQTEFORV9DVEwocGlwZSwgMCksIDApOwpAQCAt MzA0NiwxMiArMzA1NCw0MSBAQCBzdGF0aWMgdm9pZCBza3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3Bs YW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkJICAgICAgIGZiLT5waXhlbF9mb3JtYXQp OwogCXN1cmZfYWRkciA9IGludGVsX3BsYW5lX29ial9vZmZzZXQodG9faW50ZWxfcGxhbmUoY3J0 Yy0+cHJpbWFyeSksIG9iaik7CiAKKwlpZiAocGxhbmVfc3RhdGUpIHsKKwkJc2NhbGVyX2lkID0g cGxhbmVfc3RhdGUtPnNjYWxlcl9pZDsKKwkJc3JjX3ggPSBwbGFuZV9zdGF0ZS0+c3JjLngxOwor CQlzcmNfeSA9IHBsYW5lX3N0YXRlLT5zcmMueTE7CisJCXNyY193ID0gZHJtX3JlY3Rfd2lkdGgo JnBsYW5lX3N0YXRlLT5zcmMpOworCQlzcmNfaCA9IGRybV9yZWN0X2hlaWdodCgmcGxhbmVfc3Rh dGUtPnNyYyk7CisJCWRzdF94ID0gcGxhbmVfc3RhdGUtPmRzdC54MTsKKwkJZHN0X3kgPSBwbGFu ZV9zdGF0ZS0+ZHN0LnkxOworCQlkc3RfdyA9IGRybV9yZWN0X3dpZHRoKCZwbGFuZV9zdGF0ZS0+ ZHN0KTsKKwkJZHN0X2ggPSBkcm1fcmVjdF9oZWlnaHQoJnBsYW5lX3N0YXRlLT5kc3QpOworCX0K KwogCUk5MTVfV1JJVEUoUExBTkVfQ1RMKHBpcGUsIDApLCBwbGFuZV9jdGwpOwogCUk5MTVfV1JJ VEUoUExBTkVfUE9TKHBpcGUsIDApLCAwKTsKKworCWlmIChzcmNfdyAmJiBzcmNfaCAmJiBkc3Rf dyAmJiBkc3RfaCAmJiBzY2FsZXJfaWQgPj0gMCkgeworCQl1aW50MzJfdCBwc19jdHJsID0gMDsK KworCQlXQVJOX09OKHggIT0gc3JjX3ggfHwgeSAhPSBzcmNfeSk7CisJCXBzX2N0cmwgPSBQU19T Q0FMRVJfRU4gfCBQU19QTEFORV9TRUwoMCkgfAorCQkJY3J0Y19zdGF0ZS0+c2NhbGVyX3N0YXRl LnNjYWxlcnNbc2NhbGVyX2lkXS5tb2RlIHwKKwkJCWNydGNfc3RhdGUtPnNjYWxlcl9zdGF0ZS5z Y2FsZXJzW3NjYWxlcl9pZF0uZmlsdGVyOworCQlJOTE1X1dSSVRFKFNLTF9QU19DVFJMKHBpcGUs IHNjYWxlcl9pZCksIHBzX2N0cmwpOworCQlJOTE1X1dSSVRFKFNLTF9QU19QV1JfR0FURShwaXBl LCBzY2FsZXJfaWQpLCAwKTsKKwkJSTkxNV9XUklURShTS0xfUFNfV0lOX1BPUyhwaXBlLCBzY2Fs ZXJfaWQpLCAoZHN0X3ggPDwgMTYpIHwgZHN0X3kpOworCQlJOTE1X1dSSVRFKFNLTF9QU19XSU5f U1oocGlwZSwgc2NhbGVyX2lkKSwgKGRzdF93IDw8IDE2KSB8IGRzdF9oKTsKKworCQlJOTE1X1dS SVRFKFBMQU5FX1NJWkUocGlwZSwgMCksICgoc3JjX2ggLSAxKSA8PCAxNikgfCAoc3JjX3cgLSAx KSk7CisJfSBlbHNlIHsKKwkJSTkxNV9XUklURShQTEFORV9TSVpFKHBpcGUsIDApLAorCQkJKGlu dGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaCAtIDEpIDw8IDE2IHwKKwkJCShpbnRlbF9jcnRj LT5jb25maWctPnBpcGVfc3JjX3cgLSAxKSk7CisJfQorCiAJSTkxNV9XUklURShQTEFORV9PRkZT RVQocGlwZSwgMCksICh5IDw8IDE2KSB8IHgpOwotCUk5MTVfV1JJVEUoUExBTkVfU0laRShwaXBl LCAwKSwKLQkJICAgKGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaCAtIDEpIDw8IDE2IHwK LQkJICAgKGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfdyAtIDEpKTsKIAlJOTE1X1dSSVRF KFBMQU5FX1NUUklERShwaXBlLCAwKSwgZmItPnBpdGNoZXNbMF0gLyBzdHJpZGVfZGl2KTsKIAlJ OTE1X1dSSVRFKFBMQU5FX1NVUkYocGlwZSwgMCksIHN1cmZfYWRkcik7CiAKQEAgLTEyODIxLDE5 ICsxMjg1OCwzMyBAQCBpbnRlbF9jaGVja19wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLAogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmJhc2UuY3J0YzsKIAlzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5iYXNlLmZiOwog CXN0cnVjdCBkcm1fcmVjdCAqZGVzdCA9ICZzdGF0ZS0+ZHN0OwogCXN0cnVjdCBkcm1fcmVjdCAq c3JjID0gJnN0YXRlLT5zcmM7CiAJY29uc3Qgc3RydWN0IGRybV9yZWN0ICpjbGlwID0gJnN0YXRl LT5jbGlwOworCXN0cnVjdCBpbnRlbF9jcnRjX3NjYWxlcl9zdGF0ZSAqc2NhbGVyX3N0YXRlOwor CWludCBtYXhfc2NhbGUgPSBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkc7CisJaW50IG1pbl9z Y2FsZSA9IERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElORzsKIAlpbnQgcmV0OwogCiAJY3J0YyA9 IGNydGMgPyBjcnRjIDogcGxhbmUtPmNydGM7CiAJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMo Y3J0Yyk7CisJY3J0Y19zdGF0ZSA9IHN0YXRlLT5iYXNlLnN0YXRlID8KKwkJaW50ZWxfYXRvbWlj X2dldF9jcnRjX3N0YXRlKHN0YXRlLT5iYXNlLnN0YXRlLCBpbnRlbF9jcnRjKSA6IE5VTEw7CisJ c2NhbGVyX3N0YXRlID0gY3J0Y19zdGF0ZSA/ICZjcnRjX3N0YXRlLT5zY2FsZXJfc3RhdGUgOiBO VUxMOworCisJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDkpIHsKKwkJaWYgKHNjYWxlcl9z dGF0ZSAmJiBzY2FsZXJfc3RhdGUtPm51bV9zY2FsZXJzKSB7CisJCQltaW5fc2NhbGUgPSAxOwor CQkJbWF4X3NjYWxlID0gKDEwMCA8PCAxNikgLyBzY2FsZXJfc3RhdGUtPm1pbl9oc3I7CisJCX0K Kwl9CiAKIAlyZXQgPSBkcm1fcGxhbmVfaGVscGVyX2NoZWNrX3VwZGF0ZShwbGFuZSwgY3J0Yywg ZmIsCiAJCQkJCSAgICBzcmMsIGRlc3QsIGNsaXAsCi0JCQkJCSAgICBEUk1fUExBTkVfSEVMUEVS X05PX1NDQUxJTkcsCi0JCQkJCSAgICBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkcsCisJCQkJ CSAgICBtaW5fc2NhbGUsCisJCQkJCSAgICBtYXhfc2NhbGUsCiAJCQkJCSAgICBmYWxzZSwgdHJ1 ZSwgJnN0YXRlLT52aXNpYmxlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwpAQCAtMTI4ODYs NiArMTI5MzcsMTMgQEAgaW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSwKIAlzcmMtPnkxID4+PSAxNjsKIAlzcmMtPnkyID4+PSAxNjsKIAorCWlmIChJTlRF TF9JTkZPKGRldiktPmdlbiA+PSA5KSB7CisJCXJldCA9IHNrbF91cGRhdGVfc2NhbGVyX3VzZXJz KGludGVsX2NydGMsIGNydGNfc3RhdGUsCisJCQl0b19pbnRlbF9wbGFuZShwbGFuZSksIHN0YXRl LCAwKTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisJfQorCiAJcmV0dXJuIDA7CiB9CiAK QEAgLTEzMDY1LDYgKzEzMTIzLDEwIEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9w cmltYXJ5X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJcHJpbWFyeS0+ Y2FuX3NjYWxlID0gZmFsc2U7CiAJcHJpbWFyeS0+bWF4X2Rvd25zY2FsZSA9IDE7CisJaWYgKElO VEVMX0lORk8oZGV2KS0+Z2VuID49IDkpIHsKKwkJcHJpbWFyeS0+Y2FuX3NjYWxlID0gdHJ1ZTsK KwkJcHJpbWFyeS0+bWF4X2Rvd25zY2FsZSA9IDI7IC8qIHVwZGF0ZWQgbGF0ZXIgKi8KKwl9CiAJ c3RhdGUtPnNjYWxlcl9pZCA9IC0xOwogCXByaW1hcnktPnBpcGUgPSBwaXBlOwogCXByaW1hcnkt PnBsYW5lID0gcGlwZTsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==