From: Ville Syrjala Subject: [PATCH v2 02/14] drm/i915/fbc: Nuke bogus single pipe fbc1 restriction Date: Wed, 27 Nov 2019 22:12:10 +0200 Message-ID: <20191127201222.16669-3-ville.syrjala@linux.intel.com> References: <20191127201222.16669-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 mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9768E8967A for ; Wed, 27 Nov 2019 20:12:32 +0000 (UTC) In-Reply-To: <20191127201222.16669-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk5v dCBzdXJlIHdoZXJlIHRoZSBzaW5nbGUgcGlwZSBvbmx5IHJlc3RyaWN0aW9uIGNhbWUgZm9yIGZi YzEuCk5vdGhpbmcgSSBjYW4gc2VlIHRoYXQgd291bGQgcHJldmVudCB0aGlzLgoKdjI6IE51a2Ug bm9fZmJjX29uX211bHRpcGxlX3BpcGVzKCkgdG9vCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJq w6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jIHwgIDIgLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvZGlzcGxheS9pbnRlbF9mYmMuYyAgICAgfCA1MiAtLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9mYmMuaCAgICAgfCAgMSAtCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgICB8ICAxIC0KIDQgZmlsZXMgY2hh bmdlZCwgNTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2lu dGVsX2Rpc3BsYXkuYwppbmRleCA1M2RjMzEwYTVmNmQuLmQ0Y2EwYmM0YjI2MCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE3ODY5LDggKzE3 ODY5LDYgQEAgaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCX0KIAogCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2LCBQT1dFUl9ET01B SU5fSU5JVCwgd2FrZXJlZik7Ci0KLQlpbnRlbF9mYmNfaW5pdF9waXBlX3N0YXRlKGRldl9wcml2 KTsKIH0KIAogdm9pZCBpbnRlbF9kaXNwbGF5X3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9mYmMuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZmJjLmMKaW5kZXggM2NjMWY0YjRi NWEzLi4yYjY0YjE3MjQwN2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfZmJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9m YmMuYwpAQCAtNTAsMTEgKzUwLDYgQEAgc3RhdGljIGlubGluZSBib29sIGZiY19zdXBwb3J0ZWQo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXJldHVybiBIQVNfRkJDKGRldl9w cml2KTsKIH0KIAotc3RhdGljIGlubGluZSBib29sIG5vX2ZiY19vbl9tdWx0aXBsZV9waXBlcyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0JcmV0dXJuIElOVEVMX0dFTihk ZXZfcHJpdikgPD0gMzsKLX0KLQogLyoKICAqIEluIHNvbWUgcGxhdGZvcm1zIHdoZXJlIHRoZSBD UlRDJ3MgeDowL3k6MCBjb29yZGluYXRlcyBkb2Vzbid0IG1hdGNoIHRoZQogICogZnJvbnRidWZm ZXIncyB4OjAveTowIGNvb3JkaW5hdGVzIHdlIGxpZSB0byB0aGUgaGFyZHdhcmUgYWJvdXQgdGhl IHBsYW5lJ3MKQEAgLTQxOSwyNSArNDE0LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmJjX2RlYWN0 aXZhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWZiYy0+bm9fZmJjX3Jl YXNvbiA9IHJlYXNvbjsKIH0KIAotc3RhdGljIGJvb2wgbXVsdGlwbGVfcGlwZXNfb2soc3RydWN0 IGludGVsX2NydGMgKmNydGMsCi0JCQkgICAgICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBs YW5lX3N0YXRlKQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoY3J0Yy0+YmFzZS5kZXYpOwotCXN0cnVjdCBpbnRlbF9mYmMgKmZiYyA9ICZkZXZfcHJpdi0+ ZmJjOwotCWVudW0gcGlwZSBwaXBlID0gY3J0Yy0+cGlwZTsKLQotCS8qIERvbid0IGV2ZW4gYm90 aGVyIHRyYWNraW5nIGFueXRoaW5nIHdlIGRvbid0IG5lZWQuICovCi0JaWYgKCFub19mYmNfb25f bXVsdGlwbGVfcGlwZXMoZGV2X3ByaXYpKQotCQlyZXR1cm4gdHJ1ZTsKLQotCWlmIChwbGFuZV9z dGF0ZS0+dWFwaS52aXNpYmxlKQotCQlmYmMtPnZpc2libGVfcGlwZXNfbWFzayB8PSAoMSA8PCBw aXBlKTsKLQllbHNlCi0JCWZiYy0+dmlzaWJsZV9waXBlc19tYXNrICY9IH4oMSA8PCBwaXBlKTsK LQotCXJldHVybiAoZmJjLT52aXNpYmxlX3BpcGVzX21hc2sgJiB+KDEgPDwgcGlwZSkpICE9IDA7 Ci19Ci0KIHN0YXRpYyBpbnQgZmluZF9jb21wcmVzc2lvbl90aHJlc2hvbGQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgICAgIHN0cnVjdCBkcm1fbW1fbm9kZSAqbm9k ZSwKIAkJCQkgICAgICBpbnQgc2l6ZSwKQEAgLTg2NywxOCArODQzLDEyIEBAIHZvaWQgaW50ZWxf ZmJjX3ByZV91cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAKIAltdXRleF9sb2NrKCZm YmMtPmxvY2spOwogCi0JaWYgKCFtdWx0aXBsZV9waXBlc19vayhjcnRjLCBwbGFuZV9zdGF0ZSkp IHsKLQkJcmVhc29uID0gIm1vcmUgdGhhbiBvbmUgcGlwZSBhY3RpdmUiOwotCQlnb3RvIGRlYWN0 aXZhdGU7Ci0JfQotCiAJaWYgKCFmYmMtPmVuYWJsZWQgfHwgZmJjLT5jcnRjICE9IGNydGMpCiAJ CWdvdG8gdW5sb2NrOwogCiAJaW50ZWxfZmJjX3VwZGF0ZV9zdGF0ZV9jYWNoZShjcnRjLCBjcnRj X3N0YXRlLCBwbGFuZV9zdGF0ZSk7CiAJZmJjLT5mbGlwX3BlbmRpbmcgPSB0cnVlOwogCi1kZWFj dGl2YXRlOgogCWludGVsX2ZiY19kZWFjdGl2YXRlKGRldl9wcml2LCByZWFzb24pOwogdW5sb2Nr OgogCW11dGV4X3VubG9jaygmZmJjLT5sb2NrKTsKQEAgLTEyNDQsMjggKzEyMTQsNiBAQCB2b2lk IGludGVsX2ZiY19oYW5kbGVfZmlmb191bmRlcnJ1bl9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCXNjaGVkdWxlX3dvcmsoJmZiYy0+dW5kZXJydW5fd29yayk7CiB9CiAK LS8qKgotICogaW50ZWxfZmJjX2luaXRfcGlwZV9zdGF0ZSAtIGluaXRpYWxpemUgRkJDJ3MgQ1JU QyB2aXNpYmlsaXR5IHRyYWNraW5nCi0gKiBAZGV2X3ByaXY6IGk5MTUgZGV2aWNlIGluc3RhbmNl Ci0gKgotICogVGhlIEZCQyBjb2RlIG5lZWRzIHRvIHRyYWNrIENSVEMgdmlzaWJpbGl0eSBzaW5j ZSB0aGUgb2xkZXIgcGxhdGZvcm1zIGNhbid0Ci0gKiBoYXZlIEZCQyBlbmFibGVkIHdoaWxlIG11 bHRpcGxlIHBpcGVzIGFyZSB1c2VkLiBUaGlzIGZ1bmN0aW9uIGRvZXMgdGhlCi0gKiBpbml0aWFs IHNldHVwIGF0IGRyaXZlciBsb2FkIHRvIG1ha2Ugc3VyZSBGQkMgaXMgbWF0Y2hpbmcgdGhlIHJl YWwgaGFyZHdhcmUuCi0gKi8KLXZvaWQgaW50ZWxfZmJjX2luaXRfcGlwZV9zdGF0ZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0Jc3RydWN0IGludGVsX2NydGMgKmNydGM7 Ci0KLQkvKiBEb24ndCBldmVuIGJvdGhlciB0cmFja2luZyBhbnl0aGluZyBpZiB3ZSBkb24ndCBu ZWVkLiAqLwotCWlmICghbm9fZmJjX29uX211bHRpcGxlX3BpcGVzKGRldl9wcml2KSkKLQkJcmV0 dXJuOwotCi0JZm9yX2VhY2hfaW50ZWxfY3J0YygmZGV2X3ByaXYtPmRybSwgY3J0YykKLQkJaWYg KGludGVsX2NydGNfYWN0aXZlKGNydGMpICYmCi0JCSAgICBjcnRjLT5iYXNlLnByaW1hcnktPnN0 YXRlLT52aXNpYmxlKQotCQkJZGV2X3ByaXYtPmZiYy52aXNpYmxlX3BpcGVzX21hc2sgfD0gKDEg PDwgY3J0Yy0+cGlwZSk7Ci19Ci0KIC8qCiAgKiBUaGUgRERYIGRyaXZlciBjaGFuZ2VzIGl0cyBi ZWhhdmlvciBkZXBlbmRpbmcgb24gdGhlIHZhbHVlIGl0IHJlYWRzIGZyb20KICAqIGk5MTUuZW5h YmxlX2ZiYywgc28gc2FuaXRpemUgaXQgYnkgdHJhbnNsYXRpbmcgdGhlIGRlZmF1bHQgdmFsdWUg aW50byBlaXRoZXIKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfZmJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiYy5oCmluZGV4 IDUwMjcyZWRhOGQ0My4uYmE4ZWVlZmQ0ZDlhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9kaXNwbGF5L2ludGVsX2ZiYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfZmJjLmgKQEAgLTI0LDcgKzI0LDYgQEAgdm9pZCBpbnRlbF9mYmNfcHJlX3VwZGF0 ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICpwbGFuZV9zdGF0ZSk7CiB2b2lkIGludGVsX2ZiY19wb3N0X3VwZGF0ZShzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0Yyk7CiB2b2lkIGludGVsX2ZiY19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7Ci12b2lkIGludGVsX2ZiY19pbml0X3BpcGVfc3RhdGUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfZmJjX2VuYWJsZShzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YywKIAkJICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh dGUsCiAJCSAgICAgIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMTQ3NDRjMTE0NDc1Li5kMGUwMDA3OGZiY2UgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMzY2LDcgKzM2Niw2IEBAIHN0cnVjdCBpbnRlbF9mYmMg ewogCXVuc2lnbmVkIHRocmVzaG9sZDsKIAl1bnNpZ25lZCBpbnQgcG9zc2libGVfZnJhbWVidWZm ZXJfYml0czsKIAl1bnNpZ25lZCBpbnQgYnVzeV9iaXRzOwotCXVuc2lnbmVkIGludCB2aXNpYmxl X3BpcGVzX21hc2s7CiAJc3RydWN0IGludGVsX2NydGMgKmNydGM7CiAKIAlzdHJ1Y3QgZHJtX21t X25vZGUgY29tcHJlc3NlZF9mYjsKLS0gCjIuMjMuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4