From: Maarten Lankhorst Subject: [PATCH 3/3] drm/i915: Clean up skip_intermediate_wm handling Date: Fri, 27 Oct 2017 09:59:47 +0200 Message-ID: <20171027075947.21008-3-maarten.lankhorst@linux.intel.com> References: <20171027075947.21008-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0C4656E8BA for ; Fri, 27 Oct 2017 08:00:07 +0000 (UTC) In-Reply-To: <20171027075947.21008-1-maarten.lankhorst@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 T3JpZ2luYWxseSB3ZSBpbXBsZW1lbnRlZCBza2lwX2ludGVybWVkaWF0ZV93bSB0byBmaXggdXAg Z2FyYmFnZQp3YXRlcm1hcmtzIGZvciBJTEsgd2F0ZXJtYXJrcyB0aGF0IGFyZSBpbnNhbmUsIGJ1 dCBpdCBtYWtlcyBzZW5zZQp0byBleHRlbmQgdGhpcyB0byBhbGwgcGxhdGZvcm1zIHdpdGggMi1z dHlsZSB3YXRlcm1hcmsgcHJvZ3JhbW1pbmcuCgpXZSBkb24ndCBrbm93IHdoYXQgdGhlIHByZXZp b3VzIGNvbnRlbnRzIG9mIHRoZSB3YXRlcm1hcmtzIGFyZSwgYW5kIHRoZXkKY291bGQgYmUgc29t ZXRoaW5nIGVudGlyZWx5IGdhcmJhZ2Ugd2hlbiB0aGUgcGlwZSBpcyBvZmYsIHNvIGNvbXB1dGlu Zwp0aGVtIHNob3VsZCBvbmx5IGJlIGJhc2VkIG9uIHRoZSBuZXcgc3RhdGUuCgpTaWduZWQtb2Zm LWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDEzICsrKy0tLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICB8ICA5ICsrKysrKy0t LQogMiBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBhMzY5YjM1ZDA0NGQuLjA5MzEzYWY0 ZDY0ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzU3MSw4ICszNTcx LDcgQEAgX19pbnRlbF9kaXNwbGF5X3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0K IAogCS8qIGlnbm9yZSBhbnkgcmVzZXQgdmFsdWVzL0JJT1MgbGVmdG92ZXJzIGluIHRoZSBXTSBy ZWdpc3RlcnMgKi8KLQlpZiAoIUhBU19HTUNIX0RJU1BMQVkodG9faTkxNShkZXYpKSkKLQkJdG9f aW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKS0+c2tpcF9pbnRlcm1lZGlhdGVfd20gPSB0cnVlOwor CXRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSktPnNraXBfaW50ZXJtZWRpYXRlX3dtID0gdHJ1 ZTsKIAogCXJldCA9IGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9kdXBsaWNhdGVkX3N0YXRlKHN0 YXRlLCBjdHgpOwogCkBAIC0xMDM3OSw3ICsxMDM3OCw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0 Y19hdG9taWNfY2hlY2soc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0cnVjdCBpbnRlbF9jcnRj ICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqcGlwZV9jb25maWcgPQogCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpOwot CXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGNydGNfc3RhdGUtPnN0YXRlOwogCWlu dCByZXQ7CiAJYm9vbCBtb2RlX2NoYW5nZWQgPSBuZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpOwog CkBAIC0xMDQxNiw4ICsxMDQxNCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19hdG9taWNfY2hl Y2soc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQl9CiAJfQogCi0JaWYgKGRldl9wcml2LT5kaXNw bGF5LmNvbXB1dGVfaW50ZXJtZWRpYXRlX3dtICYmCi0JICAgICF0b19pbnRlbF9hdG9taWNfc3Rh dGUoc3RhdGUpLT5za2lwX2ludGVybWVkaWF0ZV93bSkgeworCWlmIChkZXZfcHJpdi0+ZGlzcGxh eS5jb21wdXRlX2ludGVybWVkaWF0ZV93bSkgewogCQlpZiAoV0FSTl9PTighZGV2X3ByaXYtPmRp c3BsYXkuY29tcHV0ZV9waXBlX3dtKSkKIAkJCXJldHVybiAwOwogCkBAIC0xMDQzMyw5ICsxMDQz MCw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19hdG9taWNfY2hlY2soc3RydWN0IGRybV9jcnRj ICpjcnRjLAogCQkJRFJNX0RFQlVHX0tNUygiTm8gdmFsaWQgaW50ZXJtZWRpYXRlIHBpcGUgd2F0 ZXJtYXJrcyBhcmUgcG9zc2libGVcbiIpOwogCQkJcmV0dXJuIHJldDsKIAkJfQotCX0gZWxzZSBp ZiAoZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20pIHsKLQkJaWYgKEhB U19QQ0hfU1BMSVQoZGV2X3ByaXYpICYmIElOVEVMX0dFTihkZXZfcHJpdikgPCA5KQotCQkJcGlw ZV9jb25maWctPndtLmlsay5pbnRlcm1lZGlhdGUgPSBwaXBlX2NvbmZpZy0+d20uaWxrLm9wdGlt YWw7CiAJfQogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkgewpAQCAtMTQ0MTYsOCAr MTQ0MTAsNyBAQCBzdGF0aWMgdm9pZCBzYW5pdGl6ZV93YXRlcm1hcmtzKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJICogaW50ZXJtZWRpYXRlIHdhdGVybWFya3MgKHNpbmNlIHdlIGRvbid0IHRy dXN0IHRoZSBjdXJyZW50CiAJICogd2F0ZXJtYXJrcykuCiAJICovCi0JaWYgKCFIQVNfR01DSF9E SVNQTEFZKGRldl9wcml2KSkKLQkJaW50ZWxfc3RhdGUtPnNraXBfaW50ZXJtZWRpYXRlX3dtID0g dHJ1ZTsKKwlpbnRlbF9zdGF0ZS0+c2tpcF9pbnRlcm1lZGlhdGVfd20gPSB0cnVlOwogCiAJcmV0 ID0gaW50ZWxfYXRvbWljX2NoZWNrKGRldiwgc3RhdGUpOwogCWlmIChyZXQpIHsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jCmluZGV4IGE5ZTc2ODNkNWEwZC4uMzQ2YzMwYTIyMmNkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKQEAgLTE0MjAsNyArMTQyMCw4IEBAIHN0YXRpYyBpbnQgZzR4X2NvbXB1 dGVfaW50ZXJtZWRpYXRlX3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJY29uc3Qgc3RydWN0 IGc0eF93bV9zdGF0ZSAqYWN0aXZlID0gJm9sZF9jcnRjX3N0YXRlLT53bS5nNHgub3B0aW1hbDsK IAllbnVtIHBsYW5lX2lkIHBsYW5lX2lkOwogCi0JaWYgKCFuZXdfY3J0Y19zdGF0ZS0+YmFzZS5h Y3RpdmUgfHwgZHJtX2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQoJm5ld19jcnRjX3N0YXRlLT5i YXNlKSkgeworCWlmICghbmV3X2NydGNfc3RhdGUtPmJhc2UuYWN0aXZlIHx8IGludGVsX3N0YXRl LT5za2lwX2ludGVybWVkaWF0ZV93bSB8fAorCSAgICBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9k ZXNldCgmbmV3X2NydGNfc3RhdGUtPmJhc2UpKSB7CiAJCSppbnRlcm1lZGlhdGUgPSAqb3B0aW1h bDsKIAogCQlpbnRlcm1lZGlhdGUtPmN4c3IgPSBmYWxzZTsKQEAgLTIwNTMsNyArMjA1NCw4IEBA IHN0YXRpYyBpbnQgdmx2X2NvbXB1dGVfaW50ZXJtZWRpYXRlX3dtKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJY29uc3Qgc3RydWN0IHZsdl93bV9zdGF0ZSAqYWN0aXZlID0gJm9sZF9jcnRjX3N0 YXRlLT53bS52bHYub3B0aW1hbDsKIAlpbnQgbGV2ZWw7CiAKLQlpZiAoIW5ld19jcnRjX3N0YXRl LT5iYXNlLmFjdGl2ZSB8fCBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldCgmbmV3X2NydGNf c3RhdGUtPmJhc2UpKSB7CisJaWYgKCFuZXdfY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUgfHwgaW50 ZWxfc3RhdGUtPnNraXBfaW50ZXJtZWRpYXRlX3dtIHx8CisJICAgIGRybV9hdG9taWNfY3J0Y19u ZWVkc19tb2Rlc2V0KCZuZXdfY3J0Y19zdGF0ZS0+YmFzZSkpIHsKIAkJKmludGVybWVkaWF0ZSA9 ICpvcHRpbWFsOwogCiAJCWludGVybWVkaWF0ZS0+Y3hzciA9IGZhbHNlOwpAQCAtMzE2Miw3ICsz MTY0LDggQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20oc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAkgKiBhbmQgYWZ0ZXIgdGhlIHZibGFuay4KIAkgKi8KIAkqYSA9IG5l d3N0YXRlLT53bS5pbGsub3B0aW1hbDsKLQlpZiAoIW5ld3N0YXRlLT5iYXNlLmFjdGl2ZSB8fCBk cm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldCgmbmV3c3RhdGUtPmJhc2UpKQorCWlmICghbmV3 c3RhdGUtPmJhc2UuYWN0aXZlIHx8IGludGVsX3N0YXRlLT5za2lwX2ludGVybWVkaWF0ZV93bSB8 fAorCSAgICBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldCgmbmV3c3RhdGUtPmJhc2UpKQog CQlyZXR1cm4gMDsKIAogCWEtPnBpcGVfZW5hYmxlZCB8PSBiLT5waXBlX2VuYWJsZWQ7Ci0tIAoy LjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=