From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v3 3/6] drm/i915: Clean up fbc vs. plane checks Date: Thu, 22 Feb 2018 18:15:23 +0200 Message-ID: <20180222161523.GZ5453@intel.com> References: <20180221160235.11134-4-ville.syrjala@linux.intel.com> <20180221173101.19385-1-ville.syrjala@linux.intel.com> <151925036770.11316.4219131821645278587@mail.alporthouse.com> <20180222140753.GW5453@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 101FC6EE89 for ; Thu, 22 Feb 2018 16:15:27 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20180222140753.GW5453@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBGZWIgMjIsIDIwMTggYXQgMDQ6MDc6NTNQTSArMDIwMCwgVmlsbGUgU3lyasOkbMOk IHdyb3RlOgo+IE9uIFdlZCwgRmViIDIxLCAyMDE4IGF0IDA5OjU5OjI3UE0gKzAwMDAsIENocmlz IFdpbHNvbiB3cm90ZToKPiA+IFF1b3RpbmcgVmlsbGUgU3lyamFsYSAoMjAxOC0wMi0yMSAxNzoz MTowMSkKPiA+ID4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4Lmlu dGVsLmNvbT4KPiA+ID4gCj4gPiA+IExldCdzIHJlY29yZCB0aGUgaW5mb3JtYXRpb24gd2hldGhl ciBhIHBsYW5lIGNhbiBkbyBmYmMgb3Igbm90IHVuZGVyCj4gPiA+IHN0cnVjdCBpbnRlX3BsYW5l Lgo+ID4gPiAKPiA+ID4gdjI6IFJlYmFzZSBkdWUgdG8gaTl4eF9wbGFuZV9pZAo+ID4gPiAgICAg SGFuZGxlIEJEVy9IU1cgY29ycmVjdGx5Cj4gPiA+IHYzOiBNb3ZlIGludGVfZmJjX2luaXQoKSBi YWNrIHNpbmNlIHdlIGRlcGVuZCBvbiBpdCBoYXBwZW5pbmcKPiA+ID4gICAgIGV2ZW4gd2l0aCBp OTE1LmRpc2FibGVfZGlzcGxheSwgYW5kIHBvcHVsYXRlCj4gPiA+ICAgICBmYmMtPnBvc3NpYmxl X2ZyYW1lYnVmZmVyX2JpdHMgZGlyZWN0bHkgZnJvbSB0aGUKPiA+ID4gICAgIHBsYW5lIGluaXQg Y29kZSBpbnN0ZWFkCj4gPiA+IAo+ID4gPiBDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+Cj4gPiA+IFNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUu c3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gPiA+IC0tLQo+ID4gPiAgZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNDEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrCj4gPiA+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSAr Cj4gPiA+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYyAgICAgfCAyNiArKy0tLS0t LS0tLS0tLS0tLS0tLS0tLQo+ID4gPiAgMyBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25zKCsp LCAyNCBkZWxldGlvbnMoLSkKPiA+ID4gCj4gPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKPiA+ID4gaW5kZXggZDJhNjY3MDRlNmY1Li5jNjBkMjIxNWIzNzcgMTAwNjQ0Cj4gPiA+ IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ID4gPiArKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiA+ID4gQEAgLTEzMjM4LDYgKzEz MjM4LDMyIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX2N1cnNv cl9wbGFuZV9mdW5jcyA9IHsKPiA+ID4gICAgICAgICAuZm9ybWF0X21vZF9zdXBwb3J0ZWQgPSBp bnRlbF9jdXJzb3JfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQsCj4gPiA+ICB9Owo+ID4gPiAg Cj4gPiA+ICtzdGF0aWMgYm9vbCBpOXh4X3BsYW5lX2hhc19mYmMoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAo+ID4gPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW51 bSBpOXh4X3BsYW5lX2lkIGk5eHhfcGxhbmUpCj4gPiA+ICt7Cj4gPiA+ICsgICAgICAgaWYgKCFI QVNfRkJDKGRldl9wcml2KSkKPiA+ID4gKyAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKPiA+ IAo+ID4gPiAtc3RhdGljIGlubGluZSBib29sIGZiY19vbl9waXBlX2Ffb25seShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gPiA+IC17Cj4gPiA+IC0gICAgICAgcmV0dXJuIElT X0hBU1dFTEwoZGV2X3ByaXYpIHx8IElOVEVMX0dFTihkZXZfcHJpdikgPj0gODsKPiA+ID4gLX0K PiA+ID4gLQo+ID4gPiAtc3RhdGljIGlubGluZSBib29sIGZiY19vbl9wbGFuZV9hX29ubHkoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ID4gPiAtewo+ID4gPiAtICAgICAgIHJl dHVybiBJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNDsKPiA+ID4gLX0KPiA+IAo+ID4gPiArCj4gPiA+ ICsgICAgICAgaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikgfHwgSVNfSEFTV0VMTChkZXZfcHJp dikpCj4gPiA+ICsgICAgICAgICAgICAgICByZXR1cm4gaTl4eF9wbGFuZSA9PSBQTEFORV9BOwo+ ID4gCj4gPiBXaGVyZSBQTEFORV9BIGlzIHRpZWQgdG8gUElQRV9BIGJ5IGNvbnN0cnVjdGlvbi4g SXMgdGhhdCB3b3J0aCBhIHF1aWNrCj4gPiBjb21tZW50Pwo+IAo+IFdvdWxkbid0IGh1cnQgdG8g c3BlbGwgaXQgb3V0IEkgc3VwcG9zZS4KCk5vdGUgYWRkZWQgYW5kIHNlcmllcyBwdXNoZWQgdG8g ZGlucS4gVGhhbmtzIGZvciB0aGUgcmV2aWV3LgoKSSdsbCB0aGluayBhIGJpdCBtb3JlIGFib3V0 IHRoZSBuZWVkX2ZlbmNlIHRoaW5nIGFuZCB0cnkgdG8gY29tZSB1cAphIGZvbGxvd3VwIHBhdGNo L3Nlcmllcy4KCj4gCj4gPiAKPiA+ID4gKyAgICAgICBlbHNlIGlmIChJU19JVllCUklER0UoZGV2 X3ByaXYpKQo+ID4gPiArICAgICAgICAgICAgICAgcmV0dXJuIGk5eHhfcGxhbmUgPT0gUExBTkVf QSB8fCBpOXh4X3BsYW5lID09IFBMQU5FX0IgfHwKPiA+ID4gKyAgICAgICAgICAgICAgICAgICAg ICAgaTl4eF9wbGFuZSA9PSBQTEFORV9DOwo+ID4gPiArICAgICAgIGVsc2UgaWYgKElOVEVMX0dF TihkZXZfcHJpdikgPj0gNCkKPiA+ID4gKyAgICAgICAgICAgICAgIHJldHVybiBpOXh4X3BsYW5l ID09IFBMQU5FX0EgfHwgaTl4eF9wbGFuZSA9PSBQTEFORV9COwo+ID4gPiArICAgICAgIGVsc2UK PiA+ID4gKyAgICAgICAgICAgICAgIHJldHVybiBpOXh4X3BsYW5lID09IFBMQU5FX0E7Cj4gPiAK PiA+IE9rLCBsb29rcyBhIGJpdCBtb3JlIGNvbXBsZXRlIHRoYW4gYmVmb3JlLgo+ID4gCj4gPiA+ ICt9Cj4gPiA+ICsKPiA+ID4gK3N0YXRpYyBib29sIHNrbF9wbGFuZV9oYXNfZmJjKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiA+ID4gKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZW51bSBwaXBlIHBpcGUsIGVudW0gcGxhbmVfaWQgcGxhbmVfaWQpCj4gPiA+ICt7Cj4g PiA+ICsgICAgICAgaWYgKCFIQVNfRkJDKGRldl9wcml2KSkKPiA+ID4gKyAgICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKPiA+ID4gKwo+ID4gPiArICAgICAgIHJldHVybiBwaXBlID09IFBJUEVf QSAmJiBwbGFuZV9pZCA9PSBQTEFORV9QUklNQVJZOwo+ID4gPiArfQo+ID4gPiArCj4gPiA+ICBz dGF0aWMgc3RydWN0IGludGVsX3BsYW5lICoKPiA+ID4gIGludGVsX3ByaW1hcnlfcGxhbmVfY3Jl YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCj4g PiA+ICB7Cj4gPiA+IEBAIC0xMzI4MCw2ICsxMzMwNiwyMSBAQCBpbnRlbF9wcmltYXJ5X3BsYW5l X2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcGlwZSBwaXBl KQo+ID4gPiAgICAgICAgICAgICAgICAgcHJpbWFyeS0+aTl4eF9wbGFuZSA9IChlbnVtIGk5eHhf cGxhbmVfaWQpIHBpcGU7Cj4gPiA+ICAgICAgICAgcHJpbWFyeS0+aWQgPSBQTEFORV9QUklNQVJZ Owo+ID4gPiAgICAgICAgIHByaW1hcnktPmZyb250YnVmZmVyX2JpdCA9IElOVEVMX0ZST05UQlVG RkVSKHBpcGUsIHByaW1hcnktPmlkKTsKPiA+ID4gKwo+ID4gPiArICAgICAgIGlmIChJTlRFTF9H RU4oZGV2X3ByaXYpID49IDkpCj4gPiA+ICsgICAgICAgICAgICAgICBwcmltYXJ5LT5oYXNfZmJj ID0gc2tsX3BsYW5lX2hhc19mYmMoZGV2X3ByaXYsCj4gPiA+ICsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJpbWFyeS0+cGlwZSwKPiA+ID4gKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcmltYXJ5 LT5pZCk7Cj4gPiA+ICsgICAgICAgZWxzZQo+ID4gPiArICAgICAgICAgICAgICAgcHJpbWFyeS0+ aGFzX2ZiYyA9IGk5eHhfcGxhbmVfaGFzX2ZiYyhkZXZfcHJpdiwKPiA+ID4gKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJpbWFyeS0+aTl4eF9w bGFuZSk7Cj4gPiA+ICsKPiA+ID4gKyAgICAgICBpZiAocHJpbWFyeS0+aGFzX2ZiYykgewo+ID4g PiArICAgICAgICAgICAgICAgc3RydWN0IGludGVsX2ZiYyAqZmJjID0gJmRldl9wcml2LT5mYmM7 Cj4gPiA+ICsKPiA+ID4gKyAgICAgICAgICAgICAgIGZiYy0+cG9zc2libGVfZnJhbWVidWZmZXJf Yml0cyB8PSBwcmltYXJ5LT5mcm9udGJ1ZmZlcl9iaXQ7Cj4gPiA+ICsgICAgICAgfQo+ID4gCj4g PiBTbyBhbiBlcXVpdmFsZW50IGluaXQgbG9vcCB0bwo+ID4gCj4gPiA+IC0gICAgICAgZm9yX2Vh Y2hfcGlwZShkZXZfcHJpdiwgcGlwZSkgewo+ID4gPiAtICAgICAgICAgICAgICAgZmJjLT5wb3Nz aWJsZV9mcmFtZWJ1ZmZlcl9iaXRzIHw9Cj4gPiA+IC0gICAgICAgICAgICAgICAgICAgICAgIElO VEVMX0ZST05UQlVGRkVSKHBpcGUsIFBMQU5FX1BSSU1BUlkpOwo+ID4gPiAtCj4gPiA+IC0gICAg ICAgICAgICAgICBpZiAoZmJjX29uX3BpcGVfYV9vbmx5KGRldl9wcml2KSkKPiA+ID4gLSAgICAg ICAgICAgICAgICAgICAgICAgYnJlYWs7Cj4gPiA+IC0gICAgICAgfQo+ID4gCj4gPiBSZXZpZXdl ZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Cj4gPiAtQ2hyaXMK PiAKPiAtLSAKPiBWaWxsZSBTeXJqw6Rsw6QKPiBJbnRlbCBPVEMKCi0tIApWaWxsZSBTeXJqw6Rs w6QKSW50ZWwgT1RDCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=