From: Maarten Lankhorst Subject: Re: [PATCH 1/2] drm/i915: Do not rely on wm preservation for ILK watermarks Date: Wed, 25 Oct 2017 08:03:47 +0200 Message-ID: <09243e5a-6b40-0528-440c-cfa741ee2a16@linux.intel.com> References: <20171019151341.4579-1-maarten.lankhorst@linux.intel.com> <20171024230102.GD11881@mdroper-desk.amr.corp.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 466E96E607 for ; Wed, 25 Oct 2017 06:03:49 +0000 (UTC) In-Reply-To: <20171024230102.GD11881@mdroper-desk.amr.corp.intel.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Matt Roper Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T3AgMjUtMTAtMTcgb20gMDE6MDEgc2NocmVlZiBNYXR0IFJvcGVyOgo+IE9uIFRodSwgT2N0IDE5 LCAyMDE3IGF0IDA1OjEzOjQwUE0gKzAyMDAsIE1hYXJ0ZW4gTGFua2hvcnN0IHdyb3RlOgo+PiBU aGUgb3JpZ2luYWwgaW50ZW50IHdhcyB0byBwcmVzZXJ2ZSB3YXRlcm1hcmtzIGFzIG11Y2ggYXMg cG9zc2libGUKPj4gaW4gaW50ZWxfcGlwZV93bS5yYXdfd20sIGFuZCBwdXQgdGhlIHZhbGlkYXRl ZCBvbmVzIGluIGludGVsX3BpcGVfd20ud20uCj4+Cj4+IEl0IHNlZW1zIHRoaXMgYXBwcm9hY2gg aXMgaW5zdWZmaWNpZW50IGFuZCB3ZSBkb24ndCBhbHdheXMgcHJlc2VydmUKPj4gdGhlIHJhdyB3 YXRlcm1hcmtzLCBzbyBqdXN0IHVzZSB0aGUgYXRvbWljIGl0ZXJhdG9yIHdlJ3JlIGFscmVhZHkg dXNpbmcKPj4gdG8gZ2V0IGEgY29uc3QgcG9pbnRlciB0byBhbGwgYm91bmQgcGxhbmVzIG9uIHRo ZSBjcnRjLgo+Pgo+PiBCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTAyMzczCj4+IFNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxt YWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Cj4+IENjOiBzdGFibGVAdmdlci5rZXJu ZWwub3JnICN2NC44Kwo+IEl0J3MgYmVlbiBhIHdoaWxlIHNpbmNlIEkgbG9va2VkIGF0IHRoaXMg Y29kZSwgc28gSSdtIG5vdCBzdXJlIEknbQo+IGZvbGxvd2luZyBhbGwgdGhlIGNvbnRleHQvaGlz dG9yeSBoZXJlLiAgQmVmb3JlIHRoaXMgcGF0Y2gsIHdlIGhhZAo+IGNhbGN1bGF0ZWQgd2F0ZXJt YXJrcyBmb3IgYWxsIGxldmVscyAoZXZlbiB0aG9zZSBhYm92ZSB0aGUgbWF4aW11bQo+IHVzYWJs ZSB3YXRlcm1hcmsgbGV2ZWwgYXMgZGV0ZXJtaW5lZCBieSBzcHJpdGUgdXNhZ2UpIGludG8gcmF3 X3dtLiAgQnV0Cj4gYXMgZmFyIGFzIEkgY2FuIHRlbGwsIHdlIG5ldmVyIGFjdHVhbGx5IHVzZWQg dGhvc2UgdmFsdWVzIGZvciBhbnl0aGluZwo+IHNvIHRoYXQgd2FzIG5vIGRpZmZlcmVudCB0aGFu IGp1c3QgdGhyb3dpbmcgdGhlIHZhbHVlcyBhd2F5PwoKTm8sIHRoZSB0cmljayBpbnRyb2R1Y2Vk IHRoZXJlIHdhcyB0aGF0IHdlIHByZXNlcnZlZCB0aGUgcmF3IHdhdGVybWFya3MgZm9yIGZ1dHVy ZQpjYWxjdWxhdGlvbnMgdG8gbm90IGluY2x1ZGUgYWxsIHBsYW5lcyBpbiBhIGNvbW1pdC4gVGhp cyBpcyBub3cgc29sdmVkIGJ5IHVzaW5nIHRoZQpyZWFkLW9ubHkgZHJtX2F0b21pY19jcnRjX3N0 YXRlX2Zvcl9lYWNoX3BsYW5lX3N0YXRlIGl0ZXJhdG9yLCB0byBnZXQgYWxsCmNvbnN0IHBsYW5l IHN0YXRlcyB3aXRob3V0IGhhdmluZyB0byBpbmNsdWRlIHRoZW0uCgo+IElzIG15IHVuZGVyc3Rh bmRpbmcgY29ycmVjdCB0aGF0IHRoaXMgaXMgbW9zdGx5IGEgcmV2ZXJ0IG9mIDcxZjBhNjI2MTQK PiAoImRybS9pOTE1OiBPbmx5IHVzZSBzYW5pdGl6ZWQgdmFsdWVzIGZvciBJTEsgd2F0ZXJtYXJr cykgZXhjZXB0IHRoYXQgaXQKPiBhbHNvIG1vZGlmaWVzIHRoZSBsZXZlbCB2YWxpZGF0aW9uIGxv b3Agc28gdGhhdCB3ZSdyZSBvbmx5IGNhbGxpbmcKPiBpbGtfY29tcHV0ZV93bV9sZXZlbCgpIG9u IHRoZSBsZXZlbHMgdXAgdG8gdXNhYmxlX2xldmVsIHdoZXJlYXMgYmVmb3JlCj4gdGhhdCBwYXRj aCB3ZSB3ZXJlIGNhbGxpbmcgaXQgb24gYWxsIGxldmVscywgYnV0IHRoZW4KPiBzZXR0aW5nIHdt LT5lbmFibGUgPSBmYWxzZSBmb3IgdGhlIHVudXNhYmxlIGxldmVscz8KPgo+IEJ5IG15IHVuZGVy c3RhbmRpbmcsIHRoaXMgbG9va3MgbGlrZSBhIHNhZmUgc2ltcGxpZmljYXRpb24gb2YgdGhlCj4g Y3VycmVudCBsb2dpYywgYnV0IEkgZG9uJ3Qgc2VlIHdoZXJlIHRoZSBmdW5jdGlvbmFsIGNoYW5n ZSBpcyBoZXJlLgo+IFdhcyB0aGUgQnV6aWxsYTogcmVmZXJlbmNlIHN1cHBvc2VkIHRvIGJlIHRp ZWQgdG8gcGF0Y2ggIzIgb2YgdGhpcwo+IHNlcmllcyBvciBhbSBJIG1pc3Npbmcgc29tZXRoaW5n IGltcG9ydGFudD8KCldlIG5vdyB0aHJvdyBhd2F5IGFsbCB3YXRlcm1hcmtzLCBhbmQgdXNlIGRy bV9hdG9taWNfY3J0Y19zdGF0ZV9mb3JfZWFjaF9wbGFuZV9zdGF0ZQp0byBnZXQgdGhlIHBsYW5l IHN0YXRlcy4gQXMgYSByZXN1bHQgd2UgY2FuIHRocm93IGF3YXkgdGhlIHJhdyB3YXRlcm1hcmtz LCB3aGljaCBoYXZlCnByb3ZlbiB0byBiZSBpbnN1ZmZpY2llbnRseSBwcmVzZXJ2ZWQuIDopCgo+ PiAtLS0KPj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgIDEgLQo+PiAgZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgfCA1MSArKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCj4+ICAyIGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyks IDMxIGRlbGV0aW9ucygtKQo+Pgo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+PiBpbmRleCA0 N2QwMjJkNDg3MTguLjdiYzYwYzg0ODk0MCAxMDA2NDQKPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKPj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmgKPj4gQEAgLTQ5OSw3ICs0OTksNiBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19zY2FsZXJfc3RhdGUg ewo+PiAgCj4+ICBzdHJ1Y3QgaW50ZWxfcGlwZV93bSB7Cj4+ICAJc3RydWN0IGludGVsX3dtX2xl dmVsIHdtWzVdOwo+PiAtCXN0cnVjdCBpbnRlbF93bV9sZXZlbCByYXdfd21bNV07Cj4+ICAJdWlu dDMyX3QgbGluZXRpbWU7Cj4+ICAJYm9vbCBmYmNfd21fZW5hYmxlZDsKPj4gIAlib29sIHBpcGVf ZW5hYmxlZDsKPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4+IGluZGV4IGM0MmE2NWE5M2IzYS4u ZWE3MGM3MjBmNDkyIDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPj4gQEAgLTI3MjEs OSArMjcyMSw5IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX2xldmVsKGNvbnN0IHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPj4gIAkJCQkgY29uc3Qgc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGMsCj4+ICAJCQkJIGludCBsZXZlbCwKPj4gIAkJCQkgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKPj4gLQkJCQkgc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICpwcmlzdGF0ZSwKPj4gLQkJCQkgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzcHJzdGF0ZSwK Pj4gLQkJCQkgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpjdXJzdGF0ZSwKPj4gKwkJCQkgY29u c3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwcmlzdGF0ZSwKPj4gKwkJCQkgY29uc3Qgc3Ry dWN0IGludGVsX3BsYW5lX3N0YXRlICpzcHJzdGF0ZSwKPj4gKwkJCQkgY29uc3Qgc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICpjdXJzdGF0ZSwKPj4gIAkJCQkgc3RydWN0IGludGVsX3dtX2xldmVs ICpyZXN1bHQpCj4+ICB7Cj4+ICAJdWludDE2X3QgcHJpX2xhdGVuY3kgPSBkZXZfcHJpdi0+d20u cHJpX2xhdGVuY3lbbGV2ZWxdOwo+PiBAQCAtMzA0MywyOCArMzA0MywyNCBAQCBzdGF0aWMgaW50 IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKPj4g IAlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqcGlwZV93bTsKPj4gIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gc3RhdGUtPmRldjsKPj4gIAljb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGRldik7Cj4+IC0Jc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFu ZTsKPj4gLQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnByaXN0YXRlID0gTlVMTDsKPj4gLQlz dHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnNwcnN0YXRlID0gTlVMTDsKPj4gLQlzdHJ1Y3QgaW50 ZWxfcGxhbmVfc3RhdGUgKmN1cnN0YXRlID0gTlVMTDsKPj4gKwlzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZTsKPj4gKwljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKPj4g Kwljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnByaXN0YXRlID0gTlVMTDsKPj4gKwlj b25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnNwcnN0YXRlID0gTlVMTDsKPj4gKwljb25z dCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmN1cnN0YXRlID0gTlVMTDsKPj4gIAlpbnQgbGV2 ZWwsIG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpLCB1c2FibGVfbGV2ZWw7 Cj4+ICAJc3RydWN0IGlsa193bV9tYXhpbXVtcyBtYXg7Cj4+ICAKPj4gIAlwaXBlX3dtID0gJmNz dGF0ZS0+d20uaWxrLm9wdGltYWw7Cj4+ICAKPj4gLQlmb3JfZWFjaF9pbnRlbF9wbGFuZV9vbl9j cnRjKGRldiwgaW50ZWxfY3J0YywgaW50ZWxfcGxhbmUpIHsKPj4gLQkJc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlICpwczsKPj4gLQo+PiAtCQlwcyA9IGludGVsX2F0b21pY19nZXRfZXhpc3Rpbmdf cGxhbmVfc3RhdGUoc3RhdGUsCj4+IC0JCQkJCQkJICAgaW50ZWxfcGxhbmUpOwo+PiAtCQlpZiAo IXBzKQo+PiAtCQkJY29udGludWU7Cj4+ICsJZHJtX2F0b21pY19jcnRjX3N0YXRlX2Zvcl9lYWNo X3BsYW5lX3N0YXRlKHBsYW5lLCBwbGFuZV9zdGF0ZSwgJmNzdGF0ZS0+YmFzZSkgewo+PiArCQlj b25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBzID0gdG9faW50ZWxfcGxhbmVfc3RhdGUo cGxhbmVfc3RhdGUpOwo+PiAgCj4+IC0JCWlmIChpbnRlbF9wbGFuZS0+YmFzZS50eXBlID09IERS TV9QTEFORV9UWVBFX1BSSU1BUlkpCj4+ICsJCWlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVf VFlQRV9QUklNQVJZKQo+PiAgCQkJcHJpc3RhdGUgPSBwczsKPj4gLQkJZWxzZSBpZiAoaW50ZWxf cGxhbmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZKQo+PiArCQllbHNlIGlm IChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZKQo+PiAgCQkJc3Byc3RhdGUg PSBwczsKPj4gLQkJZWxzZSBpZiAoaW50ZWxfcGxhbmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVf VFlQRV9DVVJTT1IpCj4+ICsJCWVsc2UgaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBF X0NVUlNPUikKPj4gIAkJCWN1cnN0YXRlID0gcHM7Cj4+ICAJfQo+PiAgCj4+IEBAIC0zMDg2LDEx ICszMDgyLDkgQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjc3RhdGUpCj4+ICAJaWYgKHBpcGVfd20tPnNwcml0ZXNfc2NhbGVkKQo+PiAg CQl1c2FibGVfbGV2ZWwgPSAwOwo+PiAgCj4+IC0JaWxrX2NvbXB1dGVfd21fbGV2ZWwoZGV2X3By aXYsIGludGVsX2NydGMsIDAsIGNzdGF0ZSwKPj4gLQkJCSAgICAgcHJpc3RhdGUsIHNwcnN0YXRl LCBjdXJzdGF0ZSwgJnBpcGVfd20tPnJhd193bVswXSk7Cj4+IC0KPj4gIAltZW1zZXQoJnBpcGVf d20tPndtLCAwLCBzaXplb2YocGlwZV93bS0+d20pKTsKPj4gLQlwaXBlX3dtLT53bVswXSA9IHBp cGVfd20tPnJhd193bVswXTsKPj4gKwlpbGtfY29tcHV0ZV93bV9sZXZlbChkZXZfcHJpdiwgaW50 ZWxfY3J0YywgMCwgY3N0YXRlLAo+PiArCQkJICAgICBwcmlzdGF0ZSwgc3Byc3RhdGUsIGN1cnN0 YXRlLCAmcGlwZV93bS0+d21bMF0pOwo+PiAgCj4+ICAJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYp IHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCj4+ICAJCXBpcGVfd20tPmxpbmV0aW1lID0gaHN3 X2NvbXB1dGVfbGluZXRpbWVfd20oY3N0YXRlKTsKPj4gQEAgLTMxMDAsOCArMzA5NCw4IEBAIHN0 YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0 YXRlKQo+PiAgCj4+ICAJaWxrX2NvbXB1dGVfd21fcmVnX21heGltdW1zKGRldl9wcml2LCAxLCAm bWF4KTsKPj4gIAo+PiAtCWZvciAobGV2ZWwgPSAxOyBsZXZlbCA8PSBtYXhfbGV2ZWw7IGxldmVs KyspIHsKPj4gLQkJc3RydWN0IGludGVsX3dtX2xldmVsICp3bSA9ICZwaXBlX3dtLT5yYXdfd21b bGV2ZWxdOwo+PiArCWZvciAobGV2ZWwgPSAxOyBsZXZlbCA8PSB1c2FibGVfbGV2ZWw7IGxldmVs KyspIHsKPj4gKwkJc3RydWN0IGludGVsX3dtX2xldmVsICp3bSA9ICZwaXBlX3dtLT53bVtsZXZl bF07Cj4+ICAKPj4gIAkJaWxrX2NvbXB1dGVfd21fbGV2ZWwoZGV2X3ByaXYsIGludGVsX2NydGMs IGxldmVsLCBjc3RhdGUsCj4+ICAJCQkJICAgICBwcmlzdGF0ZSwgc3Byc3RhdGUsIGN1cnN0YXRl LCB3bSk7Cj4+IEBAIC0zMTExLDEzICszMTA1LDEwIEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVf cGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQo+PiAgCQkgKiByZWdpc3Rl ciBtYXhpbXVtcyBzaW5jZSBzdWNoIHdhdGVybWFya3MgYXJlCj4+ICAJCSAqIGFsd2F5cyBpbnZh bGlkLgo+PiAgCQkgKi8KPj4gLQkJaWYgKGxldmVsID4gdXNhYmxlX2xldmVsKQo+PiAtCQkJY29u dGludWU7Cj4+IC0KPj4gLQkJaWYgKGlsa192YWxpZGF0ZV93bV9sZXZlbChsZXZlbCwgJm1heCwg d20pKQo+PiAtCQkJcGlwZV93bS0+d21bbGV2ZWxdID0gKndtOwo+PiAtCQllbHNlCj4+IC0JCQl1 c2FibGVfbGV2ZWwgPSBsZXZlbDsKPj4gKwkJaWYgKCFpbGtfdmFsaWRhdGVfd21fbGV2ZWwobGV2 ZWwsICZtYXgsIHdtKSkgewo+PiArCQkJbWVtc2V0KHdtLCAwLCBzaXplb2YoKndtKSk7Cj4+ICsJ CQlicmVhazsKPj4gKwkJfQo+PiAgCX0KPj4gIAo+PiAgCXJldHVybiAwOwo+PiAtLSAKPj4gMi4x NC4xCj4+Cj4+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Cj4+IEludGVsLWdmeCBtYWlsaW5nIGxpc3QKPj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwo+PiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=