From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 1/2] drm/i915: Do not rely on wm preservation for ILK watermarks Date: Wed, 25 Oct 2017 13:23:31 +0300 Message-ID: <20171025102331.GJ10981@intel.com> References: <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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA1DD6E650 for ; Wed, 25 Oct 2017 10:23:34 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20171019151341.4579-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: Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBPY3QgMTksIDIwMTcgYXQgMDU6MTM6NDBQTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gVGhlIG9yaWdpbmFsIGludGVudCB3YXMgdG8gcHJlc2VydmUgd2F0ZXJtYXJr cyBhcyBtdWNoIGFzIHBvc3NpYmxlCj4gaW4gaW50ZWxfcGlwZV93bS5yYXdfd20sIGFuZCBwdXQg dGhlIHZhbGlkYXRlZCBvbmVzIGluIGludGVsX3BpcGVfd20ud20uCj4gCj4gSXQgc2VlbXMgdGhp cyBhcHByb2FjaCBpcyBpbnN1ZmZpY2llbnQgYW5kIHdlIGRvbid0IGFsd2F5cyBwcmVzZXJ2ZQo+ IHRoZSByYXcgd2F0ZXJtYXJrcywgc28ganVzdCB1c2UgdGhlIGF0b21pYyBpdGVyYXRvciB3ZSdy ZSBhbHJlYWR5IHVzaW5nCj4gdG8gZ2V0IGEgY29uc3QgcG9pbnRlciB0byBhbGwgYm91bmQgcGxh bmVzIG9uIHRoZSBjcnRjLgoKSSBkb24ndCByZWFsbHkgbGlrZSB0aGF0IHRyaWNrLiBCdXQgSSBn YXZlIHRoaXMgc2VyaWVzIGEgdHJ5IG9uIG15IElWQgphbmQgc28gZmFyIHRoaW5ncyBzZWVtIHRv IHdvcmsgY29ycmVjdGx5LiBJSVJDIGp1c3QgcGF0Y2ggMiAob3Igc29tZXRoaW5nCnNpbWlsYXIp IGFsb25lIHJlc3VsdGVkIGluIGZhaWx1cmUgdG8gY29tcHV0ZSBpbnRlcm1lZGlhdGUgd2F0ZXJt YXJrcwphbmQgdGh1cyBhIGJsYWNrIHNjcmVlbi4KClNvIGlmIGl0IGZpeGVzIHRoaW5ncwpBY2tl ZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCj4g Cj4gQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lk PTEwMjM3Mwo+IFNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmto b3JzdEBsaW51eC5pbnRlbC5jb20+Cj4gQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcgI3Y0Ljgr Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgIDEgLQo+ICBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICB8IDUxICsrKysrKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KPiAgMiBmaWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAz MSBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+IGluZGV4IDQ3ZDAy MmQ0ODcxOC4uN2JjNjBjODQ4OTQwIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKPiBA QCAtNDk5LDcgKzQ5OSw2IEBAIHN0cnVjdCBpbnRlbF9jcnRjX3NjYWxlcl9zdGF0ZSB7Cj4gIAo+ ICBzdHJ1Y3QgaW50ZWxfcGlwZV93bSB7Cj4gIAlzdHJ1Y3QgaW50ZWxfd21fbGV2ZWwgd21bNV07 Cj4gLQlzdHJ1Y3QgaW50ZWxfd21fbGV2ZWwgcmF3X3dtWzVdOwo+ICAJdWludDMyX3QgbGluZXRp bWU7Cj4gIAlib29sIGZiY193bV9lbmFibGVkOwo+ICAJYm9vbCBwaXBlX2VuYWJsZWQ7Cj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCj4gaW5kZXggYzQyYTY1YTkzYjNhLi5lYTcwYzcyMGY0OTIgMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ICsrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiBAQCAtMjcyMSw5ICsyNzIxLDkgQEAgc3RhdGlj IHZvaWQgaWxrX2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAo+ICAJCQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAo+ ICAJCQkJIGludCBsZXZlbCwKPiAgCQkJCSBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRl LAo+IC0JCQkJIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHJpc3RhdGUsCj4gLQkJCQkgc3Ry dWN0IGludGVsX3BsYW5lX3N0YXRlICpzcHJzdGF0ZSwKPiAtCQkJCSBzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgKmN1cnN0YXRlLAo+ICsJCQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0 ZSAqcHJpc3RhdGUsCj4gKwkJCQkgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzcHJz dGF0ZSwKPiArCQkJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmN1cnN0YXRlLAo+ ICAJCQkJIHN0cnVjdCBpbnRlbF93bV9sZXZlbCAqcmVzdWx0KQo+ICB7Cj4gIAl1aW50MTZfdCBw cmlfbGF0ZW5jeSA9IGRldl9wcml2LT53bS5wcmlfbGF0ZW5jeVtsZXZlbF07Cj4gQEAgLTMwNDMs MjggKzMwNDMsMjQgQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjc3RhdGUpCj4gIAlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqcGlwZV93bTsK PiAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2Owo+ICAJY29uc3Qgc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwo+IC0Jc3RydWN0IGlu dGVsX3BsYW5lICppbnRlbF9wbGFuZTsKPiAtCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHJp c3RhdGUgPSBOVUxMOwo+IC0Jc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzcHJzdGF0ZSA9IE5V TEw7Cj4gLQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmN1cnN0YXRlID0gTlVMTDsKPiArCXN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwo+ICsJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAq cGxhbmVfc3RhdGU7Cj4gKwljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnByaXN0YXRl ID0gTlVMTDsKPiArCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3Byc3RhdGUgPSBO VUxMOwo+ICsJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpjdXJzdGF0ZSA9IE5VTEw7 Cj4gIAlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpLCB1 c2FibGVfbGV2ZWw7Cj4gIAlzdHJ1Y3QgaWxrX3dtX21heGltdW1zIG1heDsKPiAgCj4gIAlwaXBl X3dtID0gJmNzdGF0ZS0+d20uaWxrLm9wdGltYWw7Cj4gIAo+IC0JZm9yX2VhY2hfaW50ZWxfcGxh bmVfb25fY3J0YyhkZXYsIGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7Cj4gLQkJc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICpwczsKPiAtCj4gLQkJcHMgPSBpbnRlbF9hdG9taWNfZ2V0X2V4aXN0 aW5nX3BsYW5lX3N0YXRlKHN0YXRlLAo+IC0JCQkJCQkJICAgaW50ZWxfcGxhbmUpOwo+IC0JCWlm ICghcHMpCj4gLQkJCWNvbnRpbnVlOwo+ICsJZHJtX2F0b21pY19jcnRjX3N0YXRlX2Zvcl9lYWNo X3BsYW5lX3N0YXRlKHBsYW5lLCBwbGFuZV9zdGF0ZSwgJmNzdGF0ZS0+YmFzZSkgewo+ICsJCWNv bnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHMgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShw bGFuZV9zdGF0ZSk7Cj4gIAo+IC0JCWlmIChpbnRlbF9wbGFuZS0+YmFzZS50eXBlID09IERSTV9Q TEFORV9UWVBFX1BSSU1BUlkpCj4gKwkJaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBF X1BSSU1BUlkpCj4gIAkJCXByaXN0YXRlID0gcHM7Cj4gLQkJZWxzZSBpZiAoaW50ZWxfcGxhbmUt PmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZKQo+ICsJCWVsc2UgaWYgKHBsYW5l LT50eXBlID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkpCj4gIAkJCXNwcnN0YXRlID0gcHM7Cj4g LQkJZWxzZSBpZiAoaW50ZWxfcGxhbmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJT T1IpCj4gKwkJZWxzZSBpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKQo+ ICAJCQljdXJzdGF0ZSA9IHBzOwo+ICAJfQo+ICAKPiBAQCAtMzA4NiwxMSArMzA4Miw5IEBAIHN0 YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0 YXRlKQo+ICAJaWYgKHBpcGVfd20tPnNwcml0ZXNfc2NhbGVkKQo+ICAJCXVzYWJsZV9sZXZlbCA9 IDA7Cj4gIAo+IC0JaWxrX2NvbXB1dGVfd21fbGV2ZWwoZGV2X3ByaXYsIGludGVsX2NydGMsIDAs IGNzdGF0ZSwKPiAtCQkJICAgICBwcmlzdGF0ZSwgc3Byc3RhdGUsIGN1cnN0YXRlLCAmcGlwZV93 bS0+cmF3X3dtWzBdKTsKPiAtCj4gIAltZW1zZXQoJnBpcGVfd20tPndtLCAwLCBzaXplb2YocGlw ZV93bS0+d20pKTsKPiAtCXBpcGVfd20tPndtWzBdID0gcGlwZV93bS0+cmF3X3dtWzBdOwo+ICsJ aWxrX2NvbXB1dGVfd21fbGV2ZWwoZGV2X3ByaXYsIGludGVsX2NydGMsIDAsIGNzdGF0ZSwKPiAr CQkJICAgICBwcmlzdGF0ZSwgc3Byc3RhdGUsIGN1cnN0YXRlLCAmcGlwZV93bS0+d21bMF0pOwo+ ICAKPiAgCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYp KQo+ICAJCXBpcGVfd20tPmxpbmV0aW1lID0gaHN3X2NvbXB1dGVfbGluZXRpbWVfd20oY3N0YXRl KTsKPiBAQCAtMzEwMCw4ICszMDk0LDggQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9waXBlX3dt KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCj4gIAo+ICAJaWxrX2NvbXB1dGVfd21f cmVnX21heGltdW1zKGRldl9wcml2LCAxLCAmbWF4KTsKPiAgCj4gLQlmb3IgKGxldmVsID0gMTsg bGV2ZWwgPD0gbWF4X2xldmVsOyBsZXZlbCsrKSB7Cj4gLQkJc3RydWN0IGludGVsX3dtX2xldmVs ICp3bSA9ICZwaXBlX3dtLT5yYXdfd21bbGV2ZWxdOwo+ICsJZm9yIChsZXZlbCA9IDE7IGxldmVs IDw9IHVzYWJsZV9sZXZlbDsgbGV2ZWwrKykgewo+ICsJCXN0cnVjdCBpbnRlbF93bV9sZXZlbCAq d20gPSAmcGlwZV93bS0+d21bbGV2ZWxdOwo+ICAKPiAgCQlpbGtfY29tcHV0ZV93bV9sZXZlbChk ZXZfcHJpdiwgaW50ZWxfY3J0YywgbGV2ZWwsIGNzdGF0ZSwKPiAgCQkJCSAgICAgcHJpc3RhdGUs IHNwcnN0YXRlLCBjdXJzdGF0ZSwgd20pOwo+IEBAIC0zMTExLDEzICszMTA1LDEwIEBAIHN0YXRp YyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRl KQo+ICAJCSAqIHJlZ2lzdGVyIG1heGltdW1zIHNpbmNlIHN1Y2ggd2F0ZXJtYXJrcyBhcmUKPiAg CQkgKiBhbHdheXMgaW52YWxpZC4KPiAgCQkgKi8KPiAtCQlpZiAobGV2ZWwgPiB1c2FibGVfbGV2 ZWwpCj4gLQkJCWNvbnRpbnVlOwo+IC0KPiAtCQlpZiAoaWxrX3ZhbGlkYXRlX3dtX2xldmVsKGxl dmVsLCAmbWF4LCB3bSkpCj4gLQkJCXBpcGVfd20tPndtW2xldmVsXSA9ICp3bTsKPiAtCQllbHNl Cj4gLQkJCXVzYWJsZV9sZXZlbCA9IGxldmVsOwo+ICsJCWlmICghaWxrX3ZhbGlkYXRlX3dtX2xl dmVsKGxldmVsLCAmbWF4LCB3bSkpIHsKPiArCQkJbWVtc2V0KHdtLCAwLCBzaXplb2YoKndtKSk7 Cj4gKwkJCWJyZWFrOwo+ICsJCX0KPiAgCX0KPiAgCj4gIAlyZXR1cm4gMDsKPiAtLSAKPiAyLjE0 LjEKCi0tIApWaWxsZSBTeXJqw6Rsw6QKSW50ZWwgT1RDCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=