From: Matt Roper Subject: Re: [PATCH 1/2] drm/i915: Do not rely on wm preservation for ILK watermarks Date: Tue, 24 Oct 2017 16:01:02 -0700 Message-ID: <20171024230102.GD11881@mdroper-desk.amr.corp.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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB8EF6E5F7 for ; Tue, 24 Oct 2017 23:01:03 +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 bmVzIG9uIHRoZSBjcnRjLgo+IAo+IEJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Au b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDIzNzMKPiBTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmto b3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+IENjOiBzdGFibGVAdmdl ci5rZXJuZWwub3JnICN2NC44KwoKSXQncyBiZWVuIGEgd2hpbGUgc2luY2UgSSBsb29rZWQgYXQg dGhpcyBjb2RlLCBzbyBJJ20gbm90IHN1cmUgSSdtCmZvbGxvd2luZyBhbGwgdGhlIGNvbnRleHQv aGlzdG9yeSBoZXJlLiAgQmVmb3JlIHRoaXMgcGF0Y2gsIHdlIGhhZApjYWxjdWxhdGVkIHdhdGVy bWFya3MgZm9yIGFsbCBsZXZlbHMgKGV2ZW4gdGhvc2UgYWJvdmUgdGhlIG1heGltdW0KdXNhYmxl IHdhdGVybWFyayBsZXZlbCBhcyBkZXRlcm1pbmVkIGJ5IHNwcml0ZSB1c2FnZSkgaW50byByYXdf d20uICBCdXQKYXMgZmFyIGFzIEkgY2FuIHRlbGwsIHdlIG5ldmVyIGFjdHVhbGx5IHVzZWQgdGhv c2UgdmFsdWVzIGZvciBhbnl0aGluZwpzbyB0aGF0IHdhcyBubyBkaWZmZXJlbnQgdGhhbiBqdXN0 IHRocm93aW5nIHRoZSB2YWx1ZXMgYXdheT8KCklzIG15IHVuZGVyc3RhbmRpbmcgY29ycmVjdCB0 aGF0IHRoaXMgaXMgbW9zdGx5IGEgcmV2ZXJ0IG9mIDcxZjBhNjI2MTQKKCJkcm0vaTkxNTogT25s eSB1c2Ugc2FuaXRpemVkIHZhbHVlcyBmb3IgSUxLIHdhdGVybWFya3MpIGV4Y2VwdCB0aGF0IGl0 CmFsc28gbW9kaWZpZXMgdGhlIGxldmVsIHZhbGlkYXRpb24gbG9vcCBzbyB0aGF0IHdlJ3JlIG9u bHkgY2FsbGluZwppbGtfY29tcHV0ZV93bV9sZXZlbCgpIG9uIHRoZSBsZXZlbHMgdXAgdG8gdXNh YmxlX2xldmVsIHdoZXJlYXMgYmVmb3JlCnRoYXQgcGF0Y2ggd2Ugd2VyZSBjYWxsaW5nIGl0IG9u IGFsbCBsZXZlbHMsIGJ1dCB0aGVuCnNldHRpbmcgd20tPmVuYWJsZSA9IGZhbHNlIGZvciB0aGUg dW51c2FibGUgbGV2ZWxzPwoKQnkgbXkgdW5kZXJzdGFuZGluZywgdGhpcyBsb29rcyBsaWtlIGEg c2FmZSBzaW1wbGlmaWNhdGlvbiBvZiB0aGUKY3VycmVudCBsb2dpYywgYnV0IEkgZG9uJ3Qgc2Vl IHdoZXJlIHRoZSBmdW5jdGlvbmFsIGNoYW5nZSBpcyBoZXJlLgpXYXMgdGhlIEJ1emlsbGE6IHJl ZmVyZW5jZSBzdXBwb3NlZCB0byBiZSB0aWVkIHRvIHBhdGNoICMyIG9mIHRoaXMKc2VyaWVzIG9y IGFtIEkgbWlzc2luZyBzb21ldGhpbmcgaW1wb3J0YW50PwoKCk1hdHQKCj4gLS0tCj4gIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgIDEgLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jICB8IDUxICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KPiAgMiBmaWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkK PiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+IGluZGV4IDQ3ZDAyMmQ0ODcxOC4uN2JjNjBj ODQ4OTQwIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKPiBAQCAtNDk5LDcgKzQ5OSw2 IEBAIHN0cnVjdCBpbnRlbF9jcnRjX3NjYWxlcl9zdGF0ZSB7Cj4gIAo+ICBzdHJ1Y3QgaW50ZWxf cGlwZV93bSB7Cj4gIAlzdHJ1Y3QgaW50ZWxfd21fbGV2ZWwgd21bNV07Cj4gLQlzdHJ1Y3QgaW50 ZWxfd21fbGV2ZWwgcmF3X3dtWzVdOwo+ICAJdWludDMyX3QgbGluZXRpbWU7Cj4gIAlib29sIGZi Y193bV9lbmFibGVkOwo+ICAJYm9vbCBwaXBlX2VuYWJsZWQ7Cj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCj4gaW5kZXggYzQyYTY1YTkzYjNhLi5lYTcwYzcyMGY0OTIgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKPiBAQCAtMjcyMSw5ICsyNzIxLDkgQEAgc3RhdGljIHZvaWQgaWxrX2NvbXB1 dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ICAJ CQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAo+ICAJCQkJIGludCBsZXZl bCwKPiAgCQkJCSBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAo+IC0JCQkJIHN0cnVj dCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHJpc3RhdGUsCj4gLQkJCQkgc3RydWN0IGludGVsX3BsYW5l X3N0YXRlICpzcHJzdGF0ZSwKPiAtCQkJCSBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmN1cnN0 YXRlLAo+ICsJCQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHJpc3RhdGUsCj4g KwkJCQkgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzcHJzdGF0ZSwKPiArCQkJCSBj b25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmN1cnN0YXRlLAo+ICAJCQkJIHN0cnVjdCBp bnRlbF93bV9sZXZlbCAqcmVzdWx0KQo+ICB7Cj4gIAl1aW50MTZfdCBwcmlfbGF0ZW5jeSA9IGRl dl9wcml2LT53bS5wcmlfbGF0ZW5jeVtsZXZlbF07Cj4gQEAgLTMwNDMsMjggKzMwNDMsMjQgQEAg c3RhdGljIGludCBpbGtfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj c3RhdGUpCj4gIAlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqcGlwZV93bTsKPiAgCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2Owo+ICAJY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwo+IC0Jc3RydWN0IGludGVsX3BsYW5lICppbnRl bF9wbGFuZTsKPiAtCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHJpc3RhdGUgPSBOVUxMOwo+ IC0Jc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzcHJzdGF0ZSA9IE5VTEw7Cj4gLQlzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKmN1cnN0YXRlID0gTlVMTDsKPiArCXN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lOwo+ICsJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7Cj4g Kwljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnByaXN0YXRlID0gTlVMTDsKPiArCWNv bnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3Byc3RhdGUgPSBOVUxMOwo+ICsJY29uc3Qg c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpjdXJzdGF0ZSA9IE5VTEw7Cj4gIAlpbnQgbGV2ZWws IG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpLCB1c2FibGVfbGV2ZWw7Cj4g IAlzdHJ1Y3QgaWxrX3dtX21heGltdW1zIG1heDsKPiAgCj4gIAlwaXBlX3dtID0gJmNzdGF0ZS0+ d20uaWxrLm9wdGltYWw7Cj4gIAo+IC0JZm9yX2VhY2hfaW50ZWxfcGxhbmVfb25fY3J0YyhkZXYs IGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7Cj4gLQkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICpwczsKPiAtCj4gLQkJcHMgPSBpbnRlbF9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5lX3N0YXRl KHN0YXRlLAo+IC0JCQkJCQkJICAgaW50ZWxfcGxhbmUpOwo+IC0JCWlmICghcHMpCj4gLQkJCWNv bnRpbnVlOwo+ICsJZHJtX2F0b21pY19jcnRjX3N0YXRlX2Zvcl9lYWNoX3BsYW5lX3N0YXRlKHBs YW5lLCBwbGFuZV9zdGF0ZSwgJmNzdGF0ZS0+YmFzZSkgewo+ICsJCWNvbnN0IHN0cnVjdCBpbnRl bF9wbGFuZV9zdGF0ZSAqcHMgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZV9zdGF0ZSk7Cj4g IAo+IC0JCWlmIChpbnRlbF9wbGFuZS0+YmFzZS50eXBlID09IERSTV9QTEFORV9UWVBFX1BSSU1B UlkpCj4gKwkJaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpCj4gIAkJ CXByaXN0YXRlID0gcHM7Cj4gLQkJZWxzZSBpZiAoaW50ZWxfcGxhbmUtPmJhc2UudHlwZSA9PSBE Uk1fUExBTkVfVFlQRV9PVkVSTEFZKQo+ICsJCWVsc2UgaWYgKHBsYW5lLT50eXBlID09IERSTV9Q TEFORV9UWVBFX09WRVJMQVkpCj4gIAkJCXNwcnN0YXRlID0gcHM7Cj4gLQkJZWxzZSBpZiAoaW50 ZWxfcGxhbmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IpCj4gKwkJZWxzZSBp ZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKQo+ICAJCQljdXJzdGF0ZSA9 IHBzOwo+ICAJfQo+ICAKPiBAQCAtMzA4NiwxMSArMzA4Miw5IEBAIHN0YXRpYyBpbnQgaWxrX2Nv bXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQo+ICAJaWYgKHBp cGVfd20tPnNwcml0ZXNfc2NhbGVkKQo+ICAJCXVzYWJsZV9sZXZlbCA9IDA7Cj4gIAo+IC0JaWxr X2NvbXB1dGVfd21fbGV2ZWwoZGV2X3ByaXYsIGludGVsX2NydGMsIDAsIGNzdGF0ZSwKPiAtCQkJ ICAgICBwcmlzdGF0ZSwgc3Byc3RhdGUsIGN1cnN0YXRlLCAmcGlwZV93bS0+cmF3X3dtWzBdKTsK PiAtCj4gIAltZW1zZXQoJnBpcGVfd20tPndtLCAwLCBzaXplb2YocGlwZV93bS0+d20pKTsKPiAt CXBpcGVfd20tPndtWzBdID0gcGlwZV93bS0+cmF3X3dtWzBdOwo+ICsJaWxrX2NvbXB1dGVfd21f bGV2ZWwoZGV2X3ByaXYsIGludGVsX2NydGMsIDAsIGNzdGF0ZSwKPiArCQkJICAgICBwcmlzdGF0 ZSwgc3Byc3RhdGUsIGN1cnN0YXRlLCAmcGlwZV93bS0+d21bMF0pOwo+ICAKPiAgCWlmIChJU19I QVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQo+ICAJCXBpcGVfd20t PmxpbmV0aW1lID0gaHN3X2NvbXB1dGVfbGluZXRpbWVfd20oY3N0YXRlKTsKPiBAQCAtMzEwMCw4 ICszMDk0LDggQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjc3RhdGUpCj4gIAo+ICAJaWxrX2NvbXB1dGVfd21fcmVnX21heGltdW1zKGRl dl9wcml2LCAxLCAmbWF4KTsKPiAgCj4gLQlmb3IgKGxldmVsID0gMTsgbGV2ZWwgPD0gbWF4X2xl dmVsOyBsZXZlbCsrKSB7Cj4gLQkJc3RydWN0IGludGVsX3dtX2xldmVsICp3bSA9ICZwaXBlX3dt LT5yYXdfd21bbGV2ZWxdOwo+ICsJZm9yIChsZXZlbCA9IDE7IGxldmVsIDw9IHVzYWJsZV9sZXZl bDsgbGV2ZWwrKykgewo+ICsJCXN0cnVjdCBpbnRlbF93bV9sZXZlbCAqd20gPSAmcGlwZV93bS0+ d21bbGV2ZWxdOwo+ICAKPiAgCQlpbGtfY29tcHV0ZV93bV9sZXZlbChkZXZfcHJpdiwgaW50ZWxf Y3J0YywgbGV2ZWwsIGNzdGF0ZSwKPiAgCQkJCSAgICAgcHJpc3RhdGUsIHNwcnN0YXRlLCBjdXJz dGF0ZSwgd20pOwo+IEBAIC0zMTExLDEzICszMTA1LDEwIEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1 dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQo+ICAJCSAqIHJlZ2lz dGVyIG1heGltdW1zIHNpbmNlIHN1Y2ggd2F0ZXJtYXJrcyBhcmUKPiAgCQkgKiBhbHdheXMgaW52 YWxpZC4KPiAgCQkgKi8KPiAtCQlpZiAobGV2ZWwgPiB1c2FibGVfbGV2ZWwpCj4gLQkJCWNvbnRp bnVlOwo+IC0KPiAtCQlpZiAoaWxrX3ZhbGlkYXRlX3dtX2xldmVsKGxldmVsLCAmbWF4LCB3bSkp Cj4gLQkJCXBpcGVfd20tPndtW2xldmVsXSA9ICp3bTsKPiAtCQllbHNlCj4gLQkJCXVzYWJsZV9s ZXZlbCA9IGxldmVsOwo+ICsJCWlmICghaWxrX3ZhbGlkYXRlX3dtX2xldmVsKGxldmVsLCAmbWF4 LCB3bSkpIHsKPiArCQkJbWVtc2V0KHdtLCAwLCBzaXplb2YoKndtKSk7Cj4gKwkJCWJyZWFrOwo+ ICsJCX0KPiAgCX0KPiAgCj4gIAlyZXR1cm4gMDsKPiAtLSAKPiAyLjE0LjEKPiAKPiBfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBtYWls aW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKCi0tIApNYXR0IFJv cGVyCkdyYXBoaWNzIFNvZnR3YXJlIEVuZ2luZWVyCklvVEcgUGxhdGZvcm0gRW5hYmxpbmcgJiBE ZXZlbG9wbWVudApJbnRlbCBDb3Jwb3JhdGlvbgooOTE2KSAzNTYtMjc5NQpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK