From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: Fix legacy cursor vs. watermarks for ILK-BDW Date: Mon, 20 Feb 2017 15:38:58 +0200 Message-ID: <20170220133858.GA31595@intel.com> References: <0b3c8b9e-58c2-6efd-1dcd-2a78462ddff7@kleine-koenig.org> <20170217150159.11683-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0152E899F0 for ; Mon, 20 Feb 2017 13:39:03 +0000 (UTC) Content-Disposition: inline In-Reply-To: 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: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , Daniel Vetter , intel-gfx@lists.freedesktop.org, Martin Peres List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBGZWIgMjAsIDIwMTcgYXQgMTA6MDQ6MDZBTSArMDEwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gT3AgMTctMDItMTcgb20gMTY6MDEgc2NocmVlZiB2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbToKPiA+IEZyb206IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20+Cj4gPgo+ID4gSW4gb3JkZXIgdG8gbWFrZSBjdXJzb3IgdXBkYXRlcyBh Y3R1YWxseSBzYWZlIHdydC4gd2F0ZXJtYXJrIHByb2dyYW1taW5nCj4gPiB3ZSBoYXZlIHRvIGNs ZWFyIHRoZSBsZWdhY3lfY3Vyc29yX3VwZGF0ZSBmbGFnIGluIHRoZSBhdG9taWMgc3RhdGUuIFRo YXQKPiA+IHdpbGwgY2F1c2UgdGhlIHJlZ3VsYXIgYXRvbWljIHVwZGF0ZSBwYXRoIHRvIGRvIHRo ZSBuZWNlc3NhcnkgdmJsYW5rCj4gPiB3YWl0IGFmdGVyIHRoZSBwbGFuZSB1cGRhdGUgaWYgbmVl ZGVkLCBvdGhlcndpc2UgdGhlIHZibGFuayB3YWl0IHdvdWxkCj4gPiBiZSBza2lwcGVkIGFuZCB3 ZSdkIGZlZWQgdGhlIG9wdGltYWwgd2F0ZXJtYXJrcyB0byB0aGUgaGFyZHdhcmUgYmVmb3JlCj4g PiB0aGUgcGxhbmUgdXBkYXRlIGhhcyBhY3R1YWxseSBoYXBwZW5lZC4KPiA+Cj4gPiBUbyBtYWtl IHRoZSBzbG93IHZzLiBmYXN0IHBhdGggZGV0ZXJtaW5hdGlvbiBpbgo+ID4gaW50ZWxfbGVnYWN5 X2N1cnNvcl91cGRhdGUoKSBhIGxpdHRsZSBzaW1wbGVyIHdlIGNhbiBpZ25vcmUgdGhlIGFjdHVh bAo+ID4gdmlzaWJpbGl0eSBvZiB0aGUgcGxhbmUgKHdoaWNoIGNhbiBvbmx5IGdldCBjb21wdXRl ZCBvbmNlIHdlJ3ZlIGFscmVhZHkKPiA+IGNob3NlbiBvdXQgcGF0aCkgYW5kIGluc3RlYWQgd2Ug c2ltcGx5IGNoZWNrIHdoZXRoZXIgdGhlIGZiIGlzIGJlaW5nCj4gPiBzZXQgb3IgY2xlYXJlZCBi eSB0aGUgdXNlci4gVGhpcyBtZWFucyBhIGZ1bGx5IGNsaXBwZWQgYnV0IGxvZ2ljYWxseQo+ID4g dmlzaWJsZSBjdXJzb3Igd2lsbCBiZSBjb25zaWRlcmVkIHZpc2libGUgYXMgZmFyIGFzIHdhdGVy bWFyawo+ID4gcHJvZ3JhbW1pbmcgaXMgY29uY2VybmVkLiBXZSBjYW4gZG8gdGhhdCBmb3IgdGhl IGN1cnNvciBzaW5jZSBpdCdzIGEKPiA+IGZpeGVkIHNpemUgcGxhbmUgYW5kIHRoZSBjbGlwcGVk IHNpemUgZG9lc24ndCBwbGF5IGEgcm9sZSBpbiB0aGUKPiA+IHdhdGVybWFyayBjb21wdXRhdGlv bi4KPiA+Cj4gPiBUaGlzIHNob3VsZCBmaXggdW5kZXJydW5zIHRoYXQgY2FuIG9jY3VyIHdoZW4g dGhlIGN1cnNvciBnZXRzCj4gPiBlbmFibGUvZGlzYWJsZWQgb3IgdGhlIHNpemUgZ2V0cyBjaGFu Z2VkLiBIb3BlZnVsbHkgaXQncyBnb29kIGVub3VnaAo+ID4gdGhhdCBvbmx5IHB1cmUgY3Vyc29y IG1vdmVtZW50IGFuZCBmbGlwcyBnbyB0aHJvdWdoIHVudGhyb3R0bGVkLgo+ID4KPiA+IENjOiBN YWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+ID4g Q2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Cj4gPiBDYzogVXdlIEts ZWluZS1Lw7ZuaWcgPHV3ZUBrbGVpbmUta29lbmlnLm9yZz4KPiA+IFJlcG9ydGVkLWJ5OiBVd2Ug S2xlaW5lLUvDtm5pZyA8dXdlQGtsZWluZS1rb2VuaWcub3JnPgo+ID4gRml4ZXM6IGY3OWYyNjky MWVlMSAoImRybS9pOTE1OiBBZGQgYSBjdXJzb3IgaGFjayB0byBhbGxvdyBjb252ZXJ0aW5nIGxl Z2FjeSBwYWdlIGZsaXAgdG8gYXRvbWljLCB2My4iKQo+ID4gU2lnbmVkLW9mZi1ieTogVmlsbGUg U3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiA+IC0tLQo+ID4gIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDI5ICsrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgIHwg MjAgKysrKysrKysrKysrLS0tLS0tLS0KPiA+ICAyIGZpbGVzIGNoYW5nZWQsIDMwIGluc2VydGlv bnMoKyksIDE5IGRlbGV0aW9ucygtKQo+ID4KPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKPiA+IGluZGV4IGIwNWQ5Yzg1Mzg0Yi4uMzU2YWMwNDA5M2U4IDEwMDY0NAo+ID4gLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gPiArKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiA+IEBAIC0xMzAzMSw2ICsxMzAzMSwxNyBA QCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK PiA+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwo+ ID4gIAlpbnQgcmV0ID0gMDsKPiA+ICAKPiA+ICsJLyoKPiA+ICsJICogVGhlIGludGVsX2xlZ2Fj eV9jdXJzb3JfdXBkYXRlKCkgZmFzdCBwYXRoIHRha2VzIGNhcmUKPiA+ICsJICogb2YgYXZvaWRp bmcgdGhlIHZibGFuayB3YWl0cyBmb3Igc2ltcGxlIGN1cnNvcgo+ID4gKwkgKiBtb3ZlbWVudCBh bmQgZmxpcHMuIEZvciBjdXJzb3Igb24vb2ZmIGFuZCBzaXplIGNoYW5nZXMsCj4gPiArCSAqIHdl IHdhbnQgdG8gcGVyZm9ybSB0aGUgdmJsYW5rIHdhaXRzIHNvIHRoYXQgd2F0ZXJtYXJrCj4gPiAr CSAqIHVwZGF0ZXMgaGFwcGVuIGR1cmluZyB0aGUgY29ycmVjdCBmcmFtZXMuIEdlbjkrIGhhdmUK PiA+ICsJICogZG91YmxlIGJ1ZmZlcmVkIHdhdGVybWFya3MgYW5kIHNvIHNob3VsZG4ndCBuZWVk IHRoaXMuCj4gPiArCSAqLwo+ID4gKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDkpCj4gPiAr CQlzdGF0ZS0+bGVnYWN5X2N1cnNvcl91cGRhdGUgPSBmYWxzZTsKPiBDb3VsZCB3ZSBwZXJoYXBz IGFkZCBhIGNoZWNrIGluIGlsa19jb21wdXRlX3BpcGVfd20gd2hpY2ggdW5zZXRzIHRoZSBsZWdh Y3lfY3Vyc29yX3VwZGF0ZSBmbGFnIHNvIHdlIGtlZXAgdGhpbmdzIHVuc3luY2VkIGFzIG11Y2gg YXMgcG9zc2libGU/CgpJJ2QgaGF2ZSB0byBzcHJpbmtsZSB0aGF0IHN0dWZmIGV2ZXJ5d2hlcmUg YnV0IHRoZSBTS0wgY29kZQpldmVudHVhbGx5LiBTZWVtcyBhIGxpdHRsZSBwb2ludGxlc3Mgd2hl biBJIGNhbiBqdXN0IHBsb3AgaXQKdGhlcmUuCgo+ID4gIAlyZXQgPSBkcm1fYXRvbWljX2hlbHBl cl9zZXR1cF9jb21taXQoc3RhdGUsIG5vbmJsb2NrKTsKPiA+ICAJaWYgKHJldCkKPiA+ICAJCXJl dHVybiByZXQ7Cj4gPiBAQCAtMTM0NTUsOCArMTM0NjYsNyBAQCBpbnRlbF9sZWdhY3lfY3Vyc29y X3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKPiA+ICAJICAgIG9sZF9wbGFuZV9zdGF0 ZS0+c3JjX2ggIT0gc3JjX2ggfHwKPiA+ICAJICAgIG9sZF9wbGFuZV9zdGF0ZS0+Y3J0Y193ICE9 IGNydGNfdyB8fAo+ID4gIAkgICAgb2xkX3BsYW5lX3N0YXRlLT5jcnRjX2ggIT0gY3J0Y19oIHx8 Cj4gPiAtCSAgICAhb2xkX3BsYW5lX3N0YXRlLT52aXNpYmxlIHx8Cj4gPiAtCSAgICBvbGRfcGxh bmVfc3RhdGUtPmZiLT5tb2RpZmllciAhPSBmYi0+bW9kaWZpZXIpCj4gPiArCSAgICAhb2xkX3Bs YW5lX3N0YXRlLT5mYiAhPSAhZmIpCj4gPiAgCQlnb3RvIHNsb3c7Cj4gPiAgCj4gPiAgCW5ld19w bGFuZV9zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZShwbGFuZSk7Cj4gPiBAQCAt MTM0NzksMTAgKzEzNDg5LDYgQEAgaW50ZWxfbGVnYWN5X2N1cnNvcl91cGRhdGUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCj4gPiAgCWlmIChyZXQpCj4gPiAgCQlnb3RvIG91dF9mcmVlOwo+ID4g IAo+ID4gLQkvKiBWaXNpYmlsaXR5IGNoYW5nZWQsIG11c3QgdGFrZSBzbG93cGF0aC4gKi8KPiA+ IC0JaWYgKCFuZXdfcGxhbmVfc3RhdGUtPnZpc2libGUpCj4gPiAtCQlnb3RvIHNsb3dfZnJlZTsK PiA+IC0KPiA+ICAJcmV0ID0gbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCZkZXZfcHJpdi0+ZHJt LnN0cnVjdF9tdXRleCk7Cj4gPiAgCWlmIChyZXQpCj4gPiAgCQlnb3RvIG91dF9mcmVlOwo+IFRo b3NlIDIgaHVua3MgYXJlIG5lZWRlZC4gSWYgeW91IG1vdmUgdGhlIGN1cnNvciBvdXQgb2YgdGhl IHZpc2libGUgYXJlYSBvciBiYWNrIHlvdSBuZWVkIHRvIHVwZGF0ZS4KCk5vLiBJIGNoYW5nZWQg dGhlIHdtIGNvZGUgdG8gY29uc2lkZXIgYSBub24tdmlzaWJsZSBidXQgbG9naWNhbGwgYWN0aXZl CmN1cnNvciBhcyBuZWVkaW5nIHByb3BlciB3YXRlcm1hcmtzLiBUaGF0IGF2b2lkcyBuZWVkaW5n IHRoaXMgZmFsbGJhY2sKcGF0aCBoZXJlLgoKPiBFYXNpZXN0IHdheSB0byB0cmlnZ2VyIGEgYnVn IGlzIGxvYWQgYSAyNTYgd2lkdGggY3Vyc29yIG91dCBvZiB0aGUgdmlzaWJsZSBhcmVhLCBtb3Zl IGl0IGJhY2sgaW4gYW5kIHlvdSBnZXQKPiBhIGZpZm8gdW5kZXJydW4uCj4gCj4gV2h5IGlzIHN3 aXRjaGluZyBmYidzIHN5bmNlZD8KCkl0IGlzIG5vdC4KCj4gSWRlbnRpY2FsIHNpemVkIGZiIHNo b3VsZCBiZSB1bnN5bmNlZCBpZiBwb3NzaWJsZS4KPgo+ID4gQEAgLTEzNTIyLDkgKzEzNTI4LDEy IEBAIGludGVsX2xlZ2FjeV9jdXJzb3JfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAo+ ID4gIAluZXdfcGxhbmVfc3RhdGUtPmZiID0gb2xkX2ZiOwo+ID4gIAl0b19pbnRlbF9wbGFuZV9z dGF0ZShuZXdfcGxhbmVfc3RhdGUpLT52bWEgPSBvbGRfdm1hOwo+ID4gIAo+ID4gLQlpbnRlbF9w bGFuZS0+dXBkYXRlX3BsYW5lKHBsYW5lLAo+ID4gLQkJCQkgIHRvX2ludGVsX2NydGNfc3RhdGUo Y3J0Yy0+c3RhdGUpLAo+ID4gLQkJCQkgIHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0 ZSkpOwo+ID4gKwlpZiAocGxhbmUtPnN0YXRlLT52aXNpYmxlKQo+ID4gKwkJaW50ZWxfcGxhbmUt PnVwZGF0ZV9wbGFuZShwbGFuZSwKPiA+ICsJCQkJCSAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj LT5zdGF0ZSksCj4gPiArCQkJCQkgIHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSkp Owo+ID4gKwllbHNlCj4gPiArCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShwbGFuZSwgY3J0 Yyk7Cj4gPiAgCj4gPiAgCWludGVsX2NsZWFudXBfcGxhbmVfZmIocGxhbmUsIG5ld19wbGFuZV9z dGF0ZSk7Cj4gPiAgCj4gPiBAQCAtMTM1MzQsOCArMTM1NDMsNiBAQCBpbnRlbF9sZWdhY3lfY3Vy c29yX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKPiA+ICAJaW50ZWxfcGxhbmVfZGVz dHJveV9zdGF0ZShwbGFuZSwgbmV3X3BsYW5lX3N0YXRlKTsKPiA+ICAJcmV0dXJuIHJldDsKPiA+ ICAKPiA+IC1zbG93X2ZyZWU6Cj4gPiAtCWludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUocGxhbmUs IG5ld19wbGFuZV9zdGF0ZSk7Cj4gPiAgc2xvdzoKPiA+ICAJcmV0dXJuIGRybV9hdG9taWNfaGVs cGVyX3VwZGF0ZV9wbGFuZShwbGFuZSwgY3J0YywgZmIsCj4gPiAgCQkJCQkgICAgICBjcnRjX3gs IGNydGNfeSwgY3J0Y193LCBjcnRjX2gsCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiA+IGlu ZGV4IGZlMjQzYzY1ZGUxYS4uNGRlOGM0MGFjYzdlIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwo+ID4gQEAgLTE4MzEsMjAgKzE4MzEsMjQgQEAgc3RhdGljIHVpbnQzMl90IGlsa19j b21wdXRlX2N1cl93bShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAo+ID4g IAkJCQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBzdGF0ZSwKPiA+ICAJCQkJ ICAgdWludDMyX3QgbWVtX3ZhbHVlKQo+ID4gIHsKPiA+ICsJaW50IGNwcDsKPiA+ICsKPiA+ICAJ LyoKPiA+IC0JICogV2UgdHJlYXQgdGhlIGN1cnNvciBwbGFuZSBhcyBhbHdheXMtb24gZm9yIHRo ZSBwdXJwb3NlcyBvZiB3YXRlcm1hcmsKPiA+IC0JICogY2FsY3VsYXRpb24uICBVbnRpbCB3ZSBo YXZlIHR3by1zdGFnZSB3YXRlcm1hcmsgcHJvZ3JhbW1pbmcgbWVyZ2VkLAo+ID4gLQkgKiB0aGlz IGlzIG5lY2Vzc2FyeSB0byBhdm9pZCBmbGlja2VyaW5nLgo+ID4gKwkgKiBUcmVhdCBjdXJzb3Ig d2l0aCBmYiBhcyBhbHdheXMgdmlzaWJsZSBzaW5jZSBjdXJzb3IgdXBkYXRlcwo+ID4gKwkgKiBj YW4gaGFwcGVuIGZhc3RlciB0aGFuIHRoZSB2cmVmcmVzaCByYXRlLCBhbmQgdGhlIGN1cnJlbnQK PiA+ICsJICogd2F0ZXJtYXJrIGNvZGUgZG9lc24ndCBoYW5kbGUgdGhhdCBjb3JyZWN0bHkuIEN1 cnNvciB1cGRhdGVzCj4gPiArCSAqIHdoaWNoIHNldC9jbGVhciB0aGUgZmIgb3IgY2hhbmdlIHRo ZSBjdXJzb3Igc2l6ZSBhcmUgZ29pbmcKPiA+ICsJICogdG8gZ2V0IHRocm90dGxlZCBieSBpbnRl bF9sZWdhY3lfY3Vyc29yX3VwZGF0ZSgpIHRvIHdvcmsKPiA+ICsJICogYXJvdW5kIHRoaXMgcHJv YmxlbSB3aXRoIHRoZSB3YXRlcm1hcmsgY29kZS4KPiA+ICAJICovCj4gPiAtCWludCBjcHAgPSA0 Owo+ID4gLQlpbnQgd2lkdGggPSBwc3RhdGUtPmJhc2UudmlzaWJsZSA/IHBzdGF0ZS0+YmFzZS5j cnRjX3cgOiA2NDsKPiA+IC0KPiA+IC0JaWYgKCFjc3RhdGUtPmJhc2UuYWN0aXZlKQo+ID4gKwlp ZiAoIWNzdGF0ZS0+YmFzZS5hY3RpdmUgfHwgIXBzdGF0ZS0+YmFzZS5mYikKPiA+ICAJCXJldHVy biAwOwo+ID4gIAo+ID4gKwljcHAgPSBwc3RhdGUtPmJhc2UuZmItPmZvcm1hdC0+Y3BwWzBdOwo+ ID4gKwo+ID4gIAlyZXR1cm4gaWxrX3dtX21ldGhvZDIoY3N0YXRlLT5waXhlbF9yYXRlLAo+ID4g IAkJCSAgICAgIGNzdGF0ZS0+YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfaHRvdGFsLAo+ID4gLQkJ CSAgICAgIHdpZHRoLCBjcHAsIG1lbV92YWx1ZSk7Cj4gPiArCQkJICAgICAgcHN0YXRlLT5iYXNl LmNydGNfdywgY3BwLCBtZW1fdmFsdWUpOwo+ID4gIH0KPiA+ICAKPiA+ICAvKiBPbmx5IGZvciBX TV9MUC4gKi8KPiAKCi0tIApWaWxsZSBTeXJqw6Rsw6QKSW50ZWwgT1RDCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=