From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/i915: Clean up scaler setup, v2. Date: Fri, 21 Sep 2018 16:44:37 +0200 Message-ID: <20180921144437.20037-1-maarten.lankhorst@linux.intel.com> References: <20180920231916.GL31331@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 mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id A768C6E7A3 for ; Fri, 21 Sep 2018 14:44:40 +0000 (UTC) In-Reply-To: <20180920231916.GL31331@mdroper-desk.amr.corp.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 bGVhciB0aGUgZGlzdGluY3Rpb24gYmV0d2VlbgpTS0wgYW5kIGxhdGVyIFBTIHZhbHVlcy4KCkNo YW5nZXMgc2luY2UgdjE6Ci0gQWRkIG1pc3NpbmcgYnJlYWsgc3RhdGVtZW50LgoKU2lnbmVkLW9m Zi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv bT4KUmV2aWV3ZWQtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ICN2 MQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggICAgICB8ICAgNyArLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgIHwgMTA5ICsrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgICAyICst CiAzIGZpbGVzIGNoYW5nZWQsIDY3IGluc2VydGlvbnMoKyksIDUxIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3JlZy5oCmluZGV4IDQ5NDhiMzUyYmY0Yy4uZTdlNmNhN2Y5NjY1IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTY4NTAsMTEgKzY4NTAsMTIgQEAgZW51bSB7CiAjZGVm aW5lIF9QU18yQl9DVFJMICAgICAgMHg2OEE4MAogI2RlZmluZSBfUFNfMUNfQ1RSTCAgICAgIDB4 NjkxODAKICNkZWZpbmUgUFNfU0NBTEVSX0VOICAgICAgICAoMSA8PCAzMSkKLSNkZWZpbmUgUFNf U0NBTEVSX01PREVfTUFTSyAoMyA8PCAyOCkKLSNkZWZpbmUgUFNfU0NBTEVSX01PREVfRFlOICAo MCA8PCAyOCkKLSNkZWZpbmUgUFNfU0NBTEVSX01PREVfSFEgICgxIDw8IDI4KQorI2RlZmluZSBT S0xfUFNfU0NBTEVSX01PREVfTUFTSyAoMyA8PCAyOCkKKyNkZWZpbmUgU0tMX1BTX1NDQUxFUl9N T0RFX0RZTiAgKDAgPDwgMjgpCisjZGVmaW5lIFNLTF9QU19TQ0FMRVJfTU9ERV9IUSAgKDEgPDwg MjgpCiAjZGVmaW5lIFNLTF9QU19TQ0FMRVJfTU9ERV9OVjEyICgyIDw8IDI4KQogI2RlZmluZSBQ U19TQ0FMRVJfTU9ERV9QTEFOQVIgKDEgPDwgMjkpCisjZGVmaW5lIFBTX1NDQUxFUl9NT0RFX1BB Q0tFRCAoMCA8PCAyOSkKICNkZWZpbmUgUFNfUExBTkVfU0VMX01BU0sgICg3IDw8IDI1KQogI2Rl ZmluZSBQU19QTEFORV9TRUwocGxhbmUpICgoKHBsYW5lKSArIDEpIDw8IDI1KQogI2RlZmluZSBQ U19GSUxURVJfTUFTSyAgICAgICAgICgzIDw8IDIzKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9t aWMuYwppbmRleCBiMDQ5NTJiYWNmNzcuLmMyM2E2ZWM0MGY2MCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfYXRvbWljLmMKQEAgLTIwMyw2ICsyMDMsNjMgQEAgaW50ZWxfY3J0Y19kZXN0cm95X3N0 YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlkcm1fYXRvbWljX2hlbHBlcl9jcnRjX2Rlc3Ry b3lfc3RhdGUoY3J0Yywgc3RhdGUpOwogfQogCitzdGF0aWMgdm9pZCBpbnRlbF9hdG9taWNfc2V0 dXBfc2NhbGVyKHN0cnVjdCBpbnRlbF9jcnRjX3NjYWxlcl9zdGF0ZSAqc2NhbGVyX3N0YXRlLAor CQkJCSAgICAgIGludCBudW1fc2NhbGVyc19uZWVkLCBzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxf Y3J0YywKKwkJCQkgICAgICBjb25zdCBjaGFyICpuYW1lLCBpbnQgaWR4LAorCQkJCSAgICAgIHN0 cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUsCisJCQkJICAgICAgaW50ICpzY2Fs ZXJfaWQpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShp bnRlbF9jcnRjLT5iYXNlLmRldik7CisJaW50IGo7CisJdTMyIG1vZGU7CisKKwlpZiAoKnNjYWxl cl9pZCA8IDApIHsKKwkJLyogZmluZCBhIGZyZWUgc2NhbGVyICovCisJCWZvciAoaiA9IDA7IGog PCBpbnRlbF9jcnRjLT5udW1fc2NhbGVyczsgaisrKSB7CisJCQlpZiAoc2NhbGVyX3N0YXRlLT5z Y2FsZXJzW2pdLmluX3VzZSkKKwkJCQljb250aW51ZTsKKworCQkJKnNjYWxlcl9pZCA9IGo7CisJ CQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbKnNjYWxlcl9pZF0uaW5fdXNlID0gMTsKKwkJCWJyZWFr OworCQl9CisJfQorCisJaWYgKFdBUk4oKnNjYWxlcl9pZCA8IDAsICJDYW5ub3QgZmluZCBzY2Fs ZXIgZm9yICVzOiVkXG4iLCBuYW1lLCBpZHgpKQorCQlyZXR1cm47CisKKwkvKiBzZXQgc2NhbGVy IG1vZGUgKi8KKwlpZiAocGxhbmVfc3RhdGUgJiYgcGxhbmVfc3RhdGUtPmJhc2UuZmIgJiYKKwkg ICAgcGxhbmVfc3RhdGUtPmJhc2UuZmItPmZvcm1hdC0+aXNfeXV2ICYmCisJICAgIHBsYW5lX3N0 YXRlLT5iYXNlLmZiLT5mb3JtYXQtPm51bV9wbGFuZXMgPiAxKSB7CisJCWlmIChJTlRFTF9HRU4o ZGV2X3ByaXYpID09IDkgJiYKKwkJICAgICFJU19HRU1JTklMQUtFKGRldl9wcml2KSkKKwkJCW1v ZGUgPSBTS0xfUFNfU0NBTEVSX01PREVfTlYxMjsKKwkJZWxzZQorCQkJbW9kZSA9IFBTX1NDQUxF Ul9NT0RFX1BMQU5BUjsKKworCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+IDkgfHwg SVNfR0VNSU5JTEFLRShkZXZfcHJpdikpIHsKKwkJbW9kZSA9IFBTX1NDQUxFUl9NT0RFX1BBQ0tF RDsKKwl9IGVsc2UgaWYgKG51bV9zY2FsZXJzX25lZWQgPT0gMSAmJiBpbnRlbF9jcnRjLT5udW1f c2NhbGVycyA+IDEpIHsKKwkJLyoKKwkJICogd2hlbiBvbmx5IDEgc2NhbGVyIGlzIGluIHVzZSBv biBhIHBpcGUgd2l0aCAyIHNjYWxlcnMKKwkJICogc2NhbGVyIDAgb3BlcmF0ZXMgaW4gaGlnaCBx dWFsaXR5IChIUSkgbW9kZS4KKwkJICogSW4gdGhpcyBjYXNlIHVzZSBzY2FsZXIgMCB0byB0YWtl IGFkdmFudGFnZSBvZiBIUSBtb2RlCisJCSAqLworCQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbKnNj YWxlcl9pZF0uaW5fdXNlID0gMDsKKwkJKnNjYWxlcl9pZCA9IDA7CisJCXNjYWxlcl9zdGF0ZS0+ c2NhbGVyc1swXS5pbl91c2UgPSAxOworCQltb2RlID0gU0tMX1BTX1NDQUxFUl9NT0RFX0hROwor CX0gZWxzZSB7CisJCW1vZGUgPSBTS0xfUFNfU0NBTEVSX01PREVfRFlOOworCX0KKworCURSTV9E RUJVR19LTVMoIkF0dGFjaGVkIHNjYWxlciBpZCAldS4ldSB0byAlczolZFxuIiwKKwkJICAgICAg aW50ZWxfY3J0Yy0+cGlwZSwgKnNjYWxlcl9pZCwgbmFtZSwgaWR4KTsKKwlzY2FsZXJfc3RhdGUt PnNjYWxlcnNbKnNjYWxlcl9pZF0ubW9kZSA9IG1vZGU7Cit9CisKKwogLyoqCiAgKiBpbnRlbF9h dG9taWNfc2V0dXBfc2NhbGVycygpIC0gc2V0dXAgc2NhbGVycyBmb3IgY3J0YyBwZXIgc3RhZ2Vk IHJlcXVlc3RzCiAgKiBAZGV2X3ByaXY6IGk5MTUgZGV2aWNlCkBAIC0yMzIsNyArMjg5LDcgQEAg aW50IGludGVsX2F0b21pY19zZXR1cF9zY2FsZXJzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqZHJtX3N0YXRlID0gY3J0Y19zdGF0 ZS0+YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICppbnRlbF9zdGF0ZSA9 IHRvX2ludGVsX2F0b21pY19zdGF0ZShkcm1fc3RhdGUpOwogCWludCBudW1fc2NhbGVyc19uZWVk OwotCWludCBpLCBqOworCWludCBpOwogCiAJbnVtX3NjYWxlcnNfbmVlZCA9IGh3ZWlnaHQzMihz Y2FsZXJfc3RhdGUtPnNjYWxlcl91c2Vycyk7CiAKQEAgLTMwNCw1OSArMzYxLDE3IEBAIGludCBp bnRlbF9hdG9taWNfc2V0dXBfc2NhbGVycyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAJCQlpZHggPSBwbGFuZS0+YmFzZS5pZDsKIAogCQkJLyogcGxhbmUgb24gZGlmZmVyZW50 IGNydGMgY2Fubm90IGJlIGEgc2NhbGVyIHVzZXIgb2YgdGhpcyBjcnRjICovCi0JCQlpZiAoV0FS Tl9PTihpbnRlbF9wbGFuZS0+cGlwZSAhPSBpbnRlbF9jcnRjLT5waXBlKSkgeworCQkJaWYgKFdB Uk5fT04oaW50ZWxfcGxhbmUtPnBpcGUgIT0gaW50ZWxfY3J0Yy0+cGlwZSkpCiAJCQkJY29udGlu dWU7Ci0JCQl9CiAKIAkJCXBsYW5lX3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9uZXdfcGxhbmVf c3RhdGUoaW50ZWxfc3RhdGUsCiAJCQkJCQkJCSAgICAgICBpbnRlbF9wbGFuZSk7CiAJCQlzY2Fs ZXJfaWQgPSAmcGxhbmVfc3RhdGUtPnNjYWxlcl9pZDsKIAkJfQogCi0JCWlmICgqc2NhbGVyX2lk IDwgMCkgewotCQkJLyogZmluZCBhIGZyZWUgc2NhbGVyICovCi0JCQlmb3IgKGogPSAwOyBqIDwg aW50ZWxfY3J0Yy0+bnVtX3NjYWxlcnM7IGorKykgewotCQkJCWlmICghc2NhbGVyX3N0YXRlLT5z Y2FsZXJzW2pdLmluX3VzZSkgewotCQkJCQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbal0uaW5fdXNl ID0gMTsKLQkJCQkJKnNjYWxlcl9pZCA9IGo7Ci0JCQkJCURSTV9ERUJVR19LTVMoIkF0dGFjaGVk IHNjYWxlciBpZCAldS4ldSB0byAlczolZFxuIiwKLQkJCQkJCWludGVsX2NydGMtPnBpcGUsICpz Y2FsZXJfaWQsIG5hbWUsIGlkeCk7Ci0JCQkJCWJyZWFrOwotCQkJCX0KLQkJCX0KLQkJfQotCi0J CWlmIChXQVJOX09OKCpzY2FsZXJfaWQgPCAwKSkgewotCQkJRFJNX0RFQlVHX0tNUygiQ2Fubm90 IGZpbmQgc2NhbGVyIGZvciAlczolZFxuIiwgbmFtZSwgaWR4KTsKLQkJCWNvbnRpbnVlOwotCQl9 Ci0KLQkJLyogc2V0IHNjYWxlciBtb2RlICovCi0JCWlmICgoSU5URUxfR0VOKGRldl9wcml2KSA+ PSA5KSAmJgotCQkgICAgcGxhbmVfc3RhdGUgJiYgcGxhbmVfc3RhdGUtPmJhc2UuZmIgJiYKLQkJ ICAgIHBsYW5lX3N0YXRlLT5iYXNlLmZiLT5mb3JtYXQtPmZvcm1hdCA9PQotCQkgICAgRFJNX0ZP Uk1BVF9OVjEyKSB7Ci0JCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA9PSA5ICYmCi0JCQkgICAg IUlTX0dFTUlOSUxBS0UoZGV2X3ByaXYpICYmCi0JCQkgICAgIUlTX1NLWUxBS0UoZGV2X3ByaXYp KQotCQkJCXNjYWxlcl9zdGF0ZS0+c2NhbGVyc1sqc2NhbGVyX2lkXS5tb2RlID0KLQkJCQkJU0tM X1BTX1NDQUxFUl9NT0RFX05WMTI7Ci0JCQllbHNlCi0JCQkJc2NhbGVyX3N0YXRlLT5zY2FsZXJz WypzY2FsZXJfaWRdLm1vZGUgPQotCQkJCQlQU19TQ0FMRVJfTU9ERV9QTEFOQVI7Ci0JCX0gZWxz ZSBpZiAobnVtX3NjYWxlcnNfbmVlZCA9PSAxICYmIGludGVsX2NydGMtPnBpcGUgIT0gUElQRV9D KSB7Ci0JCQkvKgotCQkJICogd2hlbiBvbmx5IDEgc2NhbGVyIGlzIGluIHVzZSBvbiBlaXRoZXIg cGlwZSBBIG9yIEIsCi0JCQkgKiBzY2FsZXIgMCBvcGVyYXRlcyBpbiBoaWdoIHF1YWxpdHkgKEhR KSBtb2RlLgotCQkJICogSW4gdGhpcyBjYXNlIHVzZSBzY2FsZXIgMCB0byB0YWtlIGFkdmFudGFn ZSBvZiBIUSBtb2RlCi0JCQkgKi8KLQkJCSpzY2FsZXJfaWQgPSAwOwotCQkJc2NhbGVyX3N0YXRl LT5zY2FsZXJzWzBdLmluX3VzZSA9IDE7Ci0JCQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbMF0ubW9k ZSA9IFBTX1NDQUxFUl9NT0RFX0hROwotCQkJc2NhbGVyX3N0YXRlLT5zY2FsZXJzWzFdLmluX3Vz ZSA9IDA7Ci0JCX0gZWxzZSB7Ci0JCQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbKnNjYWxlcl9pZF0u bW9kZSA9IFBTX1NDQUxFUl9NT0RFX0RZTjsKLQkJfQorCQlpbnRlbF9hdG9taWNfc2V0dXBfc2Nh bGVyKHNjYWxlcl9zdGF0ZSwgbnVtX3NjYWxlcnNfbmVlZCwKKwkJCQkJICBpbnRlbF9jcnRjLCBu YW1lLCBpZHgsCisJCQkJCSAgcGxhbmVfc3RhdGUsIHNjYWxlcl9pZCk7CiAJfQogCiAJcmV0dXJu IDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMDIzNzQxODViOTkzLi45 MzE4OTgwMTM1MDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzOTYz LDcgKzEzOTYzLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19pbml0X3NjYWxlcnMoc3RydWN0 IGludGVsX2NydGMgKmNydGMsCiAJCXN0cnVjdCBpbnRlbF9zY2FsZXIgKnNjYWxlciA9ICZzY2Fs ZXJfc3RhdGUtPnNjYWxlcnNbaV07CiAKIAkJc2NhbGVyLT5pbl91c2UgPSAwOwotCQlzY2FsZXIt Pm1vZGUgPSBQU19TQ0FMRVJfTU9ERV9EWU47CisJCXNjYWxlci0+bW9kZSA9IDA7CiAJfQogCiAJ c2NhbGVyX3N0YXRlLT5zY2FsZXJfaWQgPSAtMTsKLS0gCjIuMTguMAoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==