From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 4/8] drm/i915: Clean up the sprite modifier checks Date: Wed, 10 Jan 2018 14:12:53 +0100 Message-ID: <20180110131252.GS13066@phenom.ffwll.local> References: <20171222192231.17981-1-ville.syrjala@linux.intel.com> <20171222192231.17981-5-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2A2B66E28A for ; Wed, 10 Jan 2018 13:12:57 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id g21so11491961wrb.13 for ; Wed, 10 Jan 2018 05:12:57 -0800 (PST) Content-Disposition: inline In-Reply-To: <20171222192231.17981-5-ville.syrjala@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: Ville Syrjala Cc: intel-gfx@lists.freedesktop.org, Ben Widawsky , Daniel Stone List-Id: intel-gfx@lists.freedesktop.org T24gRnJpLCBEZWMgMjIsIDIwMTcgYXQgMDk6MjI6MjdQTSArMDIwMCwgVmlsbGUgU3lyamFsYSB3 cm90ZToKPiBGcm9tOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgo+IAo+IFNwbGl0IHRoZSBnNHggYW5kIHNuYiBjYXNlcyBpbnRvIHNlcGFyYXRlIGZ1bmN0 aW9ucyB0byBtYXRjaCBob3cgd2UgZGVhbAo+IHdpdGggYWxsIG90aGVyIHBsYXRmb3Jtcy4gQWxz byBzb3J0IHRoZSBzd2l0Y2ggY2FzZXMgdG8gbWF0Y2ggdGhlIGZvcm1hdAo+IGxpc3RzIHdlJ3Zl IGRlY2xhcmVkIGVhcmxpZXIsIHRvIGVhc2UgY29tcGFyaXNvbnMuCj4gCj4gQ2M6IEJlbiBXaWRh d3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KPiBDYzogSmFzb24gRWtzdHJhbmQgPGphc29uQGpsZWtz dHJhbmQubmV0Pgo+IENjOiBEYW5pZWwgU3RvbmUgPGRhbmllbHNAY29sbGFib3JhLmNvbT4KPiBT aWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgoKUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+ Cgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyB8IDQ4ICsrKysr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDI5IGlu c2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jCj4gaW5kZXggNTFiZDc5YWQ2NDdhLi4zNDliZTgxMzRjNzYgMTAwNjQ0Cj4gLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKPiArKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zcHJpdGUuYwo+IEBAIC0xMTY5LDEyICsxMTY5LDkgQEAgc3RhdGljIGNv bnN0IHVpbnQ2NF90IHNrbF9wbGFuZV9mb3JtYXRfbW9kaWZpZXJzW10gPSB7Cj4gIAlEUk1fRk9S TUFUX01PRF9JTlZBTElECj4gIH07Cj4gIAo+IC1zdGF0aWMgYm9vbCBnNHhfc3ByaXRlX3BsYW5l X2Zvcm1hdF9tb2Rfc3VwcG9ydGVkKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAo+IC0JCQkJCQkg IHVpbnQzMl90IGZvcm1hdCwKPiAtCQkJCQkJICB1aW50NjRfdCBtb2RpZmllcikKPiArc3RhdGlj IGJvb2wgZzR4X21vZF9zdXBwb3J0ZWQodWludDMyX3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmll cikKPiAgewo+ICAJc3dpdGNoIChmb3JtYXQpIHsKPiAtCWNhc2UgRFJNX0ZPUk1BVF9YQkdSODg4 ODoKPiAgCWNhc2UgRFJNX0ZPUk1BVF9YUkdCODg4ODoKPiAgCWNhc2UgRFJNX0ZPUk1BVF9ZVVlW Ogo+ICAJY2FzZSBEUk1fRk9STUFUX1lWWVU6Cj4gQEAgLTExODksMjIgKzExODYsMzggQEAgc3Rh dGljIGJvb2wgZzR4X3Nwcml0ZV9wbGFuZV9mb3JtYXRfbW9kX3N1cHBvcnRlZChzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwKPiAgCX0KPiAgfQo+ICAKPiAtc3RhdGljIGJvb2wgdmx2X3Nwcml0ZV9w bGFuZV9mb3JtYXRfbW9kX3N1cHBvcnRlZChzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKPiAtCQkJ CQkJICB1aW50MzJfdCBmb3JtYXQsCj4gLQkJCQkJCSAgdWludDY0X3QgbW9kaWZpZXIpCj4gK3N0 YXRpYyBib29sIHNuYl9tb2Rfc3VwcG9ydGVkKHVpbnQzMl90IGZvcm1hdCwgdWludDY0X3QgbW9k aWZpZXIpCj4gIHsKPiAgCXN3aXRjaCAoZm9ybWF0KSB7Cj4gKwljYXNlIERSTV9GT1JNQVRfWFJH Qjg4ODg6Cj4gKwljYXNlIERSTV9GT1JNQVRfWEJHUjg4ODg6Cj4gIAljYXNlIERSTV9GT1JNQVRf WVVZVjoKPiAgCWNhc2UgRFJNX0ZPUk1BVF9ZVllVOgo+ICAJY2FzZSBEUk1fRk9STUFUX1VZVlk6 Cj4gIAljYXNlIERSTV9GT1JNQVRfVllVWToKPiArCQlpZiAobW9kaWZpZXIgPT0gRFJNX0ZPUk1B VF9NT0RfTElORUFSIHx8Cj4gKwkJICAgIG1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9YX1RJ TEVEKQo+ICsJCQlyZXR1cm4gdHJ1ZTsKPiArCQkvKiBmYWxsIHRocm91Z2ggKi8KPiArCWRlZmF1 bHQ6Cj4gKwkJcmV0dXJuIGZhbHNlOwo+ICsJfQo+ICt9Cj4gKwo+ICtzdGF0aWMgYm9vbCB2bHZf bW9kX3N1cHBvcnRlZCh1aW50MzJfdCBmb3JtYXQsIHVpbnQ2NF90IG1vZGlmaWVyKQo+ICt7Cj4g Kwlzd2l0Y2ggKGZvcm1hdCkgewo+ICAJY2FzZSBEUk1fRk9STUFUX1JHQjU2NToKPiAtCWNhc2Ug RFJNX0ZPUk1BVF9YUkdCODg4ODoKPiArCWNhc2UgRFJNX0ZPUk1BVF9BQkdSODg4ODoKPiAgCWNh c2UgRFJNX0ZPUk1BVF9BUkdCODg4ODoKPiArCWNhc2UgRFJNX0ZPUk1BVF9YQkdSODg4ODoKPiAr CWNhc2UgRFJNX0ZPUk1BVF9YUkdCODg4ODoKPiAgCWNhc2UgRFJNX0ZPUk1BVF9YQkdSMjEwMTAx MDoKPiAgCWNhc2UgRFJNX0ZPUk1BVF9BQkdSMjEwMTAxMDoKPiAtCWNhc2UgRFJNX0ZPUk1BVF9Y QkdSODg4ODoKPiAtCWNhc2UgRFJNX0ZPUk1BVF9BQkdSODg4ODoKPiArCWNhc2UgRFJNX0ZPUk1B VF9ZVVlWOgo+ICsJY2FzZSBEUk1fRk9STUFUX1lWWVU6Cj4gKwljYXNlIERSTV9GT1JNQVRfVVlW WToKPiArCWNhc2UgRFJNX0ZPUk1BVF9WWVVZOgo+ICAJCWlmIChtb2RpZmllciA9PSBEUk1fRk9S TUFUX01PRF9MSU5FQVIgfHwKPiAgCQkgICAgbW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1hf VElMRUQpCj4gIAkJCXJldHVybiB0cnVlOwo+IEBAIC0xMjE0LDExICsxMjI3LDggQEAgc3RhdGlj IGJvb2wgdmx2X3Nwcml0ZV9wbGFuZV9mb3JtYXRfbW9kX3N1cHBvcnRlZChzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKPiAgCX0KPiAgfQo+ICAKPiAtc3RhdGljIGJvb2wgc2tsX3Nwcml0ZV9wbGFu ZV9mb3JtYXRfbW9kX3N1cHBvcnRlZChzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKPiAtCQkJCQkJ ICB1aW50MzJfdCBmb3JtYXQsCj4gLQkJCQkJCSAgdWludDY0X3QgbW9kaWZpZXIpCj4gK3N0YXRp YyBib29sIHNrbF9tb2Rfc3VwcG9ydGVkKHVpbnQzMl90IGZvcm1hdCwgdWludDY0X3QgbW9kaWZp ZXIpCj4gIHsKPiAtCS8qIFRoaXMgaXMgdGhlIHNhbWUgYXMgcHJpbWFyeSBwbGFuZSBzaW5jZSBT S0wgaGFzIHVuaXZlcnNhbCBwbGFuZXMgKi8KPiAgCXN3aXRjaCAoZm9ybWF0KSB7Cj4gIAljYXNl IERSTV9GT1JNQVRfWFJHQjg4ODg6Cj4gIAljYXNlIERSTV9GT1JNQVRfWEJHUjg4ODg6Cj4gQEAg LTEyNTksMTMgKzEyNjksMTMgQEAgc3RhdGljIGJvb2wgaW50ZWxfc3ByaXRlX3BsYW5lX2Zvcm1h dF9tb2Rfc3VwcG9ydGVkKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAo+ICAJCXJldHVybiBmYWxz ZTsKPiAgCj4gIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQo+IC0JCXJldHVybiBza2xf c3ByaXRlX3BsYW5lX2Zvcm1hdF9tb2Rfc3VwcG9ydGVkKHBsYW5lLCBmb3JtYXQsIG1vZGlmaWVy KTsKPiArCQlyZXR1cm4gc2tsX21vZF9zdXBwb3J0ZWQoZm9ybWF0LCBtb2RpZmllcik7Cj4gIAll bHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2 KSkKPiAtCQlyZXR1cm4gdmx2X3Nwcml0ZV9wbGFuZV9mb3JtYXRfbW9kX3N1cHBvcnRlZChwbGFu ZSwgZm9ybWF0LCBtb2RpZmllcik7Cj4gKwkJcmV0dXJuIHZsdl9tb2Rfc3VwcG9ydGVkKGZvcm1h dCwgbW9kaWZpZXIpOwo+ICsJZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2KQo+ICsJ CXJldHVybiBzbmJfbW9kX3N1cHBvcnRlZChmb3JtYXQsIG1vZGlmaWVyKTsKPiAgCWVsc2UKPiAt CQlyZXR1cm4gZzR4X3Nwcml0ZV9wbGFuZV9mb3JtYXRfbW9kX3N1cHBvcnRlZChwbGFuZSwgZm9y bWF0LCBtb2RpZmllcik7Cj4gLQo+IC0JdW5yZWFjaGFibGUoKTsKPiArCQlyZXR1cm4gZzR4X21v ZF9zdXBwb3J0ZWQoZm9ybWF0LCBtb2RpZmllcik7Cj4gIH0KPiAgCj4gIHN0YXRpYyBjb25zdCBz dHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX3Nwcml0ZV9wbGFuZV9mdW5jcyA9IHsKPiAtLSAK PiAyLjEzLjYKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwo+IEludGVsLWdmeCBtYWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jw b3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK