From: Chandra Konduru Subject: [PATCH 20/21] drm/i915: Enable skylake primary plane scaling using shared scalers Date: Sat, 14 Mar 2015 22:55:45 -0700 Message-ID: <1426398946-5900-21-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 6C7526E4A9 for ; Sat, 14 Mar 2015 22:56:39 -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 VGhpcyBwYXRjaCBlbmFibGVzIHNreWxha2UgcHJpbWFyeSBwbGFuZSBkaXNwbGF5IHNjYWxpbmcg dXNpbmcgc2hhcmVkCnNjYWxlcnMgYXRvbWljIGRlc2dpbi4KClNpZ25lZC1vZmYtYnk6IENoYW5k cmEgS29uZHVydSA8Y2hhbmRyYS5rb25kdXJ1QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgIDc3ICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCA3MSBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA4ZGVlYmI3Li5kNjNiZThl IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0yODgzLDYgKzI4ODMsMTYg QEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAlpbnQgcGlwZSA9 IGludGVsX2NydGMtPnBpcGU7CiAJdTMyIHBsYW5lX2N0bCwgc3RyaWRlX2RpdjsKKwlzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9IGludGVsX2NydGMtPmNvbmZpZzsKKwlzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCWludCBzcmNfeCA9IDAsIHNyY195 ID0gMCwgc3JjX3cgPSAwLCBzcmNfaCA9IDA7CisJaW50IGRzdF94ID0gMCwgZHN0X3kgPSAwLCBk c3RfdyA9IDAsIGRzdF9oID0gMDsKKwlpbnQgc2NhbGVyX2lkID0gLTE7CisKKwlwbGFuZV9zdGF0 ZSA9IGNydGMtPnByaW1hcnkgPworCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShjcnRjLT5wcmltYXJ5 LT5zdGF0ZSkgOiBOVUxMOworCisJc2tsX2RldGFjaF9zY2FsZXIoY3J0YywgY3J0Yy0+cHJpbWFy eSk7CiAKIAlpZiAoIWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCkgewogCQlJOTE1X1dSSVRF KFBMQU5FX0NUTChwaXBlLCAwKSwgMCk7CkBAIC0yOTUwLDEzICsyOTYwLDQyIEBAIHN0YXRpYyB2 b2lkIHNreWxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAog CXN0cmlkZV9kaXYgPSBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KGRldiwgZmItPm1vZGlmaWVy WzBdLAogCQkJCQkgICAgICAgZmItPnBpeGVsX2Zvcm1hdCk7CiAKKwlpZiAocGxhbmVfc3RhdGUp IHsKKwkJc2NhbGVyX2lkID0gcGxhbmVfc3RhdGUtPnNjYWxlcl9pZDsKKwkJc3JjX3ggPSBwbGFu ZV9zdGF0ZS0+c3JjLngxID4+IDE2OworCQlzcmNfeSA9IHBsYW5lX3N0YXRlLT5zcmMueTEgPj4g MTY7CisJCXNyY193ID0gZHJtX3JlY3Rfd2lkdGgoJnBsYW5lX3N0YXRlLT5zcmMpID4+IDE2Owor CQlzcmNfaCA9IGRybV9yZWN0X2hlaWdodCgmcGxhbmVfc3RhdGUtPnNyYykgPj4gMTY7CisJCWRz dF94ID0gcGxhbmVfc3RhdGUtPmRzdC54MTsKKwkJZHN0X3kgPSBwbGFuZV9zdGF0ZS0+ZHN0Lnkx OworCQlkc3RfdyA9IGRybV9yZWN0X3dpZHRoKCZwbGFuZV9zdGF0ZS0+ZHN0KTsKKwkJZHN0X2gg PSBkcm1fcmVjdF9oZWlnaHQoJnBsYW5lX3N0YXRlLT5kc3QpOworCX0KKwogCUk5MTVfV1JJVEUo UExBTkVfQ1RMKHBpcGUsIDApLCBwbGFuZV9jdGwpOwogCi0JSTkxNV9XUklURShQTEFORV9QT1Mo cGlwZSwgMCksIDApOworCWlmIChzcmNfdyAmJiBzcmNfaCAmJiBkc3RfdyAmJiBkc3RfaCAmJiBz Y2FsZXJfaWQgPj0gMCkgeworCQl1aW50MzJfdCBwc19jdHJsID0gMDsKKworCQlXQVJOX09OKHgg IT0gc3JjX3ggfHwgeSAhPSBzcmNfeSk7CisJCXBzX2N0cmwgPSBQU19TQ0FMRVJfRU4gfCBQU19Q TEFORV9TRUwoMCkgfAorCQkJY3J0Y19zdGF0ZS0+c2NhbGVyX3N0YXRlLnNjYWxlcnNbc2NhbGVy X2lkXS5tb2RlIHwKKwkJCWNydGNfc3RhdGUtPnNjYWxlcl9zdGF0ZS5zY2FsZXJzW3NjYWxlcl9p ZF0uZmlsdGVyOworCQlJOTE1X1dSSVRFKFNLTF9QU19DVFJMKHBpcGUsIHNjYWxlcl9pZCksIHBz X2N0cmwpOworCQlJOTE1X1dSSVRFKFNLTF9QU19QV1JfR0FURShwaXBlLCBzY2FsZXJfaWQpLCAw KTsKKwkJSTkxNV9XUklURShTS0xfUFNfV0lOX1BPUyhwaXBlLCBzY2FsZXJfaWQpLCAoZHN0X3gg PDwgMTYpIHwgZHN0X3kpOworCQlJOTE1X1dSSVRFKFNLTF9QU19XSU5fU1oocGlwZSwgc2NhbGVy X2lkKSwgKGRzdF93IDw8IDE2KSB8IGRzdF9oKTsKKworCQlJOTE1X1dSSVRFKFBMQU5FX1BPUyhw aXBlLCAwKSwgMCk7CisJCUk5MTVfV1JJVEUoUExBTkVfU0laRShwaXBlLCAwKSwgKChzcmNfaCAt IDEpIDw8IDE2KSB8IChzcmNfdyAtIDEpKTsKKwl9IGVsc2UgeworCQlJOTE1X1dSSVRFKFBMQU5F X1BPUyhwaXBlLCAwKSwgMCk7CisJCUk5MTVfV1JJVEUoUExBTkVfU0laRShwaXBlLCAwKSwKKwkJ CShpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX2ggLSAxKSA8PCAxNiB8CisJCQkoaW50ZWxf Y3J0Yy0+Y29uZmlnLT5waXBlX3NyY193IC0gMSkpOworCX0KKwogCUk5MTVfV1JJVEUoUExBTkVf T0ZGU0VUKHBpcGUsIDApLCAoeSA8PCAxNikgfCB4KTsKLQlJOTE1X1dSSVRFKFBMQU5FX1NJWkUo cGlwZSwgMCksCi0JCSAgIChpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX2ggLSAxKSA8PCAx NiB8Ci0JCSAgIChpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX3cgLSAxKSk7CiAJSTkxNV9X UklURShQTEFORV9TVFJJREUocGlwZSwgMCksIGZiLT5waXRjaGVzWzBdIC8gc3RyaWRlX2Rpdik7 CiAJSTkxNV9XUklURShQTEFORV9TVVJGKHBpcGUsIDApLCBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZz ZXQob2JqKSk7CiAKQEAgLTEyNTYxLDE5ICsxMjYwMCwzMyBAQCBpbnRlbF9jaGVja19wcmltYXJ5 X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0g c3RhdGUtPmJhc2UuY3J0YzsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKKwlzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy ICpmYiA9IHN0YXRlLT5iYXNlLmZiOwogCXN0cnVjdCBkcm1fcmVjdCAqZGVzdCA9ICZzdGF0ZS0+ ZHN0OwogCXN0cnVjdCBkcm1fcmVjdCAqc3JjID0gJnN0YXRlLT5zcmM7CiAJY29uc3Qgc3RydWN0 IGRybV9yZWN0ICpjbGlwID0gJnN0YXRlLT5jbGlwOworCXN0cnVjdCBpbnRlbF9jcnRjX3NjYWxl cl9zdGF0ZSAqc2NhbGVyX3N0YXRlOworCWludCBtYXhfc2NhbGUgPSBEUk1fUExBTkVfSEVMUEVS X05PX1NDQUxJTkc7CisJaW50IG1pbl9zY2FsZSA9IERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElO RzsKIAlpbnQgcmV0OwogCiAJY3J0YyA9IGNydGMgPyBjcnRjIDogcGxhbmUtPmNydGM7CiAJaW50 ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJY3J0Y19zdGF0ZSA9IHN0YXRlLT5iYXNl LnN0YXRlID8KKwkJaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLT5iYXNlLnN0YXRl LCBpbnRlbF9jcnRjKSA6IE5VTEw7CisJc2NhbGVyX3N0YXRlID0gY3J0Y19zdGF0ZSA/ICZjcnRj X3N0YXRlLT5zY2FsZXJfc3RhdGUgOiBOVUxMOworCisJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu ID49IDkpIHsKKwkJaWYgKHNjYWxlcl9zdGF0ZSAmJiBzY2FsZXJfc3RhdGUtPm51bV9zY2FsZXJz KSB7CisJCQltaW5fc2NhbGUgPSAxOworCQkJbWF4X3NjYWxlID0gKDEwMCA8PCAxNikgLyBzY2Fs ZXJfc3RhdGUtPnNjYWxlcnNbMF0ubWluX2hzcjsKKwkJfQorCX0KIAogCXJldCA9IGRybV9wbGFu ZV9oZWxwZXJfY2hlY2tfdXBkYXRlKHBsYW5lLCBjcnRjLCBmYiwKIAkJCQkJICAgIHNyYywgZGVz dCwgY2xpcCwKLQkJCQkJICAgIERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElORywKLQkJCQkJICAg IERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElORywKKwkJCQkJICAgIG1pbl9zY2FsZSwKKwkJCQkJ ICAgIG1heF9zY2FsZSwKIAkJCQkJICAgIGZhbHNlLCB0cnVlLCAmc3RhdGUtPnZpc2libGUpOwog CWlmIChyZXQpCiAJCXJldHVybiByZXQ7CkBAIC0xMjYyMCw2ICsxMjY3MywxMyBAQCBpbnRlbF9j aGVja19wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJaW50ZWxfY3J0 Yy0+YXRvbWljLnVwZGF0ZV93bSA9IHRydWU7CiAJfQogCisJaWYgKElOVEVMX0lORk8oZGV2KS0+ Z2VuID49IDkpIHsKKwkJcmV0ID0gc2tsX3VwZGF0ZV9zY2FsZXJfdXNlcnMoaW50ZWxfY3J0Yywg Y3J0Y19zdGF0ZSwKKwkJCXRvX2ludGVsX3BsYW5lKHBsYW5lKSwgc3RhdGUpOworCQlpZiAocmV0 KQorCQkJcmV0dXJuIHJldDsKKwl9CisKIAlyZXR1cm4gMDsKIH0KIApAQCAtMTI4MDMsNiArMTI4 NjMsMTEgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmludGVsX3ByaW1hcnlfcGxhbmVfY3Jl YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAlwcmltYXJ5LT5jYW5fc2NhbGUgPSBmYWxz ZTsKIAlwcmltYXJ5LT5tYXhfZG93bnNjYWxlID0gMTsKKwlpZiAoSU5URUxfSU5GTyhkZXYpLT5n ZW4gPj0gOSkgeworCQlwcmltYXJ5LT5jYW5fc2NhbGUgPSB0cnVlOworCQlwcmltYXJ5LT5tYXhf ZG93bnNjYWxlID0gMjsgLyogdXBkYXRlZCBsYXRlciAqLworCQlwcmltYXJ5LT5nZXRfY29sb3Jr ZXkgPSBza2xfZ2V0X2NvbG9ya2V5OworCX0KIAlzdGF0ZS0+c2NhbGVyX2lkID0gLTE7CiAJcHJp bWFyeS0+cGlwZSA9IHBpcGU7CiAJcHJpbWFyeS0+cGxhbmUgPSBwaXBlOwotLSAKMS43LjkuNQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK