From: Ville Syrjala Subject: [PATCH 2/5] drm/i915: Clean up fbc vs. plane checks Date: Thu, 16 Nov 2017 21:14:48 +0200 Message-ID: <20171116191451.28823-2-ville.syrjala@linux.intel.com> References: <20171116191451.28823-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7BE2F6E1E4 for ; Thu, 16 Nov 2017 19:14:58 +0000 (UTC) In-Reply-To: <20171116191451.28823-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkxl dCdzIHJlY29yZCB0aGUgaW5mb3JtYXRpb24gd2hldGhlciBhIHBsYW5lIGNhbiBkbyBmYmMgb3Ig bm90IHVuZGVyCnN0cnVjdCBpbnRlX3BsYW5lLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOk bMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAzNiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAxICsKIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jICAgICB8IDI5ICsrKysrKystLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAgMiAtLQog NCBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMDY1N2UwM2U4NzFhLi5mNGI3NzNhNGNh ZjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzMjQ0LDYgKzEzMjQ0 LDMxIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX2N1cnNvcl9w bGFuZV9mdW5jcyA9IHsKIAkuZm9ybWF0X21vZF9zdXBwb3J0ZWQgPSBpbnRlbF9jdXJzb3JfcGxh bmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQsCiB9OwogCitzdGF0aWMgYm9vbCBpOXh4X3BsYW5lX2hh c19mYmMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgICAgIGVudW0g cGxhbmUgcGxhbmVfaWQpCit7CisJaWYgKCFIQVNfRkJDKGRldl9wcml2KSkKKwkJcmV0dXJuIGZh bHNlOworCisJaWYgKElTX0c0WChkZXZfcHJpdikgfHwgSVNfR0VONShkZXZfcHJpdikgfHwKKwkg ICAgSVNfR0VONihkZXZfcHJpdikgfHwgSVNfSVZZQlJJREdFKGRldl9wcml2KSkKKwkJcmV0dXJu IHRydWU7CisKKwlpZiAoSVNfR0VONChkZXZfcHJpdikpCisJCXJldHVybiBwbGFuZV9pZCA9PSBQ TEFORV9BIHx8IHBsYW5lX2lkID09IFBMQU5FX0I7CisJZWxzZQorCQlyZXR1cm4gcGxhbmVfaWQg PT0gUExBTkVfQTsKK30KKworc3RhdGljIGJvb2wgc2tsX3BsYW5lX2hhc19mYmMoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgICAgZW51bSBwaXBlIHBpcGUsIGVudW0g cGxhbmVfaWQgcGxhbmVfaWQpCit7CisJaWYgKCFIQVNfRkJDKGRldl9wcml2KSkKKwkJcmV0dXJu IGZhbHNlOworCisJcmV0dXJuIHBpcGUgPT0gUElQRV9BICYmIHBsYW5lX2lkID09IFBMQU5FX1BS SU1BUlk7Cit9CisKIHN0YXRpYyBzdHJ1Y3QgaW50ZWxfcGxhbmUgKgogaW50ZWxfcHJpbWFyeV9w bGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUg cGlwZSkKIHsKQEAgLTEzMjg2LDYgKzEzMzExLDE1IEBAIGludGVsX3ByaW1hcnlfcGxhbmVfY3Jl YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiAJ CXByaW1hcnktPnBsYW5lID0gKGVudW0gcGxhbmUpIHBpcGU7CiAJcHJpbWFyeS0+aWQgPSBQTEFO RV9QUklNQVJZOwogCXByaW1hcnktPmZyb250YnVmZmVyX2JpdCA9IElOVEVMX0ZST05UQlVGRkVS X1BSSU1BUlkocGlwZSk7CisKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQorCQlwcmlt YXJ5LT5oYXNfZmJjID0gc2tsX3BsYW5lX2hhc19mYmMoZGV2X3ByaXYsCisJCQkJCQkgICAgIHBy aW1hcnktPnBpcGUsCisJCQkJCQkgICAgIHByaW1hcnktPmlkKTsKKwllbHNlCisJCXByaW1hcnkt Pmhhc19mYmMgPSBpOXh4X3BsYW5lX2hhc19mYmMoZGV2X3ByaXYsCisJCQkJCQkgICAgICBwcmlt YXJ5LT5wbGFuZSk7CisKIAlwcmltYXJ5LT5jaGVja19wbGFuZSA9IGludGVsX2NoZWNrX3ByaW1h cnlfcGxhbmU7CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMCB8fCBJU19HRU1JTklM QUtFKGRldl9wcml2KSkgewpAQCAtMTQ2NTQsNiArMTQ2ODgsOCBAQCBpbnQgaW50ZWxfbW9kZXNl dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCX0KIAl9CiAKKwlpbnRlbF9mYmNfaW5p dChkZXZfcHJpdik7CisKIAlpbnRlbF9zaGFyZWRfZHBsbF9pbml0KGRldik7CiAJaW50ZWxfdXBk YXRlX2ZkaV9wbGxfZnJlcShkZXZfcHJpdik7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5k ZXggYzEzZjE1ZWYzNDJiLi40NzJlMzdmMDA0MDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CkBAIC04NTUsNiArODU1LDcgQEAgc3RydWN0IGludGVsX3BsYW5lIHsKIAllbnVtIHBsYW5lX2lk IGlkOwogCWVudW0gcGlwZSBwaXBlOwogCWJvb2wgY2FuX3NjYWxlOworCWJvb2wgaGFzX2ZiYzsK IAlpbnQgbWF4X2Rvd25zY2FsZTsKIAl1aW50MzJfdCBmcm9udGJ1ZmZlcl9iaXQ7CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZmJjLmMKaW5kZXggMWEwZjVlMGM4ZDEwLi44MWEyNTI2YzQ0NWUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2ZiYy5jCkBAIC00NiwxNiArNDYsNiBAQCBzdGF0aWMgaW5saW5lIGJv b2wgZmJjX3N1cHBvcnRlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0 dXJuIEhBU19GQkMoZGV2X3ByaXYpOwogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wgZmJjX29uX3Bp cGVfYV9vbmx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKLXsKLQlyZXR1cm4g SVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSU5URUxfR0VOKGRldl9wcml2KSA+PSA4OwotfQotCi1z dGF0aWMgaW5saW5lIGJvb2wgZmJjX29uX3BsYW5lX2Ffb25seShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCi17Ci0JcmV0dXJuIElOVEVMX0dFTihkZXZfcHJpdikgPCA0OwotfQot CiBzdGF0aWMgaW5saW5lIGJvb2wgbm9fZmJjX29uX211bHRpcGxlX3BpcGVzKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlyZXR1cm4gSU5URUxfR0VOKGRldl9wcml2KSA8 PSAzOwpAQCAtMTA4MiwxMyArMTA3MiwxMCBAQCB2b2lkIGludGVsX2ZiY19jaG9vc2VfY3J0Yyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCXN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICppbnRlbF9jcnRjX3N0YXRlOwogCQlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2lu dGVsX2NydGMocGxhbmVfc3RhdGUtPmNydGMpOwogCi0JCWlmICghaW50ZWxfcGxhbmVfc3RhdGUt PmJhc2UudmlzaWJsZSkKLQkJCWNvbnRpbnVlOwotCi0JCWlmIChmYmNfb25fcGlwZV9hX29ubHko ZGV2X3ByaXYpICYmIGNydGMtPnBpcGUgIT0gUElQRV9BKQorCQlpZiAoIXRvX2ludGVsX3BsYW5l KHBsYW5lKS0+aGFzX2ZiYykKIAkJCWNvbnRpbnVlOwogCi0JCWlmIChmYmNfb25fcGxhbmVfYV9v bmx5KGRldl9wcml2KSAmJiBjcnRjLT5wbGFuZSAhPSBQTEFORV9BKQorCQlpZiAoIWludGVsX3Bs YW5lX3N0YXRlLT5iYXNlLnZpc2libGUpCiAJCQljb250aW51ZTsKIAogCQlpbnRlbF9jcnRjX3N0 YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZSgKQEAgLTEzNDYsNyArMTMzMyw3IEBAIHN0YXRpYyBi b29sIG5lZWRfZmJjX3Z0ZF93YShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB2 b2lkIGludGVsX2ZiY19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsK IAlzdHJ1Y3QgaW50ZWxfZmJjICpmYmMgPSAmZGV2X3ByaXYtPmZiYzsKLQllbnVtIHBpcGUgcGlw ZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lOwogCiAJSU5JVF9XT1JLKCZmYmMtPndvcmsu d29yaywgaW50ZWxfZmJjX3dvcmtfZm4pOwogCUlOSVRfV09SSygmZmJjLT51bmRlcnJ1bl93b3Jr LCBpbnRlbF9mYmNfdW5kZXJydW5fd29ya19mbik7CkBAIC0xMzY3LDEyICsxMzU0LDEwIEBAIHZv aWQgaW50ZWxfZmJjX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQly ZXR1cm47CiAJfQogCi0JZm9yX2VhY2hfcGlwZShkZXZfcHJpdiwgcGlwZSkgewotCQlmYmMtPnBv c3NpYmxlX2ZyYW1lYnVmZmVyX2JpdHMgfD0KLQkJCQlJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZ KHBpcGUpOwotCi0JCWlmIChmYmNfb25fcGlwZV9hX29ubHkoZGV2X3ByaXYpKQotCQkJYnJlYWs7 CisJZm9yX2VhY2hfaW50ZWxfcGxhbmUoJmRldl9wcml2LT5kcm0sIHBsYW5lKSB7CisJCWlmIChw bGFuZS0+aGFzX2ZiYykKKwkJCWZiYy0+cG9zc2libGVfZnJhbWVidWZmZXJfYml0cyB8PQorCQkJ CUlOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkocGxhbmUtPnBpcGUpOwogCX0KIAogCS8qIFRoaXMg dmFsdWUgd2FzIHB1bGxlZCBvdXQgb2Ygc29tZW9uZSdzIGhhdCAqLwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKaW5kZXggOGM2OWVjOWViNmVlLi4yODZkMTYxM2E5ZDAgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwpAQCAtOTAxMiw4ICs5MDEyLDYgQEAgdm9pZCBpbnRlbF9pbml0X2Nsb2NrX2dhdGlu Z19ob29rcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAvKiBTZXQgdXAgY2hp cCBzcGVjaWZpYyBwb3dlciBtYW5hZ2VtZW50LXJlbGF0ZWQgZnVuY3Rpb25zICovCiB2b2lkIGlu dGVsX2luaXRfcG0oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCWludGVs X2ZiY19pbml0KGRldl9wcml2KTsKLQogCS8qIEZvciBjeHNyICovCiAJaWYgKElTX1BJTkVWSUVX KGRldl9wcml2KSkKIAkJaTkxNV9waW5ldmlld19nZXRfbWVtX2ZyZXEoZGV2X3ByaXYpOwotLSAK Mi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK