From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH] drm/i915: Clean up scaler setup, v2. Date: Fri, 21 Sep 2018 19:32:12 +0200 Message-ID: References: <20180920231916.GL31331@mdroper-desk.amr.corp.intel.com> <20180921144437.20037-1-maarten.lankhorst@linux.intel.com> <20180921164059.GA28364@mdroper-desk.amr.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 74FF16E875 for ; Fri, 21 Sep 2018 17:32:15 +0000 (UTC) In-Reply-To: <20180921164059.GA28364@mdroper-desk.amr.corp.intel.com> Content-Language: en-US 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 T3AgMjEtMDktMTggb20gMTg6NDAgc2NocmVlZiBNYXR0IFJvcGVyOgo+IE9uIEZyaSwgU2VwIDIx LCAyMDE4IGF0IDA0OjQ0OjM3UE0gKzAyMDAsIE1hYXJ0ZW4gTGFua2hvcnN0IHdyb3RlOgo+PiBP biBza3lsYWtlIHdlIGNhbiBzd2l0Y2ggdG8gYSBoaWdoIHF1YWxpdHkgc2NhbGVyIG1vZGUgd2hl biBvbmx5IDEgb3V0Cj4+IG9mIDIgc2NhbGVycyBhcmUgdXNlZCwgYnV0IG9uIEdMSyBhbmQgbGF0 ZXIgYml0IDI4IGhhcyBhIGRpZmZlcmVudAo+PiBtZWFuaW5nLiBEb24ndCBzZXQgaXQsIGFuZCBt YWtlIGNsZWFyIHRoZSBkaXN0aW5jdGlvbiBiZXR3ZWVuCj4+IFNLTCBhbmQgbGF0ZXIgUFMgdmFs dWVzLgo+Pgo+PiBDaGFuZ2VzIHNpbmNlIHYxOgo+PiAtIEFkZCBtaXNzaW5nIGJyZWFrIHN0YXRl bWVudC4KPj4KPj4gU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFu a2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPj4gUmV2aWV3ZWQtYnk6IE1hdHQgUm9wZXIgPG1hdHRo ZXcuZC5yb3BlckBpbnRlbC5jb20+ICN2MQo+IFItYiBmb3IgdjIgYXMgd2VsbC4KPgo+PiAtLS0K Pj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggICAgICB8ICAgNyArLQo+PiAgZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgIHwgMTA5ICsrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLQo+PiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgICAy ICstCj4+ICAzIGZpbGVzIGNoYW5nZWQsIDY3IGluc2VydGlvbnMoKyksIDUxIGRlbGV0aW9ucygt KQo+Pgo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKPj4gaW5kZXggNDk0OGIzNTJiZjRjLi5lN2U2 Y2E3Zjk2NjUgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgK Pj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAo+PiBAQCAtNjg1MCwxMSAr Njg1MCwxMiBAQCBlbnVtIHsKPj4gICNkZWZpbmUgX1BTXzJCX0NUUkwgICAgICAweDY4QTgwCj4+ ICAjZGVmaW5lIF9QU18xQ19DVFJMICAgICAgMHg2OTE4MAo+PiAgI2RlZmluZSBQU19TQ0FMRVJf RU4gICAgICAgICgxIDw8IDMxKQo+PiAtI2RlZmluZSBQU19TQ0FMRVJfTU9ERV9NQVNLICgzIDw8 IDI4KQo+PiAtI2RlZmluZSBQU19TQ0FMRVJfTU9ERV9EWU4gICgwIDw8IDI4KQo+PiAtI2RlZmlu ZSBQU19TQ0FMRVJfTU9ERV9IUSAgKDEgPDwgMjgpCj4+ICsjZGVmaW5lIFNLTF9QU19TQ0FMRVJf TU9ERV9NQVNLICgzIDw8IDI4KQo+PiArI2RlZmluZSBTS0xfUFNfU0NBTEVSX01PREVfRFlOICAo MCA8PCAyOCkKPj4gKyNkZWZpbmUgU0tMX1BTX1NDQUxFUl9NT0RFX0hRICAoMSA8PCAyOCkKPj4g ICNkZWZpbmUgU0tMX1BTX1NDQUxFUl9NT0RFX05WMTIgKDIgPDwgMjgpCj4+ICAjZGVmaW5lIFBT X1NDQUxFUl9NT0RFX1BMQU5BUiAoMSA8PCAyOSkKPj4gKyNkZWZpbmUgUFNfU0NBTEVSX01PREVf UEFDS0VEICgwIDw8IDI5KQo+PiAgI2RlZmluZSBQU19QTEFORV9TRUxfTUFTSyAgKDcgPDwgMjUp Cj4+ICAjZGVmaW5lIFBTX1BMQU5FX1NFTChwbGFuZSkgKCgocGxhbmUpICsgMSkgPDwgMjUpCj4+ ICAjZGVmaW5lIFBTX0ZJTFRFUl9NQVNLICAgICAgICAgKDMgPDwgMjMpCj4+IGRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2F0b21pYy5jCj4+IGluZGV4IGIwNDk1MmJhY2Y3Ny4uYzIzYTZlYzQwZjYwIDEw MDY0NAo+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwo+PiArKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwo+PiBAQCAtMjAzLDYgKzIwMyw2 MyBAQCBpbnRlbF9jcnRjX2Rlc3Ryb3lfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAo+PiAg CWRybV9hdG9taWNfaGVscGVyX2NydGNfZGVzdHJveV9zdGF0ZShjcnRjLCBzdGF0ZSk7Cj4+ICB9 Cj4+ICAKPj4gK3N0YXRpYyB2b2lkIGludGVsX2F0b21pY19zZXR1cF9zY2FsZXIoc3RydWN0IGlu dGVsX2NydGNfc2NhbGVyX3N0YXRlICpzY2FsZXJfc3RhdGUsCj4+ICsJCQkJICAgICAgaW50IG51 bV9zY2FsZXJzX25lZWQsIHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAo+PiArCQkJCSAg ICAgIGNvbnN0IGNoYXIgKm5hbWUsIGludCBpZHgsCj4+ICsJCQkJICAgICAgc3RydWN0IGludGVs X3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSwKPj4gKwkJCQkgICAgICBpbnQgKnNjYWxlcl9pZCkK Pj4gK3sKPj4gKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGlu dGVsX2NydGMtPmJhc2UuZGV2KTsKPj4gKwlpbnQgajsKPj4gKwl1MzIgbW9kZTsKPj4gKwo+PiAr CWlmICgqc2NhbGVyX2lkIDwgMCkgewo+PiArCQkvKiBmaW5kIGEgZnJlZSBzY2FsZXIgKi8KPj4g KwkJZm9yIChqID0gMDsgaiA8IGludGVsX2NydGMtPm51bV9zY2FsZXJzOyBqKyspIHsKPj4gKwkJ CWlmIChzY2FsZXJfc3RhdGUtPnNjYWxlcnNbal0uaW5fdXNlKQo+PiArCQkJCWNvbnRpbnVlOwo+ PiArCj4+ICsJCQkqc2NhbGVyX2lkID0gajsKPj4gKwkJCXNjYWxlcl9zdGF0ZS0+c2NhbGVyc1sq c2NhbGVyX2lkXS5pbl91c2UgPSAxOwo+PiArCQkJYnJlYWs7Cj4+ICsJCX0KPj4gKwl9Cj4+ICsK Pj4gKwlpZiAoV0FSTigqc2NhbGVyX2lkIDwgMCwgIkNhbm5vdCBmaW5kIHNjYWxlciBmb3IgJXM6 JWRcbiIsIG5hbWUsIGlkeCkpCj4+ICsJCXJldHVybjsKPj4gKwo+PiArCS8qIHNldCBzY2FsZXIg bW9kZSAqLwo+PiArCWlmIChwbGFuZV9zdGF0ZSAmJiBwbGFuZV9zdGF0ZS0+YmFzZS5mYiAmJgo+ PiArCSAgICBwbGFuZV9zdGF0ZS0+YmFzZS5mYi0+Zm9ybWF0LT5pc195dXYgJiYKPj4gKwkgICAg cGxhbmVfc3RhdGUtPmJhc2UuZmItPmZvcm1hdC0+bnVtX3BsYW5lcyA+IDEpIHsKPj4gKwkJaWYg KElOVEVMX0dFTihkZXZfcHJpdikgPT0gOSAmJgo+PiArCQkgICAgIUlTX0dFTUlOSUxBS0UoZGV2 X3ByaXYpKQo+PiArCQkJbW9kZSA9IFNLTF9QU19TQ0FMRVJfTU9ERV9OVjEyOwo+PiArCQllbHNl Cj4+ICsJCQltb2RlID0gUFNfU0NBTEVSX01PREVfUExBTkFSOwo+PiArCj4+ICsJfSBlbHNlIGlm IChJTlRFTF9HRU4oZGV2X3ByaXYpID4gOSB8fCBJU19HRU1JTklMQUtFKGRldl9wcml2KSkgewo+ PiArCQltb2RlID0gUFNfU0NBTEVSX01PREVfUEFDS0VEOwo+PiArCX0gZWxzZSBpZiAobnVtX3Nj YWxlcnNfbmVlZCA9PSAxICYmIGludGVsX2NydGMtPm51bV9zY2FsZXJzID4gMSkgewo+PiArCQkv Kgo+PiArCQkgKiB3aGVuIG9ubHkgMSBzY2FsZXIgaXMgaW4gdXNlIG9uIGEgcGlwZSB3aXRoIDIg c2NhbGVycwo+PiArCQkgKiBzY2FsZXIgMCBvcGVyYXRlcyBpbiBoaWdoIHF1YWxpdHkgKEhRKSBt b2RlLgo+PiArCQkgKiBJbiB0aGlzIGNhc2UgdXNlIHNjYWxlciAwIHRvIHRha2UgYWR2YW50YWdl IG9mIEhRIG1vZGUKPj4gKwkJICovCj4+ICsJCXNjYWxlcl9zdGF0ZS0+c2NhbGVyc1sqc2NhbGVy X2lkXS5pbl91c2UgPSAwOwo+PiArCQkqc2NhbGVyX2lkID0gMDsKPj4gKwkJc2NhbGVyX3N0YXRl LT5zY2FsZXJzWzBdLmluX3VzZSA9IDE7Cj4+ICsJCW1vZGUgPSBTS0xfUFNfU0NBTEVSX01PREVf SFE7Cj4+ICsJfSBlbHNlIHsKPj4gKwkJbW9kZSA9IFNLTF9QU19TQ0FMRVJfTU9ERV9EWU47Cj4+ ICsJfQo+PiArCj4+ICsJRFJNX0RFQlVHX0tNUygiQXR0YWNoZWQgc2NhbGVyIGlkICV1LiV1IHRv ICVzOiVkXG4iLAo+PiArCQkgICAgICBpbnRlbF9jcnRjLT5waXBlLCAqc2NhbGVyX2lkLCBuYW1l LCBpZHgpOwo+PiArCXNjYWxlcl9zdGF0ZS0+c2NhbGVyc1sqc2NhbGVyX2lkXS5tb2RlID0gbW9k ZTsKPj4gK30KPj4gKwo+PiArCj4+ICAvKioKPj4gICAqIGludGVsX2F0b21pY19zZXR1cF9zY2Fs ZXJzKCkgLSBzZXR1cCBzY2FsZXJzIGZvciBjcnRjIHBlciBzdGFnZWQgcmVxdWVzdHMKPj4gICAq IEBkZXZfcHJpdjogaTkxNSBkZXZpY2UKPj4gQEAgLTIzMiw3ICsyODksNyBAQCBpbnQgaW50ZWxf YXRvbWljX3NldHVwX3NjYWxlcnMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ PiAgCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpkcm1fc3RhdGUgPSBjcnRjX3N0YXRlLT5iYXNl LnN0YXRlOwo+PiAgCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0YXRlID0gdG9f aW50ZWxfYXRvbWljX3N0YXRlKGRybV9zdGF0ZSk7Cj4+ICAJaW50IG51bV9zY2FsZXJzX25lZWQ7 Cj4+IC0JaW50IGksIGo7Cj4+ICsJaW50IGk7Cj4+ICAKPj4gIAludW1fc2NhbGVyc19uZWVkID0g aHdlaWdodDMyKHNjYWxlcl9zdGF0ZS0+c2NhbGVyX3VzZXJzKTsKPj4gIAo+PiBAQCAtMzA0LDU5 ICszNjEsMTcgQEAgaW50IGludGVsX2F0b21pY19zZXR1cF9zY2FsZXJzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKPj4gIAkJCWlkeCA9IHBsYW5lLT5iYXNlLmlkOwo+PiAgCj4+ ICAJCQkvKiBwbGFuZSBvbiBkaWZmZXJlbnQgY3J0YyBjYW5ub3QgYmUgYSBzY2FsZXIgdXNlciBv ZiB0aGlzIGNydGMgKi8KPj4gLQkJCWlmIChXQVJOX09OKGludGVsX3BsYW5lLT5waXBlICE9IGlu dGVsX2NydGMtPnBpcGUpKSB7Cj4+ICsJCQlpZiAoV0FSTl9PTihpbnRlbF9wbGFuZS0+cGlwZSAh PSBpbnRlbF9jcnRjLT5waXBlKSkKPj4gIAkJCQljb250aW51ZTsKPj4gLQkJCX0KPj4gIAo+PiAg CQkJcGxhbmVfc3RhdGUgPSBpbnRlbF9hdG9taWNfZ2V0X25ld19wbGFuZV9zdGF0ZShpbnRlbF9z dGF0ZSwKPj4gIAkJCQkJCQkJICAgICAgIGludGVsX3BsYW5lKTsKPj4gIAkJCXNjYWxlcl9pZCA9 ICZwbGFuZV9zdGF0ZS0+c2NhbGVyX2lkOwo+PiAgCQl9Cj4+ICAKPj4gLQkJaWYgKCpzY2FsZXJf aWQgPCAwKSB7Cj4+IC0JCQkvKiBmaW5kIGEgZnJlZSBzY2FsZXIgKi8KPj4gLQkJCWZvciAoaiA9 IDA7IGogPCBpbnRlbF9jcnRjLT5udW1fc2NhbGVyczsgaisrKSB7Cj4+IC0JCQkJaWYgKCFzY2Fs ZXJfc3RhdGUtPnNjYWxlcnNbal0uaW5fdXNlKSB7Cj4+IC0JCQkJCXNjYWxlcl9zdGF0ZS0+c2Nh bGVyc1tqXS5pbl91c2UgPSAxOwo+PiAtCQkJCQkqc2NhbGVyX2lkID0gajsKPj4gLQkJCQkJRFJN X0RFQlVHX0tNUygiQXR0YWNoZWQgc2NhbGVyIGlkICV1LiV1IHRvICVzOiVkXG4iLAo+PiAtCQkJ CQkJaW50ZWxfY3J0Yy0+cGlwZSwgKnNjYWxlcl9pZCwgbmFtZSwgaWR4KTsKPj4gLQkJCQkJYnJl YWs7Cj4+IC0JCQkJfQo+PiAtCQkJfQo+PiAtCQl9Cj4+IC0KPj4gLQkJaWYgKFdBUk5fT04oKnNj YWxlcl9pZCA8IDApKSB7Cj4+IC0JCQlEUk1fREVCVUdfS01TKCJDYW5ub3QgZmluZCBzY2FsZXIg Zm9yICVzOiVkXG4iLCBuYW1lLCBpZHgpOwo+PiAtCQkJY29udGludWU7Cj4+IC0JCX0KPj4gLQo+ PiAtCQkvKiBzZXQgc2NhbGVyIG1vZGUgKi8KPj4gLQkJaWYgKChJTlRFTF9HRU4oZGV2X3ByaXYp ID49IDkpICYmCj4+IC0JCSAgICBwbGFuZV9zdGF0ZSAmJiBwbGFuZV9zdGF0ZS0+YmFzZS5mYiAm Jgo+PiAtCQkgICAgcGxhbmVfc3RhdGUtPmJhc2UuZmItPmZvcm1hdC0+Zm9ybWF0ID09Cj4+IC0J CSAgICBEUk1fRk9STUFUX05WMTIpIHsKPj4gLQkJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID09 IDkgJiYKPj4gLQkJCSAgICAhSVNfR0VNSU5JTEFLRShkZXZfcHJpdikgJiYKPj4gLQkJCSAgICAh SVNfU0tZTEFLRShkZXZfcHJpdikpCj4+IC0JCQkJc2NhbGVyX3N0YXRlLT5zY2FsZXJzWypzY2Fs ZXJfaWRdLm1vZGUgPQo+PiAtCQkJCQlTS0xfUFNfU0NBTEVSX01PREVfTlYxMjsKPj4gLQkJCWVs c2UKPj4gLQkJCQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbKnNjYWxlcl9pZF0ubW9kZSA9Cj4+IC0J CQkJCVBTX1NDQUxFUl9NT0RFX1BMQU5BUjsKPj4gLQkJfSBlbHNlIGlmIChudW1fc2NhbGVyc19u ZWVkID09IDEgJiYgaW50ZWxfY3J0Yy0+cGlwZSAhPSBQSVBFX0MpIHsKPj4gLQkJCS8qCj4+IC0J CQkgKiB3aGVuIG9ubHkgMSBzY2FsZXIgaXMgaW4gdXNlIG9uIGVpdGhlciBwaXBlIEEgb3IgQiwK Pj4gLQkJCSAqIHNjYWxlciAwIG9wZXJhdGVzIGluIGhpZ2ggcXVhbGl0eSAoSFEpIG1vZGUuCj4+ IC0JCQkgKiBJbiB0aGlzIGNhc2UgdXNlIHNjYWxlciAwIHRvIHRha2UgYWR2YW50YWdlIG9mIEhR IG1vZGUKPj4gLQkJCSAqLwo+PiAtCQkJKnNjYWxlcl9pZCA9IDA7Cj4+IC0JCQlzY2FsZXJfc3Rh dGUtPnNjYWxlcnNbMF0uaW5fdXNlID0gMTsKPj4gLQkJCXNjYWxlcl9zdGF0ZS0+c2NhbGVyc1sw XS5tb2RlID0gUFNfU0NBTEVSX01PREVfSFE7Cj4+IC0JCQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNb MV0uaW5fdXNlID0gMDsKPj4gLQkJfSBlbHNlIHsKPj4gLQkJCXNjYWxlcl9zdGF0ZS0+c2NhbGVy c1sqc2NhbGVyX2lkXS5tb2RlID0gUFNfU0NBTEVSX01PREVfRFlOOwo+PiAtCQl9Cj4+ICsJCWlu dGVsX2F0b21pY19zZXR1cF9zY2FsZXIoc2NhbGVyX3N0YXRlLCBudW1fc2NhbGVyc19uZWVkLAo+ PiArCQkJCQkgIGludGVsX2NydGMsIG5hbWUsIGlkeCwKPj4gKwkJCQkJICBwbGFuZV9zdGF0ZSwg c2NhbGVyX2lkKTsKPj4gIAl9Cj4+ICAKPj4gIAlyZXR1cm4gMDsKPj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwo+PiBpbmRleCAwMjM3NDE4NWI5OTMuLjkzMTg5ODAxMzUwNiAxMDA2 NDQKPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+PiBAQCAtMTM5NjMsNyArMTM5 NjMsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2luaXRfc2NhbGVycyhzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YywKPj4gIAkJc3RydWN0IGludGVsX3NjYWxlciAqc2NhbGVyID0gJnNjYWxlcl9z dGF0ZS0+c2NhbGVyc1tpXTsKPj4gIAo+PiAgCQlzY2FsZXItPmluX3VzZSA9IDA7Cj4+IC0JCXNj YWxlci0+bW9kZSA9IFBTX1NDQUxFUl9NT0RFX0RZTjsKPj4gKwkJc2NhbGVyLT5tb2RlID0gMDsK Pj4gIAl9Cj4+ICAKPj4gIAlzY2FsZXJfc3RhdGUtPnNjYWxlcl9pZCA9IC0xOwo+PiAtLSAKPj4g Mi4xOC4wCj4+ClRoYW5rcywgcHVzaGVkIHRoZSBzZXJpZXMuIDopCgp+TWFhcnRlbgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==