From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 3/3] drm/i915: Clean up skip_intermediate_wm handling Date: Fri, 27 Oct 2017 15:01:24 +0300 Message-ID: <20171027120124.GE10981@intel.com> References: <20171027075947.21008-1-maarten.lankhorst@linux.intel.com> <20171027075947.21008-3-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 0DCD16E8F9 for ; Fri, 27 Oct 2017 12:01:27 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20171027075947.21008-3-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 T24gRnJpLCBPY3QgMjcsIDIwMTcgYXQgMDk6NTk6NDdBTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gT3JpZ2luYWxseSB3ZSBpbXBsZW1lbnRlZCBza2lwX2ludGVybWVkaWF0ZV93 bSB0byBmaXggdXAgZ2FyYmFnZQo+IHdhdGVybWFya3MgZm9yIElMSyB3YXRlcm1hcmtzIHRoYXQg YXJlIGluc2FuZSwgYnV0IGl0IG1ha2VzIHNlbnNlCj4gdG8gZXh0ZW5kIHRoaXMgdG8gYWxsIHBs YXRmb3JtcyB3aXRoIDItc3R5bGUgd2F0ZXJtYXJrIHByb2dyYW1taW5nLgoKSSBkb24ndCBwYXJ0 aWN1bGFybHkgbGlrZSBza2lwX2ludGVybWVkaWF0ZV93bS4gZzR4L3Zsdi9jaHYgd2F0ZXJtYXJr cwpnZXQgc2FuaXRpemVkIGluIGEgZGlmZmVyZW50IHdheSwgc28gdGhpcyBpcyBub3QgbmVlZGVk IHVubGVzcyBzb21ldGhpbmcKaXMgcmVhbGx5IHNlcmlvdXNseSBmc2NrZWQgdXAuIFNvIEkgdGhp bmsgSSdkIHJhdGhlciBjaGFuZ2UgSUxLKyB0bwpzYW5pdGl6ZSB0aGUgc2FtZSB3YXkgYW5kIGtp bGwgc2tpcF9pbnRlcm1lZGlhdGVfd20uCgpJZiB0aGUgY3VycmVudCB3YXRlcm1hcmtzIGFyZSB0 b3RhbCBnYXJiYWdlICh3aGljaCBJIGRvdWJ0KSwgdGhlbiBJCnRoaW5rIHRoZSBzYWZlc3Qgc29s dXRpb24gd291bGQgYmUgdG8gZm9yY2UgYSBtb2Rlc2V0IGF0IHRoYXQgcG9pbnQKcmF0aGVyIHRo YW4gaG9waW5nIHRoYXQganVzdCBzbWFzaGluZyBpbiBuZXcgd2F0ZXJtYXJrcyBpcyBnb2luZyB0 byBzYXZlCnRoZSBkYXkuIFJ1bm5pbmcgd2l0aCBiYWQgd2F0ZXJtYXJrcyBjb3VsZCBldmVuIG1l YW4gdGhhdCB0aGUgcGlwZSBoYXMKYWxyZWFkeSBkaWVkIChhdCBsZWFzdCBvbiBzb21lIHBsYXRm b3JtcykuCgo+IAo+IFdlIGRvbid0IGtub3cgd2hhdCB0aGUgcHJldmlvdXMgY29udGVudHMgb2Yg dGhlIHdhdGVybWFya3MgYXJlLCBhbmQgdGhleQo+IGNvdWxkIGJlIHNvbWV0aGluZyBlbnRpcmVs eSBnYXJiYWdlIHdoZW4gdGhlIHBpcGUgaXMgb2ZmLCBzbyBjb21wdXRpbmcKPiB0aGVtIHNob3Vs ZCBvbmx5IGJlIGJhc2VkIG9uIHRoZSBuZXcgc3RhdGUuCj4gCj4gU2lnbmVkLW9mZi1ieTogTWFh cnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPiAtLS0K PiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTMgKysrLS0tLS0tLS0t LQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAgOSArKysrKystLS0K PiAgMiBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQo+IAo+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBpbmRleCBhMzY5YjM1ZDA0NGQuLjA5 MzEzYWY0ZDY0ZCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAt MzU3MSw4ICszNTcxLDcgQEAgX19pbnRlbF9kaXNwbGF5X3Jlc3VtZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAo+ICAJfQo+ICAKPiAgCS8qIGlnbm9yZSBhbnkgcmVzZXQgdmFsdWVzL0JJT1MgbGVm dG92ZXJzIGluIHRoZSBXTSByZWdpc3RlcnMgKi8KPiAtCWlmICghSEFTX0dNQ0hfRElTUExBWSh0 b19pOTE1KGRldikpKQo+IC0JCXRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSktPnNraXBfaW50 ZXJtZWRpYXRlX3dtID0gdHJ1ZTsKPiArCXRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSktPnNr aXBfaW50ZXJtZWRpYXRlX3dtID0gdHJ1ZTsKPiAgCj4gIAlyZXQgPSBkcm1fYXRvbWljX2hlbHBl cl9jb21taXRfZHVwbGljYXRlZF9zdGF0ZShzdGF0ZSwgY3R4KTsKPiAgCj4gQEAgLTEwMzc5LDcg KzEwMzc4LDYgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCj4gIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVs X2NydGMoY3J0Yyk7Cj4gIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPQo+ ICAJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSk7Cj4gLQlzdHJ1Y3QgZHJtX2F0b21p Y19zdGF0ZSAqc3RhdGUgPSBjcnRjX3N0YXRlLT5zdGF0ZTsKPiAgCWludCByZXQ7Cj4gIAlib29s IG1vZGVfY2hhbmdlZCA9IG5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSk7Cj4gIAo+IEBAIC0xMDQx Niw4ICsxMDQxNCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19hdG9taWNfY2hlY2soc3RydWN0 IGRybV9jcnRjICpjcnRjLAo+ICAJCX0KPiAgCX0KPiAgCj4gLQlpZiAoZGV2X3ByaXYtPmRpc3Bs YXkuY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20gJiYKPiAtCSAgICAhdG9faW50ZWxfYXRvbWljX3N0 YXRlKHN0YXRlKS0+c2tpcF9pbnRlcm1lZGlhdGVfd20pIHsKPiArCWlmIChkZXZfcHJpdi0+ZGlz cGxheS5jb21wdXRlX2ludGVybWVkaWF0ZV93bSkgewo+ICAJCWlmIChXQVJOX09OKCFkZXZfcHJp di0+ZGlzcGxheS5jb21wdXRlX3BpcGVfd20pKQo+ICAJCQlyZXR1cm4gMDsKPiAgCj4gQEAgLTEw NDMzLDkgKzEwNDMwLDYgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX2F0b21pY19jaGVjayhzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCj4gIAkJCURSTV9ERUJVR19LTVMoIk5vIHZhbGlkIGludGVybWVk aWF0ZSBwaXBlIHdhdGVybWFya3MgYXJlIHBvc3NpYmxlXG4iKTsKPiAgCQkJcmV0dXJuIHJldDsK PiAgCQl9Cj4gLQl9IGVsc2UgaWYgKGRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVfaW50ZXJtZWRp YXRlX3dtKSB7Cj4gLQkJaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpICYmIElOVEVMX0dFTihk ZXZfcHJpdikgPCA5KQo+IC0JCQlwaXBlX2NvbmZpZy0+d20uaWxrLmludGVybWVkaWF0ZSA9IHBp cGVfY29uZmlnLT53bS5pbGsub3B0aW1hbDsKPiAgCX0KPiAgCj4gIAlpZiAoSU5URUxfR0VOKGRl dl9wcml2KSA+PSA5KSB7Cj4gQEAgLTE0NDE2LDggKzE0NDEwLDcgQEAgc3RhdGljIHZvaWQgc2Fu aXRpemVfd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJICogaW50ZXJtZWRp YXRlIHdhdGVybWFya3MgKHNpbmNlIHdlIGRvbid0IHRydXN0IHRoZSBjdXJyZW50Cj4gIAkgKiB3 YXRlcm1hcmtzKS4KPiAgCSAqLwo+IC0JaWYgKCFIQVNfR01DSF9ESVNQTEFZKGRldl9wcml2KSkK PiAtCQlpbnRlbF9zdGF0ZS0+c2tpcF9pbnRlcm1lZGlhdGVfd20gPSB0cnVlOwo+ICsJaW50ZWxf c3RhdGUtPnNraXBfaW50ZXJtZWRpYXRlX3dtID0gdHJ1ZTsKPiAgCj4gIAlyZXQgPSBpbnRlbF9h dG9taWNfY2hlY2soZGV2LCBzdGF0ZSk7Cj4gIAlpZiAocmV0KSB7Cj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCj4gaW5kZXggYTllNzY4M2Q1YTBkLi4zNDZjMzBhMjIyY2QgMTAwNjQ0Cj4gLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKPiBAQCAtMTQyMCw3ICsxNDIwLDggQEAgc3RhdGljIGludCBnNHhfY29t cHV0ZV9pbnRlcm1lZGlhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCWNvbnN0IHN0 cnVjdCBnNHhfd21fc3RhdGUgKmFjdGl2ZSA9ICZvbGRfY3J0Y19zdGF0ZS0+d20uZzR4Lm9wdGlt YWw7Cj4gIAllbnVtIHBsYW5lX2lkIHBsYW5lX2lkOwo+ICAKPiAtCWlmICghbmV3X2NydGNfc3Rh dGUtPmJhc2UuYWN0aXZlIHx8IGRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KCZuZXdfY3J0 Y19zdGF0ZS0+YmFzZSkpIHsKPiArCWlmICghbmV3X2NydGNfc3RhdGUtPmJhc2UuYWN0aXZlIHx8 IGludGVsX3N0YXRlLT5za2lwX2ludGVybWVkaWF0ZV93bSB8fAo+ICsJICAgIGRybV9hdG9taWNf Y3J0Y19uZWVkc19tb2Rlc2V0KCZuZXdfY3J0Y19zdGF0ZS0+YmFzZSkpIHsKPiAgCQkqaW50ZXJt ZWRpYXRlID0gKm9wdGltYWw7Cj4gIAo+ICAJCWludGVybWVkaWF0ZS0+Y3hzciA9IGZhbHNlOwo+ IEBAIC0yMDUzLDcgKzIwNTQsOCBAQCBzdGF0aWMgaW50IHZsdl9jb21wdXRlX2ludGVybWVkaWF0 ZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAJY29uc3Qgc3RydWN0IHZsdl93bV9zdGF0 ZSAqYWN0aXZlID0gJm9sZF9jcnRjX3N0YXRlLT53bS52bHYub3B0aW1hbDsKPiAgCWludCBsZXZl bDsKPiAgCj4gLQlpZiAoIW5ld19jcnRjX3N0YXRlLT5iYXNlLmFjdGl2ZSB8fCBkcm1fYXRvbWlj X2NydGNfbmVlZHNfbW9kZXNldCgmbmV3X2NydGNfc3RhdGUtPmJhc2UpKSB7Cj4gKwlpZiAoIW5l d19jcnRjX3N0YXRlLT5iYXNlLmFjdGl2ZSB8fCBpbnRlbF9zdGF0ZS0+c2tpcF9pbnRlcm1lZGlh dGVfd20gfHwKPiArCSAgICBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldCgmbmV3X2NydGNf c3RhdGUtPmJhc2UpKSB7Cj4gIAkJKmludGVybWVkaWF0ZSA9ICpvcHRpbWFsOwo+ICAKPiAgCQlp bnRlcm1lZGlhdGUtPmN4c3IgPSBmYWxzZTsKPiBAQCAtMzE2Miw3ICszMTY0LDggQEAgc3RhdGlj IGludCBpbGtfY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwK PiAgCSAqIGFuZCBhZnRlciB0aGUgdmJsYW5rLgo+ICAJICovCj4gIAkqYSA9IG5ld3N0YXRlLT53 bS5pbGsub3B0aW1hbDsKPiAtCWlmICghbmV3c3RhdGUtPmJhc2UuYWN0aXZlIHx8IGRybV9hdG9t aWNfY3J0Y19uZWVkc19tb2Rlc2V0KCZuZXdzdGF0ZS0+YmFzZSkpCj4gKwlpZiAoIW5ld3N0YXRl LT5iYXNlLmFjdGl2ZSB8fCBpbnRlbF9zdGF0ZS0+c2tpcF9pbnRlcm1lZGlhdGVfd20gfHwKPiAr CSAgICBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldCgmbmV3c3RhdGUtPmJhc2UpKQo+ICAJ CXJldHVybiAwOwo+ICAKPiAgCWEtPnBpcGVfZW5hYmxlZCB8PSBiLT5waXBlX2VuYWJsZWQ7Cj4g LS0gCj4gMi4xNC4xCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KPiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4CgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK