From: Maarten Lankhorst Subject: [PATCH 1/2] drm/i915: Do not rely on wm preservation for ILK watermarks Date: Thu, 19 Oct 2017 17:13:40 +0200 Message-ID: <20171019151341.4579-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 927A66E124 for ; Thu, 19 Oct 2017 15:13:52 +0000 (UTC) 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 VGhlIG9yaWdpbmFsIGludGVudCB3YXMgdG8gcHJlc2VydmUgd2F0ZXJtYXJrcyBhcyBtdWNoIGFz IHBvc3NpYmxlCmluIGludGVsX3BpcGVfd20ucmF3X3dtLCBhbmQgcHV0IHRoZSB2YWxpZGF0ZWQg b25lcyBpbiBpbnRlbF9waXBlX3dtLndtLgoKSXQgc2VlbXMgdGhpcyBhcHByb2FjaCBpcyBpbnN1 ZmZpY2llbnQgYW5kIHdlIGRvbid0IGFsd2F5cyBwcmVzZXJ2ZQp0aGUgcmF3IHdhdGVybWFya3Ms IHNvIGp1c3QgdXNlIHRoZSBhdG9taWMgaXRlcmF0b3Igd2UncmUgYWxyZWFkeSB1c2luZwp0byBn ZXQgYSBjb25zdCBwb2ludGVyIHRvIGFsbCBib3VuZCBwbGFuZXMgb24gdGhlIGNydGMuCgpCdWd6 aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyMzcz ClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51 eC5pbnRlbC5jb20+CkNjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnICN2NC44KwotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYyAgfCA1MSArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiAyIGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNDdkMDIyZDQ4NzE4Li43YmM2MGM4NDg5NDAgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC00OTksNyArNDk5LDYgQEAgc3RydWN0IGludGVs X2NydGNfc2NhbGVyX3N0YXRlIHsKIAogc3RydWN0IGludGVsX3BpcGVfd20gewogCXN0cnVjdCBp bnRlbF93bV9sZXZlbCB3bVs1XTsKLQlzdHJ1Y3QgaW50ZWxfd21fbGV2ZWwgcmF3X3dtWzVdOwog CXVpbnQzMl90IGxpbmV0aW1lOwogCWJvb2wgZmJjX3dtX2VuYWJsZWQ7CiAJYm9vbCBwaXBlX2Vu YWJsZWQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBjNDJhNjVhOTNiM2EuLmVhNzBjNzIw ZjQ5MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0yNzIxLDkgKzI3MjEsOSBAQCBzdGF0 aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAJCQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAog CQkJCSBpbnQgbGV2ZWwsCiAJCQkJIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCi0J CQkJIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHJpc3RhdGUsCi0JCQkJIHN0cnVjdCBpbnRl bF9wbGFuZV9zdGF0ZSAqc3Byc3RhdGUsCi0JCQkJIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAq Y3Vyc3RhdGUsCisJCQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHJpc3RhdGUs CisJCQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3Byc3RhdGUsCisJCQkJIGNv bnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqY3Vyc3RhdGUsCiAJCQkJIHN0cnVjdCBpbnRl bF93bV9sZXZlbCAqcmVzdWx0KQogewogCXVpbnQxNl90IHByaV9sYXRlbmN5ID0gZGV2X3ByaXYt PndtLnByaV9sYXRlbmN5W2xldmVsXTsKQEAgLTMwNDMsMjggKzMwNDMsMjQgQEAgc3RhdGljIGlu dCBpbGtfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCiAJ c3RydWN0IGludGVsX3BpcGVfd20gKnBpcGVfd207CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IHN0YXRlLT5kZXY7CiAJY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShkZXYpOwotCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmU7Ci0Jc3RydWN0 IGludGVsX3BsYW5lX3N0YXRlICpwcmlzdGF0ZSA9IE5VTEw7Ci0Jc3RydWN0IGludGVsX3BsYW5l X3N0YXRlICpzcHJzdGF0ZSA9IE5VTEw7Ci0Jc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpjdXJz dGF0ZSA9IE5VTEw7CisJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CisJY29uc3Qgc3RydWN0IGRy bV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7CisJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0 YXRlICpwcmlzdGF0ZSA9IE5VTEw7CisJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpz cHJzdGF0ZSA9IE5VTEw7CisJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpjdXJzdGF0 ZSA9IE5VTEw7CiAJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldl9w cml2KSwgdXNhYmxlX2xldmVsOwogCXN0cnVjdCBpbGtfd21fbWF4aW11bXMgbWF4OwogCiAJcGlw ZV93bSA9ICZjc3RhdGUtPndtLmlsay5vcHRpbWFsOwogCi0JZm9yX2VhY2hfaW50ZWxfcGxhbmVf b25fY3J0YyhkZXYsIGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7Ci0JCXN0cnVjdCBpbnRlbF9w bGFuZV9zdGF0ZSAqcHM7Ci0KLQkJcHMgPSBpbnRlbF9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5l X3N0YXRlKHN0YXRlLAotCQkJCQkJCSAgIGludGVsX3BsYW5lKTsKLQkJaWYgKCFwcykKLQkJCWNv bnRpbnVlOworCWRybV9hdG9taWNfY3J0Y19zdGF0ZV9mb3JfZWFjaF9wbGFuZV9zdGF0ZShwbGFu ZSwgcGxhbmVfc3RhdGUsICZjc3RhdGUtPmJhc2UpIHsKKwkJY29uc3Qgc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlICpwcyA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKTsKIAotCQlp ZiAoaW50ZWxfcGxhbmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9QUklNQVJZKQorCQlp ZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkKIAkJCXByaXN0YXRlID0g cHM7Ci0JCWVsc2UgaWYgKGludGVsX3BsYW5lLT5iYXNlLnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVf T1ZFUkxBWSkKKwkJZWxzZSBpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfT1ZFUkxB WSkKIAkJCXNwcnN0YXRlID0gcHM7Ci0JCWVsc2UgaWYgKGludGVsX3BsYW5lLT5iYXNlLnR5cGUg PT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKQorCQllbHNlIGlmIChwbGFuZS0+dHlwZSA9PSBEUk1f UExBTkVfVFlQRV9DVVJTT1IpCiAJCQljdXJzdGF0ZSA9IHBzOwogCX0KIApAQCAtMzA4NiwxMSAr MzA4Miw5IEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3N0YXRlKQogCWlmIChwaXBlX3dtLT5zcHJpdGVzX3NjYWxlZCkKIAkJdXNhYmxl X2xldmVsID0gMDsKIAotCWlsa19jb21wdXRlX3dtX2xldmVsKGRldl9wcml2LCBpbnRlbF9jcnRj LCAwLCBjc3RhdGUsCi0JCQkgICAgIHByaXN0YXRlLCBzcHJzdGF0ZSwgY3Vyc3RhdGUsICZwaXBl X3dtLT5yYXdfd21bMF0pOwotCiAJbWVtc2V0KCZwaXBlX3dtLT53bSwgMCwgc2l6ZW9mKHBpcGVf d20tPndtKSk7Ci0JcGlwZV93bS0+d21bMF0gPSBwaXBlX3dtLT5yYXdfd21bMF07CisJaWxrX2Nv bXB1dGVfd21fbGV2ZWwoZGV2X3ByaXYsIGludGVsX2NydGMsIDAsIGNzdGF0ZSwKKwkJCSAgICAg cHJpc3RhdGUsIHNwcnN0YXRlLCBjdXJzdGF0ZSwgJnBpcGVfd20tPndtWzBdKTsKIAogCWlmIChJ U19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQogCQlwaXBlX3dt LT5saW5ldGltZSA9IGhzd19jb21wdXRlX2xpbmV0aW1lX3dtKGNzdGF0ZSk7CkBAIC0zMTAwLDgg KzMwOTQsOCBAQCBzdGF0aWMgaW50IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNzdGF0ZSkKIAogCWlsa19jb21wdXRlX3dtX3JlZ19tYXhpbXVtcyhkZXZfcHJp diwgMSwgJm1heCk7CiAKLQlmb3IgKGxldmVsID0gMTsgbGV2ZWwgPD0gbWF4X2xldmVsOyBsZXZl bCsrKSB7Ci0JCXN0cnVjdCBpbnRlbF93bV9sZXZlbCAqd20gPSAmcGlwZV93bS0+cmF3X3dtW2xl dmVsXTsKKwlmb3IgKGxldmVsID0gMTsgbGV2ZWwgPD0gdXNhYmxlX2xldmVsOyBsZXZlbCsrKSB7 CisJCXN0cnVjdCBpbnRlbF93bV9sZXZlbCAqd20gPSAmcGlwZV93bS0+d21bbGV2ZWxdOwogCiAJ CWlsa19jb21wdXRlX3dtX2xldmVsKGRldl9wcml2LCBpbnRlbF9jcnRjLCBsZXZlbCwgY3N0YXRl LAogCQkJCSAgICAgcHJpc3RhdGUsIHNwcnN0YXRlLCBjdXJzdGF0ZSwgd20pOwpAQCAtMzExMSwx MyArMzEwNSwxMCBAQCBzdGF0aWMgaW50IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNzdGF0ZSkKIAkJICogcmVnaXN0ZXIgbWF4aW11bXMgc2luY2Ugc3VjaCB3 YXRlcm1hcmtzIGFyZQogCQkgKiBhbHdheXMgaW52YWxpZC4KIAkJICovCi0JCWlmIChsZXZlbCA+ IHVzYWJsZV9sZXZlbCkKLQkJCWNvbnRpbnVlOwotCi0JCWlmIChpbGtfdmFsaWRhdGVfd21fbGV2 ZWwobGV2ZWwsICZtYXgsIHdtKSkKLQkJCXBpcGVfd20tPndtW2xldmVsXSA9ICp3bTsKLQkJZWxz ZQotCQkJdXNhYmxlX2xldmVsID0gbGV2ZWw7CisJCWlmICghaWxrX3ZhbGlkYXRlX3dtX2xldmVs KGxldmVsLCAmbWF4LCB3bSkpIHsKKwkJCW1lbXNldCh3bSwgMCwgc2l6ZW9mKCp3bSkpOworCQkJ YnJlYWs7CisJCX0KIAl9CiAKIAlyZXR1cm4gMDsKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==