From: Maarten Lankhorst Subject: [PATCH 2/2] drm/i915: Only recalculate wm's for planes part of the state, v2. Date: Tue, 1 Mar 2016 11:07:22 +0100 Message-ID: <1456826842-32553-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1456826842-32553-1-git-send-email-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 [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id E727E6E0FD for ; Tue, 1 Mar 2016 10:07:28 +0000 (UTC) In-Reply-To: <1456826842-32553-1-git-send-email-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 T25seSBwbGFuZXMgdGhhdCBhcmUgcGFydCBvZiB0aGUgc3RhdGUgc2hvdWxkIGJlIHVzZWQgZm9y IHJlY2FsY3VsYXRpbmcKd2F0ZXJtYXJrcy4gRm9yIHBsYW5lcyBub3QgcGFydCBvZiB0aGUgc3Rh dGUgdGhlIHByZXZpb3VzIHBhdGNoIGFsbG93cwp1cyB0byByZS11c2UgdGhlIG9sZCB2YWx1ZXMg c2luY2UgdGhleSdyZSBjYWxjdWxhdGVkIGV2ZW4gZm9yIGxldmVscwp0aGF0IGFyZSBub3QgYWN0 aXZlbHkgdXNlZC4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gUmVtb3ZlIGJpZyBpZiBmcm9tIGludGVs X2NydGNfYXRvbWljX2NoZWNrLgotIFJlbW92ZSBleHRyYSBuZXdsaW5lLgotIFJlbW92ZSBtZW1z ZXQgaW4gaWxrX2NvbXB1dGVfcGlwZV93bS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hv cnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+CkNjOiBNYXR0IFJvcGVyIDxt YXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggICAgICB8ICAzICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgMTIgKysrKysr KysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICB8IDU5ICsrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA0NyBpbnNlcnRpb25z KCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA2NzEyOTU1 MjMzMTcuLjRiOGY0NDZjZGY0NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC02MjksOCAr NjI5LDcgQEAgc3RydWN0IGRybV9pOTE1X2Rpc3BsYXlfZnVuY3MgewogCQkJICBpbnQgdGFyZ2V0 LCBpbnQgcmVmY2xrLAogCQkJICBzdHJ1Y3QgZHBsbCAqbWF0Y2hfY2xvY2ssCiAJCQkgIHN0cnVj dCBkcGxsICpiZXN0X2Nsb2NrKTsKLQlpbnQgKCpjb21wdXRlX3BpcGVfd20pKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjLAotCQkJICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7 CisJaW50ICgqY29tcHV0ZV9waXBlX3dtKShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRl KTsKIAlpbnQgKCpjb21wdXRlX2ludGVybWVkaWF0ZV93bSkoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkJCQkgICAgICAgc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJCQkJICAgICAg IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdzdGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKaW5kZXggNzliZjUyN2UwYTczLi4yMGE0Y2IzZjY5ZDEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExOTk0LDcgKzExOTk0LDcgQEAgc3RhdGljIGlu dCBpbnRlbF9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlyZXQg PSAwOwogCWlmIChkZXZfcHJpdi0+ZGlzcGxheS5jb21wdXRlX3BpcGVfd20pIHsKLQkJcmV0ID0g ZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9waXBlX3dtKGludGVsX2NydGMsIHN0YXRlKTsKKwkJ cmV0ID0gZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9waXBlX3dtKHBpcGVfY29uZmlnKTsKIAkJ aWYgKHJldCkgewogCQkJRFJNX0RFQlVHX0tNUygiVGFyZ2V0IHBpcGUgd2F0ZXJtYXJrcyBhcmUg aW52YWxpZFxuIik7CiAJCQlyZXR1cm4gcmV0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRl eCA1ZGFmNTNjMDgwZTEuLjAzYjdkMDMxZTkxMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK QEAgLTE2MzAsNiArMTYzMCwxOCBAQCBpbnRlbF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCiAJcmV0dXJuIHRvX2ludGVsX2NydGNfc3RhdGUo Y3J0Y19zdGF0ZSk7CiB9CisKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICoKK2ludGVsX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVfc3RhdGUoc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKnN0YXRlLAorCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUpCit7 CisJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7CisKKwlwbGFuZV9zdGF0ZSA9 IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5lX3N0YXRlKHN0YXRlLCAmcGxhbmUtPmJhc2Up OworCisJcmV0dXJuIHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKTsKK30KKwogaW50 IGludGVsX2F0b21pY19zZXR1cF9zY2FsZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3Ry dWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggMWI4YmE3NzdkMmIzLi5kYzFl MTY4M2Y0YTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMTk5NiwxMSArMTk5NiwxOCBA QCBzdGF0aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCiAJCWN1cl9sYXRlbmN5ICo9IDU7CiAJfQogCi0JcmVzdWx0LT5w cmlfdmFsID0gaWxrX2NvbXB1dGVfcHJpX3dtKGNzdGF0ZSwgcHJpc3RhdGUsCi0JCQkJCSAgICAg cHJpX2xhdGVuY3ksIGxldmVsKTsKLQlyZXN1bHQtPnNwcl92YWwgPSBpbGtfY29tcHV0ZV9zcHJf d20oY3N0YXRlLCBzcHJzdGF0ZSwgc3ByX2xhdGVuY3kpOwotCXJlc3VsdC0+Y3VyX3ZhbCA9IGls a19jb21wdXRlX2N1cl93bShjc3RhdGUsIGN1cnN0YXRlLCBjdXJfbGF0ZW5jeSk7Ci0JcmVzdWx0 LT5mYmNfdmFsID0gaWxrX2NvbXB1dGVfZmJjX3dtKGNzdGF0ZSwgcHJpc3RhdGUsIHJlc3VsdC0+ cHJpX3ZhbCk7CisJaWYgKHByaXN0YXRlKSB7CisJCXJlc3VsdC0+cHJpX3ZhbCA9IGlsa19jb21w dXRlX3ByaV93bShjc3RhdGUsIHByaXN0YXRlLAorCQkJCQkJICAgICBwcmlfbGF0ZW5jeSwgbGV2 ZWwpOworCQlyZXN1bHQtPmZiY192YWwgPSBpbGtfY29tcHV0ZV9mYmNfd20oY3N0YXRlLCBwcmlz dGF0ZSwgcmVzdWx0LT5wcmlfdmFsKTsKKwl9CisKKwlpZiAoc3Byc3RhdGUpCisJCXJlc3VsdC0+ c3ByX3ZhbCA9IGlsa19jb21wdXRlX3Nwcl93bShjc3RhdGUsIHNwcnN0YXRlLCBzcHJfbGF0ZW5j eSk7CisKKwlpZiAoY3Vyc3RhdGUpCisJCXJlc3VsdC0+Y3VyX3ZhbCA9IGlsa19jb21wdXRlX2N1 cl93bShjc3RhdGUsIGN1cnN0YXRlLCBjdXJfbGF0ZW5jeSk7CisKIAlyZXN1bHQtPmVuYWJsZSA9 IHRydWU7CiB9CiAKQEAgLTIyODgsNTEgKzIyOTUsNTEgQEAgc3RhdGljIGJvb2wgaWxrX3ZhbGlk YXRlX3BpcGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIH0KIAogLyogQ29tcHV0ZSBuZXcg d2F0ZXJtYXJrcyBmb3IgdGhlIHBpcGUgKi8KLXN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93 bShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKLQkJCSAgICAgICBzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUpCitzdGF0aWMgaW50IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKIHsKKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUgPSBjc3RhdGUtPmJhc2Uuc3RhdGU7CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMgPSB0b19pbnRlbF9jcnRjKGNzdGF0ZS0+YmFzZS5jcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfcGlw ZV93bSAqcGlwZV93bTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfY3J0Yy0+YmFz ZS5kZXY7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHN0YXRlLT5kZXY7CiAJY29uc3Qgc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0gTlVMTDsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUg KmludGVsX3BsYW5lOwotCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzOwogCXN0cnVjdCBpbnRl bF9wbGFuZV9zdGF0ZSAqcHJpc3RhdGUgPSBOVUxMOwogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0 ZSAqc3Byc3RhdGUgPSBOVUxMOwogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqY3Vyc3RhdGUg PSBOVUxMOwogCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYpLCB1 c2FibGVfbGV2ZWw7CiAJc3RydWN0IGlsa193bV9tYXhpbXVtcyBtYXg7CiAKLQljc3RhdGUgPSBp bnRlbF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGludGVsX2NydGMpOwotCWlmIChJU19F UlIoY3N0YXRlKSkKLQkJcmV0dXJuIFBUUl9FUlIoY3N0YXRlKTsKLQogCXBpcGVfd20gPSAmY3N0 YXRlLT53bS5vcHRpbWFsLmlsazsKIAogCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2NydGMoZGV2 LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgewotCQlwcyA9IGRybV9hdG9taWNfZ2V0X3BsYW5l X3N0YXRlKHN0YXRlLAotCQkJCQkJJmludGVsX3BsYW5lLT5iYXNlKTsKLQkJaWYgKElTX0VSUihw cykpCi0JCQlyZXR1cm4gUFRSX0VSUihwcyk7CisJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAq cHM7CisKKwkJcHMgPSBpbnRlbF9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5lX3N0YXRlKHN0YXRl LAorCQkJCQkJCSAgIGludGVsX3BsYW5lKTsKKwkJaWYgKCFwcykKKwkJCWNvbnRpbnVlOwogCiAJ CWlmIChpbnRlbF9wbGFuZS0+YmFzZS50eXBlID09IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpCi0J CQlwcmlzdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBzKTsKKwkJCXByaXN0YXRlID0gcHM7 CiAJCWVsc2UgaWYgKGludGVsX3BsYW5lLT5iYXNlLnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfT1ZF UkxBWSkKLQkJCXNwcnN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUocHMpOworCQkJc3Byc3Rh dGUgPSBwczsKIAkJZWxzZSBpZiAoaW50ZWxfcGxhbmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVf VFlQRV9DVVJTT1IpCi0JCQljdXJzdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBzKTsKKwkJ CWN1cnN0YXRlID0gcHM7CiAJfQogCiAJcGlwZV93bS0+cGlwZV9lbmFibGVkID0gY3N0YXRlLT5i YXNlLmFjdGl2ZTsKLQlwaXBlX3dtLT5zcHJpdGVzX2VuYWJsZWQgPSBzcHJzdGF0ZS0+dmlzaWJs ZTsKLQlwaXBlX3dtLT5zcHJpdGVzX3NjYWxlZCA9IHNwcnN0YXRlLT52aXNpYmxlICYmCi0JCShk cm1fcmVjdF93aWR0aCgmc3Byc3RhdGUtPmRzdCkgIT0gZHJtX3JlY3Rfd2lkdGgoJnNwcnN0YXRl LT5zcmMpID4+IDE2IHx8Ci0JCWRybV9yZWN0X2hlaWdodCgmc3Byc3RhdGUtPmRzdCkgIT0gZHJt X3JlY3RfaGVpZ2h0KCZzcHJzdGF0ZS0+c3JjKSA+PiAxNik7CisJaWYgKHNwcnN0YXRlKSB7CisJ CXBpcGVfd20tPnNwcml0ZXNfZW5hYmxlZCA9IHNwcnN0YXRlLT52aXNpYmxlOworCQlwaXBlX3dt LT5zcHJpdGVzX3NjYWxlZCA9IHNwcnN0YXRlLT52aXNpYmxlICYmCisJCQkoZHJtX3JlY3Rfd2lk dGgoJnNwcnN0YXRlLT5kc3QpICE9IGRybV9yZWN0X3dpZHRoKCZzcHJzdGF0ZS0+c3JjKSA+PiAx NiB8fAorCQkJIGRybV9yZWN0X2hlaWdodCgmc3Byc3RhdGUtPmRzdCkgIT0gZHJtX3JlY3RfaGVp Z2h0KCZzcHJzdGF0ZS0+c3JjKSA+PiAxNik7CisJfQorCiAKIAl1c2FibGVfbGV2ZWwgPSBtYXhf bGV2ZWw7CiAKIAkvKiBJTEsvU05COiBMUDIrIHdhdGVybWFya3Mgb25seSB3L28gc3ByaXRlcyAq LwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA2ICYmIHNwcnN0YXRlLT52aXNpYmxlKQor CWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA2ICYmIHBpcGVfd20tPnNwcml0ZXNfZW5hYmxl ZCkKIAkJdXNhYmxlX2xldmVsID0gMTsKIAogCS8qIElMSy9TTkIvSVZCOiBMUDErIHdhdGVybWFy a3Mgb25seSB3L28gc2NhbGluZyAqLwotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=