From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [PATCH 6/8] drm/i915: Clean up scaler setup. Date: Thu, 20 Sep 2018 16:19:16 -0700 Message-ID: <20180920231916.GL31331@mdroper-desk.amr.corp.intel.com> References: <20180920102711.4184-1-maarten.lankhorst@linux.intel.com> <20180920102711.4184-7-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id A2D7A6E695 for ; Thu, 20 Sep 2018 23:19:17 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20180920102711.4184-7-maarten.lankhorst@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: Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBTZXAgMjAsIDIwMTggYXQgMTI6Mjc6MDlQTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gT24gc2t5bGFrZSB3ZSBjYW4gc3dpdGNoIHRvIGEgaGlnaCBxdWFsaXR5IHNj YWxlciBtb2RlIHdoZW4gb25seSAxIG91dAo+IG9mIDIgc2NhbGVycyBhcmUgdXNlZCwgYnV0IG9u IEdMSyBhbmQgbGF0ZXIgYml0IDI4IGhhcyBhIGRpZmZlcmVudAo+IG1lYW5pbmcuIERvbid0IHNl dCBpdCwgYW5kIG1ha2UgY2xlYXIgdGhlIGRpc3RpbmN0aW9uIGJldHdlZW4KPiBTS0wgYW5kIGxh dGVyIFBTIHZhbHVlcy4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFh cnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgoKUmV2aWV3ZWQtYnk6IE1hdHQgUm9wZXIg PG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Cgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3JlZy5oICAgICAgfCAgIDcgKy0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXRvbWljLmMgIHwgMTA4ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQo+ICBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgIDIgKy0KPiAgMyBmaWxlcyBjaGFuZ2VkLCA2 NiBpbnNlcnRpb25zKCspLCA1MSBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVn LmgKPiBpbmRleCA0OTQ4YjM1MmJmNGMuLmU3ZTZjYTdmOTY2NSAxMDA2NDQKPiAtLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9yZWcuaAo+IEBAIC02ODUwLDExICs2ODUwLDEyIEBAIGVudW0gewo+ICAjZGVmaW5lIF9Q U18yQl9DVFJMICAgICAgMHg2OEE4MAo+ICAjZGVmaW5lIF9QU18xQ19DVFJMICAgICAgMHg2OTE4 MAo+ICAjZGVmaW5lIFBTX1NDQUxFUl9FTiAgICAgICAgKDEgPDwgMzEpCj4gLSNkZWZpbmUgUFNf U0NBTEVSX01PREVfTUFTSyAoMyA8PCAyOCkKPiAtI2RlZmluZSBQU19TQ0FMRVJfTU9ERV9EWU4g ICgwIDw8IDI4KQo+IC0jZGVmaW5lIFBTX1NDQUxFUl9NT0RFX0hRICAoMSA8PCAyOCkKPiArI2Rl ZmluZSBTS0xfUFNfU0NBTEVSX01PREVfTUFTSyAoMyA8PCAyOCkKPiArI2RlZmluZSBTS0xfUFNf U0NBTEVSX01PREVfRFlOICAoMCA8PCAyOCkKPiArI2RlZmluZSBTS0xfUFNfU0NBTEVSX01PREVf SFEgICgxIDw8IDI4KQo+ICAjZGVmaW5lIFNLTF9QU19TQ0FMRVJfTU9ERV9OVjEyICgyIDw8IDI4 KQo+ICAjZGVmaW5lIFBTX1NDQUxFUl9NT0RFX1BMQU5BUiAoMSA8PCAyOSkKPiArI2RlZmluZSBQ U19TQ0FMRVJfTU9ERV9QQUNLRUQgKDAgPDwgMjkpCj4gICNkZWZpbmUgUFNfUExBTkVfU0VMX01B U0sgICg3IDw8IDI1KQo+ICAjZGVmaW5lIFBTX1BMQU5FX1NFTChwbGFuZSkgKCgocGxhbmUpICsg MSkgPDwgMjUpCj4gICNkZWZpbmUgUFNfRklMVEVSX01BU0sgICAgICAgICAoMyA8PCAyMykKPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwo+IGluZGV4IGIwNDk1MmJhY2Y3Ny4uNDBmYmEz ZjIyZjg3IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5j Cj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKPiBAQCAtMjAzLDYg KzIwMyw2MiBAQCBpbnRlbF9jcnRjX2Rlc3Ryb3lfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRj LAo+ICAJZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kZXN0cm95X3N0YXRlKGNydGMsIHN0YXRlKTsK PiAgfQo+ICAKPiArc3RhdGljIHZvaWQgaW50ZWxfYXRvbWljX3NldHVwX3NjYWxlcihzdHJ1Y3Qg aW50ZWxfY3J0Y19zY2FsZXJfc3RhdGUgKnNjYWxlcl9zdGF0ZSwKPiArCQkJCSAgICAgIGludCBu dW1fc2NhbGVyc19uZWVkLCBzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKPiArCQkJCSAg ICAgIGNvbnN0IGNoYXIgKm5hbWUsIGludCBpZHgsCj4gKwkJCQkgICAgICBzdHJ1Y3QgaW50ZWxf cGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlLAo+ICsJCQkJICAgICAgaW50ICpzY2FsZXJfaWQpCj4g K3sKPiArCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxf Y3J0Yy0+YmFzZS5kZXYpOwo+ICsJaW50IGo7Cj4gKwl1MzIgbW9kZTsKPiArCj4gKwlpZiAoKnNj YWxlcl9pZCA8IDApIHsKPiArCQkvKiBmaW5kIGEgZnJlZSBzY2FsZXIgKi8KPiArCQlmb3IgKGog PSAwOyBqIDwgaW50ZWxfY3J0Yy0+bnVtX3NjYWxlcnM7IGorKykgewo+ICsJCQlpZiAoc2NhbGVy X3N0YXRlLT5zY2FsZXJzW2pdLmluX3VzZSkKPiArCQkJCWNvbnRpbnVlOwo+ICsKPiArCQkJKnNj YWxlcl9pZCA9IGo7Cj4gKwkJCXNjYWxlcl9zdGF0ZS0+c2NhbGVyc1sqc2NhbGVyX2lkXS5pbl91 c2UgPSAxOwo+ICsJCX0KPiArCX0KPiArCj4gKwlpZiAoV0FSTigqc2NhbGVyX2lkIDwgMCwgIkNh bm5vdCBmaW5kIHNjYWxlciBmb3IgJXM6JWRcbiIsIG5hbWUsIGlkeCkpCj4gKwkJcmV0dXJuOwo+ ICsKPiArCS8qIHNldCBzY2FsZXIgbW9kZSAqLwo+ICsJaWYgKHBsYW5lX3N0YXRlICYmIHBsYW5l X3N0YXRlLT5iYXNlLmZiICYmCj4gKwkgICAgcGxhbmVfc3RhdGUtPmJhc2UuZmItPmZvcm1hdC0+ aXNfeXV2ICYmCj4gKwkgICAgcGxhbmVfc3RhdGUtPmJhc2UuZmItPmZvcm1hdC0+bnVtX3BsYW5l cyA+IDEpIHsKPiArCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA9PSA5ICYmCj4gKwkJICAgICFJ U19HRU1JTklMQUtFKGRldl9wcml2KSkKPiArCQkJbW9kZSA9IFNLTF9QU19TQ0FMRVJfTU9ERV9O VjEyOwo+ICsJCWVsc2UKPiArCQkJbW9kZSA9IFBTX1NDQUxFUl9NT0RFX1BMQU5BUjsKPiArCj4g Kwl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPiA5IHx8IElTX0dFTUlOSUxBS0UoZGV2 X3ByaXYpKSB7Cj4gKwkJbW9kZSA9IFBTX1NDQUxFUl9NT0RFX1BBQ0tFRDsKPiArCX0gZWxzZSBp ZiAobnVtX3NjYWxlcnNfbmVlZCA9PSAxICYmIGludGVsX2NydGMtPm51bV9zY2FsZXJzID4gMSkg ewo+ICsJCS8qCj4gKwkJICogd2hlbiBvbmx5IDEgc2NhbGVyIGlzIGluIHVzZSBvbiBhIHBpcGUg d2l0aCAyIHNjYWxlcnMKPiArCQkgKiBzY2FsZXIgMCBvcGVyYXRlcyBpbiBoaWdoIHF1YWxpdHkg KEhRKSBtb2RlLgo+ICsJCSAqIEluIHRoaXMgY2FzZSB1c2Ugc2NhbGVyIDAgdG8gdGFrZSBhZHZh bnRhZ2Ugb2YgSFEgbW9kZQo+ICsJCSAqLwo+ICsJCXNjYWxlcl9zdGF0ZS0+c2NhbGVyc1sqc2Nh bGVyX2lkXS5pbl91c2UgPSAwOwo+ICsJCSpzY2FsZXJfaWQgPSAwOwo+ICsJCXNjYWxlcl9zdGF0 ZS0+c2NhbGVyc1swXS5pbl91c2UgPSAxOwo+ICsJCW1vZGUgPSBTS0xfUFNfU0NBTEVSX01PREVf SFE7Cj4gKwl9IGVsc2Ugewo+ICsJCW1vZGUgPSBTS0xfUFNfU0NBTEVSX01PREVfRFlOOwo+ICsJ fQo+ICsKPiArCURSTV9ERUJVR19LTVMoIkF0dGFjaGVkIHNjYWxlciBpZCAldS4ldSB0byAlczol ZFxuIiwKPiArCQkgICAgICBpbnRlbF9jcnRjLT5waXBlLCAqc2NhbGVyX2lkLCBuYW1lLCBpZHgp Owo+ICsJc2NhbGVyX3N0YXRlLT5zY2FsZXJzWypzY2FsZXJfaWRdLm1vZGUgPSBtb2RlOwo+ICt9 Cj4gKwo+ICsKPiAgLyoqCj4gICAqIGludGVsX2F0b21pY19zZXR1cF9zY2FsZXJzKCkgLSBzZXR1 cCBzY2FsZXJzIGZvciBjcnRjIHBlciBzdGFnZWQgcmVxdWVzdHMKPiAgICogQGRldl9wcml2OiBp OTE1IGRldmljZQo+IEBAIC0yMzIsNyArMjg4LDcgQEAgaW50IGludGVsX2F0b21pY19zZXR1cF9z Y2FsZXJzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiAgCXN0cnVjdCBkcm1f YXRvbWljX3N0YXRlICpkcm1fc3RhdGUgPSBjcnRjX3N0YXRlLT5iYXNlLnN0YXRlOwo+ICAJc3Ry dWN0IGludGVsX2F0b21pY19zdGF0ZSAqaW50ZWxfc3RhdGUgPSB0b19pbnRlbF9hdG9taWNfc3Rh dGUoZHJtX3N0YXRlKTsKPiAgCWludCBudW1fc2NhbGVyc19uZWVkOwo+IC0JaW50IGksIGo7Cj4g KwlpbnQgaTsKPiAgCj4gIAludW1fc2NhbGVyc19uZWVkID0gaHdlaWdodDMyKHNjYWxlcl9zdGF0 ZS0+c2NhbGVyX3VzZXJzKTsKPiAgCj4gQEAgLTMwNCw1OSArMzYwLDE3IEBAIGludCBpbnRlbF9h dG9taWNfc2V0dXBfc2NhbGVycyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4g IAkJCWlkeCA9IHBsYW5lLT5iYXNlLmlkOwo+ICAKPiAgCQkJLyogcGxhbmUgb24gZGlmZmVyZW50 IGNydGMgY2Fubm90IGJlIGEgc2NhbGVyIHVzZXIgb2YgdGhpcyBjcnRjICovCj4gLQkJCWlmIChX QVJOX09OKGludGVsX3BsYW5lLT5waXBlICE9IGludGVsX2NydGMtPnBpcGUpKSB7Cj4gKwkJCWlm IChXQVJOX09OKGludGVsX3BsYW5lLT5waXBlICE9IGludGVsX2NydGMtPnBpcGUpKQo+ICAJCQkJ Y29udGludWU7Cj4gLQkJCX0KPiAgCj4gIAkJCXBsYW5lX3N0YXRlID0gaW50ZWxfYXRvbWljX2dl dF9uZXdfcGxhbmVfc3RhdGUoaW50ZWxfc3RhdGUsCj4gIAkJCQkJCQkJICAgICAgIGludGVsX3Bs YW5lKTsKPiAgCQkJc2NhbGVyX2lkID0gJnBsYW5lX3N0YXRlLT5zY2FsZXJfaWQ7Cj4gIAkJfQo+ ICAKPiAtCQlpZiAoKnNjYWxlcl9pZCA8IDApIHsKPiAtCQkJLyogZmluZCBhIGZyZWUgc2NhbGVy ICovCj4gLQkJCWZvciAoaiA9IDA7IGogPCBpbnRlbF9jcnRjLT5udW1fc2NhbGVyczsgaisrKSB7 Cj4gLQkJCQlpZiAoIXNjYWxlcl9zdGF0ZS0+c2NhbGVyc1tqXS5pbl91c2UpIHsKPiAtCQkJCQlz Y2FsZXJfc3RhdGUtPnNjYWxlcnNbal0uaW5fdXNlID0gMTsKPiAtCQkJCQkqc2NhbGVyX2lkID0g ajsKPiAtCQkJCQlEUk1fREVCVUdfS01TKCJBdHRhY2hlZCBzY2FsZXIgaWQgJXUuJXUgdG8gJXM6 JWRcbiIsCj4gLQkJCQkJCWludGVsX2NydGMtPnBpcGUsICpzY2FsZXJfaWQsIG5hbWUsIGlkeCk7 Cj4gLQkJCQkJYnJlYWs7Cj4gLQkJCQl9Cj4gLQkJCX0KPiAtCQl9Cj4gLQo+IC0JCWlmIChXQVJO X09OKCpzY2FsZXJfaWQgPCAwKSkgewo+IC0JCQlEUk1fREVCVUdfS01TKCJDYW5ub3QgZmluZCBz Y2FsZXIgZm9yICVzOiVkXG4iLCBuYW1lLCBpZHgpOwo+IC0JCQljb250aW51ZTsKPiAtCQl9Cj4g LQo+IC0JCS8qIHNldCBzY2FsZXIgbW9kZSAqLwo+IC0JCWlmICgoSU5URUxfR0VOKGRldl9wcml2 KSA+PSA5KSAmJgo+IC0JCSAgICBwbGFuZV9zdGF0ZSAmJiBwbGFuZV9zdGF0ZS0+YmFzZS5mYiAm Jgo+IC0JCSAgICBwbGFuZV9zdGF0ZS0+YmFzZS5mYi0+Zm9ybWF0LT5mb3JtYXQgPT0KPiAtCQkg ICAgRFJNX0ZPUk1BVF9OVjEyKSB7Cj4gLQkJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID09IDkg JiYKPiAtCQkJICAgICFJU19HRU1JTklMQUtFKGRldl9wcml2KSAmJgo+IC0JCQkgICAgIUlTX1NL WUxBS0UoZGV2X3ByaXYpKQo+IC0JCQkJc2NhbGVyX3N0YXRlLT5zY2FsZXJzWypzY2FsZXJfaWRd Lm1vZGUgPQo+IC0JCQkJCVNLTF9QU19TQ0FMRVJfTU9ERV9OVjEyOwo+IC0JCQllbHNlCj4gLQkJ CQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbKnNjYWxlcl9pZF0ubW9kZSA9Cj4gLQkJCQkJUFNfU0NB TEVSX01PREVfUExBTkFSOwo+IC0JCX0gZWxzZSBpZiAobnVtX3NjYWxlcnNfbmVlZCA9PSAxICYm IGludGVsX2NydGMtPnBpcGUgIT0gUElQRV9DKSB7Cj4gLQkJCS8qCj4gLQkJCSAqIHdoZW4gb25s eSAxIHNjYWxlciBpcyBpbiB1c2Ugb24gZWl0aGVyIHBpcGUgQSBvciBCLAo+IC0JCQkgKiBzY2Fs ZXIgMCBvcGVyYXRlcyBpbiBoaWdoIHF1YWxpdHkgKEhRKSBtb2RlLgo+IC0JCQkgKiBJbiB0aGlz IGNhc2UgdXNlIHNjYWxlciAwIHRvIHRha2UgYWR2YW50YWdlIG9mIEhRIG1vZGUKPiAtCQkJICov Cj4gLQkJCSpzY2FsZXJfaWQgPSAwOwo+IC0JCQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbMF0uaW5f dXNlID0gMTsKPiAtCQkJc2NhbGVyX3N0YXRlLT5zY2FsZXJzWzBdLm1vZGUgPSBQU19TQ0FMRVJf TU9ERV9IUTsKPiAtCQkJc2NhbGVyX3N0YXRlLT5zY2FsZXJzWzFdLmluX3VzZSA9IDA7Cj4gLQkJ fSBlbHNlIHsKPiAtCQkJc2NhbGVyX3N0YXRlLT5zY2FsZXJzWypzY2FsZXJfaWRdLm1vZGUgPSBQ U19TQ0FMRVJfTU9ERV9EWU47Cj4gLQkJfQo+ICsJCWludGVsX2F0b21pY19zZXR1cF9zY2FsZXIo c2NhbGVyX3N0YXRlLCBudW1fc2NhbGVyc19uZWVkLAo+ICsJCQkJCSAgaW50ZWxfY3J0YywgbmFt ZSwgaWR4LAo+ICsJCQkJCSAgcGxhbmVfc3RhdGUsIHNjYWxlcl9pZCk7Cj4gIAl9Cj4gIAo+ICAJ cmV0dXJuIDA7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IGluZGV4IDAyMzc0 MTg1Yjk5My4uOTMxODk4MDEzNTA2IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwo+IEBAIC0xMzk2Myw3ICsxMzk2Myw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfaW5p dF9zY2FsZXJzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAo+ICAJCXN0cnVjdCBpbnRlbF9zY2Fs ZXIgKnNjYWxlciA9ICZzY2FsZXJfc3RhdGUtPnNjYWxlcnNbaV07Cj4gIAo+ICAJCXNjYWxlci0+ aW5fdXNlID0gMDsKPiAtCQlzY2FsZXItPm1vZGUgPSBQU19TQ0FMRVJfTU9ERV9EWU47Cj4gKwkJ c2NhbGVyLT5tb2RlID0gMDsKPiAgCX0KPiAgCj4gIAlzY2FsZXJfc3RhdGUtPnNjYWxlcl9pZCA9 IC0xOwo+IC0tIAo+IDIuMTguMAo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCk1hdHQgUm9wZXIKR3JhcGhpY3MgU29mdHdhcmUgRW5n aW5lZXIKSW9URyBQbGF0Zm9ybSBFbmFibGluZyAmIERldmVsb3BtZW50CkludGVsIENvcnBvcmF0 aW9uCig5MTYpIDM1Ni0yNzk1Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=