From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 2/2] drm/i915: Use the active wm config for merging on ILK-BDW Date: Fri, 15 Jan 2016 21:03:02 +0200 Message-ID: <20160115190302.GG23290@intel.com> References: <1452776015-22076-1-git-send-email-ville.syrjala@linux.intel.com> <1452776015-22076-2-git-send-email-ville.syrjala@linux.intel.com> <20160115023732.GA32319@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id A58006E16D for ; Fri, 15 Jan 2016 11:03:05 -0800 (PST) Content-Disposition: inline In-Reply-To: <20160115023732.GA32319@intel.com> 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 T24gVGh1LCBKYW4gMTQsIDIwMTYgYXQgMDY6Mzc6MzJQTSAtMDgwMCwgTWF0dCBSb3BlciB3cm90 ZToKPiBPbiBUaHUsIEphbiAxNCwgMjAxNiBhdCAwMjo1MzozNVBNICswMjAwLCB2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbSB3cm90ZToKPiA+IEZyb206IFZpbGxlIFN5cmrDpGzDpCA8dmls bGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gPiAKPiA+IGlsa19wcm9ncmFtX3dhdGVybWFy a3MoKSBpcyBzdXBwb3NlZCB0byBtZXJnZSB0aGUgYWN0aXZlIHdhdGVybWFya3MgZnJvbQo+ID4g YWxsIHBpcGVzLiBUaHVzIHdlIG5lZWQgdG8gdXNlIHRoZSBhY3RpdmUgY29uZmlnIHRvbyBpbnN0 ZWFkIG9mIHNvbWUKPiA+IHByZWNvbXB1dGVkIHN0dWZmLgo+IAo+IFNvIHRvIGNsYXJpZnksIHRo ZSBidWcgeW91J3JlIGZpeGluZyBoZXJlIHdvdWxkIGJlIGlmIHdlIGhhdmUgcmFjaW5nCj4gY29t bWl0cyB0aGF0IG9wZXJhdGUgb24gZGlzam9pbnQgc2V0cyBvZiBDUlRDJ3M7IGluIHRoYXQgY2Fz ZSB0aGUgc2Vjb25kCj4gb25lIHRoYXQgYWN0dWFsbHkgZ2V0cyBpbnRvIHdtX211dGV4IHdpbGwg ZmFpbCB0byBzZWUgdGhlIGNvbmZpZyBjaGFuZ2VzCj4gbWFkZSBieSB0aGUgZmlyc3QgY29tbWl0 LCByaWdodD8KClRoYXQsIG9yIEkgc3VwcG9zZSBjYXNlcyB3aGVyZSB0aGUgaW50ZXJtZWRpYXRl IGFuZCBvcHRpbWFsIHdhdGVybWFya3MKaGF2ZSBhIGRpZmZlcmVudCBpZGVhIGFib3V0IHRoZSBz cHJpdGUgZW5hYmxlZC9zY2FsZWQgZmxhZ3MuIEkgYXNzdW1lCndoYXQgaXQgd2FzIGRvaW5nIGlz IHBpY2tpbmcgdGhvc2UgZmxhZ3MgYWx3YXlzIGJhc2VkIG9uIHRoZSBvcHRpbWFsIHdtcwpldmVu IHdoZW4gcHJvZ3JhbW1pbmcgdGhlIGludGVybWVkaWRhdGUgd21zLgoKPiAKPiBTZWVtcyBsaWtl IHdlIGNvdWxkIGdvIGFoZWFkIGFuZCByZW1vdmUgZGV2X3ByaXYtPndtLmNvbmZpZyAoYW5kCj4g Y2FsY193YXRlcm1hcmtfZGF0YSgpIHRoYXQgYnVpbGRzIGl0KSBzaW5jZSBpdCdzIG5vdCBhY3R1 YWxseSBkb2luZyB1cwo+IGFueSBnb29kLiAgQWx0aG91Z2ggaXQncyBwcm9iYWJseSBmaW5lIHRv IGhvbGQgdGhhdCBvZmYgdG8gYSBzdWJzZXF1ZW50Cj4gcGF0Y2guCgpJSVJDIEkgd2FzIGEgcmVm ZXJlbmNlIHRvIHRoYXQgc3R1ZmYgaW4gdGhlIFNLTCBjb2RlIHRvbywgc28gSSBkaWRuJ3QgYm90 aGVyCnRyeWluZyB0byBraWxsIGl0IHdpdGhvdXQga25vd2luZyB3aGF0IGl0IHdhcyBkb2luZy4g QW5kIEkgd2FzIHRvbyBsYXp5IHRvCnRha2UgYSBkZWVwZXIgbG9vayBhdCB0aGUgY29kZSByaWdo dCBub3cuCgo+IAo+IEJvdGggb2YgeW91ciBwYXRjaGVzIGFyZQo+IAo+IFJldmlld2VkLWJ5OiBN YXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgo+IAo+IENJIHJlc3VsdHMgZG8g cmVwb3J0IFNLTCBmYWlsdXJlcywgYnV0IHRob3NlIGFyZSBjbGVhcmx5IGJvZ3VzIHNpbmNlIFNL TAo+IGRvZXNuJ3QgZXZlbiBydW4gYW55IG9mIHRoZSBmdW5jdGlvbnMgdGhhdCB5b3UncmUgY2hh bmdpbmcgaW4gdGhlc2UgdHdvCj4gcGF0Y2hlczsgYXMgeW91IG5vdGVkLCBpdCBsb29rcyBtb3Jl IGxpa2UgdGhlIG1hY2hpbmUgaGFkIHNvbWUga2luZCBvZgo+IGJpemFycmUgaGFyZHdhcmUgZmFp bHVyZSB0aGF0IHdhcyB1bnJlbGF0ZWQgdG8gdGhlIHBhdGNoc2V0LiAgVGhlIG90aGVyCj4gcmVz dWx0cyBsb29rIGNsZWFuLiAgR2l2ZW4gdGhhdCwgSSd2ZSBnb25lIGFoZWFkIGFuZCBwdXNoZWQg eW91ciBwYXRjaGVzCj4gdG8gZGlucS4gIFRoYW5rcyEKCkNoZWVycy4KCj4gCj4gCj4gTWF0dAo+ IAo+IAo+ID4gCj4gPiBGaXhlczogYWEzNjMxMzY4NjZjICgiZHJtL2k5MTU6IENhbGN1bGF0ZSB3 YXRlcm1hcmsgY29uZmlndXJhdGlvbiBkdXJpbmcgYXRvbWljIGNoZWNrICh2MikiKQo+ID4gQ2M6 IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Cj4gPiBTaWduZWQtb2ZmLWJ5 OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgo+ID4gLS0t Cj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDMyICsrKysrKysrKysrKysr KysrKysrKysrKysrLS0tLS0tCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyks IDYgZGVsZXRpb25zKC0pCj4gPiAKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ID4gaW5kZXgg ZTlmNGU2ZTdiNzM2Li5mNDRhOTYxMTgzZDcgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCj4gPiBAQCAtMzY4MCwyMyArMzY4MCw0MyBAQCBzdGF0aWMgdm9pZCBza2xfdXBkYXRlX3dt KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiA+ICAJZGV2X3ByaXYtPndtLnNrbF9odyA9ICpyZXN1 bHRzOwo+ID4gIH0KPiA+ICAKPiA+ICtzdGF0aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9jb25maWco c3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiA+ICsJCQkJICBzdHJ1Y3QgaW50ZWxfd21fY29uZmln ICpjb25maWcpCj4gPiArewo+ID4gKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKPiA+ICsKPiA+ ICsJLyogQ29tcHV0ZSB0aGUgY3VycmVudGx5IF9hY3RpdmVfIGNvbmZpZyAqLwo+ID4gKwlmb3Jf ZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0Yykgewo+ID4gKwkJY29uc3Qgc3RydWN0IGludGVsX3Bp cGVfd20gKndtID0gJmNydGMtPndtLmFjdGl2ZS5pbGs7Cj4gPiArCj4gPiArCQlpZiAoIXdtLT5w aXBlX2VuYWJsZWQpCj4gPiArCQkJY29udGludWU7Cj4gPiArCj4gPiArCQljb25maWctPnNwcml0 ZXNfZW5hYmxlZCB8PSB3bS0+c3ByaXRlc19lbmFibGVkOwo+ID4gKwkJY29uZmlnLT5zcHJpdGVz X3NjYWxlZCB8PSB3bS0+c3ByaXRlc19zY2FsZWQ7Cj4gPiArCQljb25maWctPm51bV9waXBlc19h Y3RpdmUrKzsKPiA+ICsJfQo+ID4gK30KPiA+ICsKPiA+ICBzdGF0aWMgdm9pZCBpbGtfcHJvZ3Jh bV93YXRlcm1hcmtzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiA+ICB7Cj4g PiAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2Owo+ID4gIAlzdHJ1Y3Qg aW50ZWxfcGlwZV93bSBscF93bV8xXzIgPSB7fSwgbHBfd21fNV82ID0ge30sICpiZXN0X2xwX3dt Owo+ID4gIAlzdHJ1Y3QgaWxrX3dtX21heGltdW1zIG1heDsKPiA+IC0Jc3RydWN0IGludGVsX3dt X2NvbmZpZyAqY29uZmlnID0gJmRldl9wcml2LT53bS5jb25maWc7Cj4gPiArCXN0cnVjdCBpbnRl bF93bV9jb25maWcgY29uZmlnID0ge307Cj4gPiAgCXN0cnVjdCBpbGtfd21fdmFsdWVzIHJlc3Vs dHMgPSB7fTsKPiA+ICAJZW51bSBpbnRlbF9kZGJfcGFydGl0aW9uaW5nIHBhcnRpdGlvbmluZzsK PiA+ICAKPiA+IC0JaWxrX2NvbXB1dGVfd21fbWF4aW11bXMoZGV2LCAxLCBjb25maWcsIElOVEVM X0REQl9QQVJUXzFfMiwgJm1heCk7Cj4gPiAtCWlsa193bV9tZXJnZShkZXYsIGNvbmZpZywgJm1h eCwgJmxwX3dtXzFfMik7Cj4gPiArCWlsa19jb21wdXRlX3dtX2NvbmZpZyhkZXYsICZjb25maWcp Owo+ID4gKwo+ID4gKwlpbGtfY29tcHV0ZV93bV9tYXhpbXVtcyhkZXYsIDEsICZjb25maWcsIElO VEVMX0REQl9QQVJUXzFfMiwgJm1heCk7Cj4gPiArCWlsa193bV9tZXJnZShkZXYsICZjb25maWcs ICZtYXgsICZscF93bV8xXzIpOwo+ID4gIAo+ID4gIAkvKiA1LzYgc3BsaXQgb25seSBpbiBzaW5n bGUgcGlwZSBjb25maWcgb24gSVZCKyAqLwo+ID4gIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4g Pj0gNyAmJgo+ID4gLQkgICAgY29uZmlnLT5udW1fcGlwZXNfYWN0aXZlID09IDEgJiYgY29uZmln LT5zcHJpdGVzX2VuYWJsZWQpIHsKPiA+IC0JCWlsa19jb21wdXRlX3dtX21heGltdW1zKGRldiwg MSwgY29uZmlnLCBJTlRFTF9EREJfUEFSVF81XzYsICZtYXgpOwo+ID4gLQkJaWxrX3dtX21lcmdl KGRldiwgY29uZmlnLCAmbWF4LCAmbHBfd21fNV82KTsKPiA+ICsJICAgIGNvbmZpZy5udW1fcGlw ZXNfYWN0aXZlID09IDEgJiYgY29uZmlnLnNwcml0ZXNfZW5hYmxlZCkgewo+ID4gKwkJaWxrX2Nv bXB1dGVfd21fbWF4aW11bXMoZGV2LCAxLCAmY29uZmlnLCBJTlRFTF9EREJfUEFSVF81XzYsICZt YXgpOwo+ID4gKwkJaWxrX3dtX21lcmdlKGRldiwgJmNvbmZpZywgJm1heCwgJmxwX3dtXzVfNik7 Cj4gPiAgCj4gPiAgCQliZXN0X2xwX3dtID0gaWxrX2ZpbmRfYmVzdF9yZXN1bHQoZGV2LCAmbHBf d21fMV8yLCAmbHBfd21fNV82KTsKPiA+ICAJfSBlbHNlIHsKPiA+IC0tIAo+ID4gMi40LjEwCj4g PiAKPiAKPiAtLSAKPiBNYXR0IFJvcGVyCj4gR3JhcGhpY3MgU29mdHdhcmUgRW5naW5lZXIKPiBJ b1RHIFBsYXRmb3JtIEVuYWJsaW5nICYgRGV2ZWxvcG1lbnQKPiBJbnRlbCBDb3Jwb3JhdGlvbgo+ ICg5MTYpIDM1Ni0yNzk1CgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=