From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 05/15] drm/i915: Clean up scaler setup. Date: Wed, 19 Sep 2018 15:56:34 +0200 Message-ID: <20180919135644.14182-6-maarten.lankhorst@linux.intel.com> References: <20180919135644.14182-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id BEAC36E4FD for ; Wed, 19 Sep 2018 13:56:53 +0000 (UTC) In-Reply-To: <20180919135644.14182-1-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gc2t5bGFrZSB3ZSBjYW4gc3dpdGNoIHRvIGEgaGlnaCBxdWFsaXR5IHNjYWxlciBtb2RlIHdo ZW4gb25seSAxIG91dApvZiAyIHNjYWxlcnMgYXJlIHVzZWQsIGJ1dCBvbiBHTEsgYW5kIGxhdGVy IGJpdCAyOCBoYXMgYSBkaWZmZXJlbnQKbWVhbmluZy4gRG9uJ3Qgc2V0IGl0LCBhbmQgbWFrZSBj bGVhciB0aGUgZGlzdGluY3Rpb24gYmV0d2VlbgpTS0wgYW5kIGxhdGVyIFBTIHZhbHVlcy4KClNp Z25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5p bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCAgICAgIHwgICA3 ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyAgfCAxMDggKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCAgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgNjYgaW5zZXJ0aW9ucygrKSwgNTEgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggNDk0OGIzNTJiZjRjLi5lN2U2Y2E3Zjk2 NjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtNjg1MCwxMSArNjg1MCwxMiBAQCBlbnVt IHsKICNkZWZpbmUgX1BTXzJCX0NUUkwgICAgICAweDY4QTgwCiAjZGVmaW5lIF9QU18xQ19DVFJM ICAgICAgMHg2OTE4MAogI2RlZmluZSBQU19TQ0FMRVJfRU4gICAgICAgICgxIDw8IDMxKQotI2Rl ZmluZSBQU19TQ0FMRVJfTU9ERV9NQVNLICgzIDw8IDI4KQotI2RlZmluZSBQU19TQ0FMRVJfTU9E RV9EWU4gICgwIDw8IDI4KQotI2RlZmluZSBQU19TQ0FMRVJfTU9ERV9IUSAgKDEgPDwgMjgpCisj ZGVmaW5lIFNLTF9QU19TQ0FMRVJfTU9ERV9NQVNLICgzIDw8IDI4KQorI2RlZmluZSBTS0xfUFNf U0NBTEVSX01PREVfRFlOICAoMCA8PCAyOCkKKyNkZWZpbmUgU0tMX1BTX1NDQUxFUl9NT0RFX0hR ICAoMSA8PCAyOCkKICNkZWZpbmUgU0tMX1BTX1NDQUxFUl9NT0RFX05WMTIgKDIgPDwgMjgpCiAj ZGVmaW5lIFBTX1NDQUxFUl9NT0RFX1BMQU5BUiAoMSA8PCAyOSkKKyNkZWZpbmUgUFNfU0NBTEVS X01PREVfUEFDS0VEICgwIDw8IDI5KQogI2RlZmluZSBQU19QTEFORV9TRUxfTUFTSyAgKDcgPDwg MjUpCiAjZGVmaW5lIFBTX1BMQU5FX1NFTChwbGFuZSkgKCgocGxhbmUpICsgMSkgPDwgMjUpCiAj ZGVmaW5lIFBTX0ZJTFRFUl9NQVNLICAgICAgICAgKDMgPDwgMjMpCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2F0b21pYy5jCmluZGV4IGIwNDk1MmJhY2Y3Ny4uNDBmYmEzZjIyZjg3IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9hdG9taWMuYwpAQCAtMjAzLDYgKzIwMyw2MiBAQCBpbnRlbF9jcnRjX2Rl c3Ryb3lfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWRybV9hdG9taWNfaGVscGVyX2Ny dGNfZGVzdHJveV9zdGF0ZShjcnRjLCBzdGF0ZSk7CiB9CiAKK3N0YXRpYyB2b2lkIGludGVsX2F0 b21pY19zZXR1cF9zY2FsZXIoc3RydWN0IGludGVsX2NydGNfc2NhbGVyX3N0YXRlICpzY2FsZXJf c3RhdGUsCisJCQkJICAgICAgaW50IG51bV9zY2FsZXJzX25lZWQsIHN0cnVjdCBpbnRlbF9jcnRj ICppbnRlbF9jcnRjLAorCQkJCSAgICAgIGNvbnN0IGNoYXIgKm5hbWUsIGludCBpZHgsCisJCQkJ ICAgICAgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSwKKwkJCQkgICAgICBp bnQgKnNjYWxlcl9pZCkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGludGVsX2NydGMtPmJhc2UuZGV2KTsKKwlpbnQgajsKKwl1MzIgbW9kZTsKKworCWlm ICgqc2NhbGVyX2lkIDwgMCkgeworCQkvKiBmaW5kIGEgZnJlZSBzY2FsZXIgKi8KKwkJZm9yIChq ID0gMDsgaiA8IGludGVsX2NydGMtPm51bV9zY2FsZXJzOyBqKyspIHsKKwkJCWlmIChzY2FsZXJf c3RhdGUtPnNjYWxlcnNbal0uaW5fdXNlKQorCQkJCWNvbnRpbnVlOworCisJCQkqc2NhbGVyX2lk ID0gajsKKwkJCXNjYWxlcl9zdGF0ZS0+c2NhbGVyc1sqc2NhbGVyX2lkXS5pbl91c2UgPSAxOwor CQl9CisJfQorCisJaWYgKFdBUk4oKnNjYWxlcl9pZCA8IDAsICJDYW5ub3QgZmluZCBzY2FsZXIg Zm9yICVzOiVkXG4iLCBuYW1lLCBpZHgpKQorCQlyZXR1cm47CisKKwkvKiBzZXQgc2NhbGVyIG1v ZGUgKi8KKwlpZiAocGxhbmVfc3RhdGUgJiYgcGxhbmVfc3RhdGUtPmJhc2UuZmIgJiYKKwkgICAg cGxhbmVfc3RhdGUtPmJhc2UuZmItPmZvcm1hdC0+aXNfeXV2ICYmCisJICAgIHBsYW5lX3N0YXRl LT5iYXNlLmZiLT5mb3JtYXQtPm51bV9wbGFuZXMgPiAxKSB7CisJCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID09IDkgJiYKKwkJICAgICFJU19HRU1JTklMQUtFKGRldl9wcml2KSkKKwkJCW1vZGUg PSBTS0xfUFNfU0NBTEVSX01PREVfTlYxMjsKKwkJZWxzZQorCQkJbW9kZSA9IFBTX1NDQUxFUl9N T0RFX1BMQU5BUjsKKworCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+IDkgfHwgSVNf R0VNSU5JTEFLRShkZXZfcHJpdikpIHsKKwkJbW9kZSA9IFBTX1NDQUxFUl9NT0RFX1BBQ0tFRDsK Kwl9IGVsc2UgaWYgKG51bV9zY2FsZXJzX25lZWQgPT0gMSAmJiBpbnRlbF9jcnRjLT5udW1fc2Nh bGVycyA+IDEpIHsKKwkJLyoKKwkJICogd2hlbiBvbmx5IDEgc2NhbGVyIGlzIGluIHVzZSBvbiBh IHBpcGUgd2l0aCAyIHNjYWxlcnMKKwkJICogc2NhbGVyIDAgb3BlcmF0ZXMgaW4gaGlnaCBxdWFs aXR5IChIUSkgbW9kZS4KKwkJICogSW4gdGhpcyBjYXNlIHVzZSBzY2FsZXIgMCB0byB0YWtlIGFk dmFudGFnZSBvZiBIUSBtb2RlCisJCSAqLworCQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbKnNjYWxl cl9pZF0uaW5fdXNlID0gMDsKKwkJKnNjYWxlcl9pZCA9IDA7CisJCXNjYWxlcl9zdGF0ZS0+c2Nh bGVyc1swXS5pbl91c2UgPSAxOworCQltb2RlID0gU0tMX1BTX1NDQUxFUl9NT0RFX0hROworCX0g ZWxzZSB7CisJCW1vZGUgPSBTS0xfUFNfU0NBTEVSX01PREVfRFlOOworCX0KKworCURSTV9ERUJV R19LTVMoIkF0dGFjaGVkIHNjYWxlciBpZCAldS4ldSB0byAlczolZFxuIiwKKwkJICAgICAgaW50 ZWxfY3J0Yy0+cGlwZSwgKnNjYWxlcl9pZCwgbmFtZSwgaWR4KTsKKwlzY2FsZXJfc3RhdGUtPnNj YWxlcnNbKnNjYWxlcl9pZF0ubW9kZSA9IG1vZGU7Cit9CisKKwogLyoqCiAgKiBpbnRlbF9hdG9t aWNfc2V0dXBfc2NhbGVycygpIC0gc2V0dXAgc2NhbGVycyBmb3IgY3J0YyBwZXIgc3RhZ2VkIHJl cXVlc3RzCiAgKiBAZGV2X3ByaXY6IGk5MTUgZGV2aWNlCkBAIC0yMzIsNyArMjg4LDcgQEAgaW50 IGludGVsX2F0b21pY19zZXR1cF9zY2FsZXJzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqZHJtX3N0YXRlID0gY3J0Y19zdGF0ZS0+ YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICppbnRlbF9zdGF0ZSA9IHRv X2ludGVsX2F0b21pY19zdGF0ZShkcm1fc3RhdGUpOwogCWludCBudW1fc2NhbGVyc19uZWVkOwot CWludCBpLCBqOworCWludCBpOwogCiAJbnVtX3NjYWxlcnNfbmVlZCA9IGh3ZWlnaHQzMihzY2Fs ZXJfc3RhdGUtPnNjYWxlcl91c2Vycyk7CiAKQEAgLTMwNCw1OSArMzYwLDE3IEBAIGludCBpbnRl bF9hdG9taWNfc2V0dXBfc2NhbGVycyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CiAJCQlpZHggPSBwbGFuZS0+YmFzZS5pZDsKIAogCQkJLyogcGxhbmUgb24gZGlmZmVyZW50IGNy dGMgY2Fubm90IGJlIGEgc2NhbGVyIHVzZXIgb2YgdGhpcyBjcnRjICovCi0JCQlpZiAoV0FSTl9P TihpbnRlbF9wbGFuZS0+cGlwZSAhPSBpbnRlbF9jcnRjLT5waXBlKSkgeworCQkJaWYgKFdBUk5f T04oaW50ZWxfcGxhbmUtPnBpcGUgIT0gaW50ZWxfY3J0Yy0+cGlwZSkpCiAJCQkJY29udGludWU7 Ci0JCQl9CiAKIAkJCXBsYW5lX3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9uZXdfcGxhbmVfc3Rh dGUoaW50ZWxfc3RhdGUsCiAJCQkJCQkJCSAgICAgICBpbnRlbF9wbGFuZSk7CiAJCQlzY2FsZXJf aWQgPSAmcGxhbmVfc3RhdGUtPnNjYWxlcl9pZDsKIAkJfQogCi0JCWlmICgqc2NhbGVyX2lkIDwg MCkgewotCQkJLyogZmluZCBhIGZyZWUgc2NhbGVyICovCi0JCQlmb3IgKGogPSAwOyBqIDwgaW50 ZWxfY3J0Yy0+bnVtX3NjYWxlcnM7IGorKykgewotCQkJCWlmICghc2NhbGVyX3N0YXRlLT5zY2Fs ZXJzW2pdLmluX3VzZSkgewotCQkJCQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbal0uaW5fdXNlID0g MTsKLQkJCQkJKnNjYWxlcl9pZCA9IGo7Ci0JCQkJCURSTV9ERUJVR19LTVMoIkF0dGFjaGVkIHNj YWxlciBpZCAldS4ldSB0byAlczolZFxuIiwKLQkJCQkJCWludGVsX2NydGMtPnBpcGUsICpzY2Fs ZXJfaWQsIG5hbWUsIGlkeCk7Ci0JCQkJCWJyZWFrOwotCQkJCX0KLQkJCX0KLQkJfQotCi0JCWlm IChXQVJOX09OKCpzY2FsZXJfaWQgPCAwKSkgewotCQkJRFJNX0RFQlVHX0tNUygiQ2Fubm90IGZp bmQgc2NhbGVyIGZvciAlczolZFxuIiwgbmFtZSwgaWR4KTsKLQkJCWNvbnRpbnVlOwotCQl9Ci0K LQkJLyogc2V0IHNjYWxlciBtb2RlICovCi0JCWlmICgoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5 KSAmJgotCQkgICAgcGxhbmVfc3RhdGUgJiYgcGxhbmVfc3RhdGUtPmJhc2UuZmIgJiYKLQkJICAg IHBsYW5lX3N0YXRlLT5iYXNlLmZiLT5mb3JtYXQtPmZvcm1hdCA9PQotCQkgICAgRFJNX0ZPUk1B VF9OVjEyKSB7Ci0JCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA9PSA5ICYmCi0JCQkgICAgIUlT X0dFTUlOSUxBS0UoZGV2X3ByaXYpICYmCi0JCQkgICAgIUlTX1NLWUxBS0UoZGV2X3ByaXYpKQot CQkJCXNjYWxlcl9zdGF0ZS0+c2NhbGVyc1sqc2NhbGVyX2lkXS5tb2RlID0KLQkJCQkJU0tMX1BT X1NDQUxFUl9NT0RFX05WMTI7Ci0JCQllbHNlCi0JCQkJc2NhbGVyX3N0YXRlLT5zY2FsZXJzWypz Y2FsZXJfaWRdLm1vZGUgPQotCQkJCQlQU19TQ0FMRVJfTU9ERV9QTEFOQVI7Ci0JCX0gZWxzZSBp ZiAobnVtX3NjYWxlcnNfbmVlZCA9PSAxICYmIGludGVsX2NydGMtPnBpcGUgIT0gUElQRV9DKSB7 Ci0JCQkvKgotCQkJICogd2hlbiBvbmx5IDEgc2NhbGVyIGlzIGluIHVzZSBvbiBlaXRoZXIgcGlw ZSBBIG9yIEIsCi0JCQkgKiBzY2FsZXIgMCBvcGVyYXRlcyBpbiBoaWdoIHF1YWxpdHkgKEhRKSBt b2RlLgotCQkJICogSW4gdGhpcyBjYXNlIHVzZSBzY2FsZXIgMCB0byB0YWtlIGFkdmFudGFnZSBv ZiBIUSBtb2RlCi0JCQkgKi8KLQkJCSpzY2FsZXJfaWQgPSAwOwotCQkJc2NhbGVyX3N0YXRlLT5z Y2FsZXJzWzBdLmluX3VzZSA9IDE7Ci0JCQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbMF0ubW9kZSA9 IFBTX1NDQUxFUl9NT0RFX0hROwotCQkJc2NhbGVyX3N0YXRlLT5zY2FsZXJzWzFdLmluX3VzZSA9 IDA7Ci0JCX0gZWxzZSB7Ci0JCQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbKnNjYWxlcl9pZF0ubW9k ZSA9IFBTX1NDQUxFUl9NT0RFX0RZTjsKLQkJfQorCQlpbnRlbF9hdG9taWNfc2V0dXBfc2NhbGVy KHNjYWxlcl9zdGF0ZSwgbnVtX3NjYWxlcnNfbmVlZCwKKwkJCQkJICBpbnRlbF9jcnRjLCBuYW1l LCBpZHgsCisJCQkJCSAgcGxhbmVfc3RhdGUsIHNjYWxlcl9pZCk7CiAJfQogCiAJcmV0dXJuIDA7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMzk3NWYzYWY0ZmI0Li41YTc3 ZDc2MTVmYTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzOTU0LDcg KzEzOTU0LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19pbml0X3NjYWxlcnMoc3RydWN0IGlu dGVsX2NydGMgKmNydGMsCiAJCXN0cnVjdCBpbnRlbF9zY2FsZXIgKnNjYWxlciA9ICZzY2FsZXJf c3RhdGUtPnNjYWxlcnNbaV07CiAKIAkJc2NhbGVyLT5pbl91c2UgPSAwOwotCQlzY2FsZXItPm1v ZGUgPSBQU19TQ0FMRVJfTU9ERV9EWU47CisJCXNjYWxlci0+bW9kZSA9IDA7CiAJfQogCiAJc2Nh bGVyX3N0YXRlLT5zY2FsZXJfaWQgPSAtMTsKLS0gCjIuMTguMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==