From: Maarten Lankhorst Subject: [PATCH] drm/i915: Always read out M2_N2 in intel_cpu_transcoder_get_m_n, v2. Date: Mon, 15 Oct 2018 11:40:23 +0200 Message-ID: <20181015094023.6211-1-maarten.lankhorst@linux.intel.com> References: <20181011190938.GM9144@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 E487189DC9 for ; Mon, 15 Oct 2018 09:40:27 +0000 (UTC) In-Reply-To: <20181011190938.GM9144@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 aGFzX2RycnMgaXMgYSBmbGFnIHdlIGNhbid0IHJlYWQgb3V0LiBXZSBzZXQgaXQgd2hlbiBzZWFt bGVzcyBEUlJTIGlzCmVuYWJsZWQgaW4gcGlwZV9jb25maWcsIHNvIGludGVsX2R1bXBfcGlwZV9j b25maWcoKSBhbmQKaW50ZWxfcGlwZV9jb25maWdfY29tcGFyZSgpIHdpbGwgY29udGludWUgdG8g ZG8gdGhlIHJpZ2h0IHRoaW5nIHdoZW4KaGFzX2RycnMgaXMgc2V0IG9uIHRoZSByZWFsIHN0YXRl LgoKVGhpcyByZW1vdmVzIG9uZSBtb3JlIGRlcmVmZXJlbmNlIG9mIGNydGMtPmNvbmZpZy4KV2hp bGUgYXQgaXQsIGZpeHVwIHRoZSBjb21tZW50IGFuZCBhbHNvIHJlYWQgb3V0IE0yX04yIGZvciBD SFYsIHNpbmNlCndlIHByb2dyYW0gaXQgaW4gdGhlIHNldF9tX24gZnVuY3Rpb24uCgpDaGFuZ2Vz IHNpbmNlIHYxOgotIE9ubHkgcmVhZCBvdXQgTTIvTjIgb24gcGxhdGZvcm1zIHRoYXQgc3VwcG9y dCBEUlJTLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv cnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCAzMSArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MjAgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCmluZGV4IDY0YzFjNmY4ZTBmNC4uMWNhOTNjYjg5ODQyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC02NzY5LDYgKzY3NjksMTkgQEAgc3RhdGljIHZvaWQg aW50ZWxfcGNoX3RyYW5zY29kZXJfc2V0X21fbihjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGEKIAlJOTE1X1dSSVRFKFBDSF9UUkFOU19MSU5LX04xKHBpcGUpLCBtX24tPmxp bmtfbik7CiB9CiAKK3N0YXRpYyBib29sIHRyYW5zY29kZXJfaGFzX20yX24yKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCQkgZW51bSB0cmFuc2NvZGVyIHRyYW5zY29kZXIp Cit7CisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKQorCQlyZXR1cm4gdHJhbnNjb2RlciA9PSBU UkFOU0NPREVSX0VEUDsKKworCS8qCisJICogU3RyaWN0bHkgc3BlYWtpbmcgc29tZSByZWdpc3Rl cnMgYXJlIGF2YWlsYWJsZSBiZWZvcmUKKwkgKiBnZW43LCBidXQgd2Ugb25seSBzdXBwb3J0IERS UlMgb24gZ2VuNysKKwkgKi8KKwlyZXR1cm4gSVNfR0VONyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZ VklFVyhkZXZfcHJpdik7Cit9CisKIHN0YXRpYyB2b2lkIGludGVsX2NwdV90cmFuc2NvZGVyX3Nl dF9tX24oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkJCSBj b25zdCBzdHJ1Y3QgaW50ZWxfbGlua19tX24gKm1fbiwKIAkJCQkJIGNvbnN0IHN0cnVjdCBpbnRl bF9saW5rX21fbiAqbTJfbjIpCkBAIC02NzgzLDEyICs2Nzk2LDEyIEBAIHN0YXRpYyB2b2lkIGlu dGVsX2NwdV90cmFuc2NvZGVyX3NldF9tX24oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhCiAJCUk5MTVfV1JJVEUoUElQRV9EQVRBX04xKHRyYW5zY29kZXIpLCBtX24tPmdt Y2hfbik7CiAJCUk5MTVfV1JJVEUoUElQRV9MSU5LX00xKHRyYW5zY29kZXIpLCBtX24tPmxpbmtf bSk7CiAJCUk5MTVfV1JJVEUoUElQRV9MSU5LX04xKHRyYW5zY29kZXIpLCBtX24tPmxpbmtfbik7 Ci0JCS8qIE0yX04yIHJlZ2lzdGVycyB0byBiZSBzZXQgb25seSBmb3IgZ2VuIDwgOCAoTTJfTjIg YXZhaWxhYmxlCi0JCSAqIGZvciBnZW4gPCA4KSBhbmQgaWYgRFJSUyBpcyBzdXBwb3J0ZWQgKHRv IG1ha2Ugc3VyZSB0aGUKLQkJICogcmVnaXN0ZXJzIGFyZSBub3QgdW5uZWNlc3NhcmlseSBhY2Nl c3NlZCkuCisJCS8qCisJCSAqICBNMl9OMiByZWdpc3RlcnMgYXJlIHNldCBvbmx5IGlmIERSUlMg aXMgc3VwcG9ydGVkCisJCSAqICh0byBtYWtlIHN1cmUgdGhlIHJlZ2lzdGVycyBhcmUgbm90IHVu bmVjZXNzYXJpbHkgYWNjZXNzZWQpLgogCQkgKi8KLQkJaWYgKG0yX24yICYmIChJU19DSEVSUllW SUVXKGRldl9wcml2KSB8fAotCQkgICAgSU5URUxfR0VOKGRldl9wcml2KSA8IDgpICYmIGNydGNf c3RhdGUtPmhhc19kcnJzKSB7CisJCWlmIChtMl9uMiAmJiBjcnRjX3N0YXRlLT5oYXNfZHJycyAm JgorCQkgICAgdHJhbnNjb2Rlcl9oYXNfbTJfbjIoZGV2X3ByaXYsIHRyYW5zY29kZXIpKSB7CiAJ CQlJOTE1X1dSSVRFKFBJUEVfREFUQV9NMih0cmFuc2NvZGVyKSwKIAkJCQkJVFVfU0laRShtMl9u Mi0+dHUpIHwgbTJfbjItPmdtY2hfbSk7CiAJCQlJOTE1X1dSSVRFKFBJUEVfREFUQV9OMih0cmFu c2NvZGVyKSwgbTJfbjItPmdtY2hfbik7CkBAIC04NjM3LDEyICs4NjUwLDggQEAgc3RhdGljIHZv aWQgaW50ZWxfY3B1X3RyYW5zY29kZXJfZ2V0X21fbihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywK IAkJbV9uLT5nbWNoX24gPSBJOTE1X1JFQUQoUElQRV9EQVRBX04xKHRyYW5zY29kZXIpKTsKIAkJ bV9uLT50dSA9ICgoSTkxNV9SRUFEKFBJUEVfREFUQV9NMSh0cmFuc2NvZGVyKSkKIAkJCSAgICAm IFRVX1NJWkVfTUFTSykgPj4gVFVfU0laRV9TSElGVCkgKyAxOwotCQkvKiBSZWFkIE0yX04yIHJl Z2lzdGVycyBvbmx5IGZvciBnZW4gPCA4IChNMl9OMiBhdmFpbGFibGUgZm9yCi0JCSAqIGdlbiA8 IDgpIGFuZCBpZiBEUlJTIGlzIHN1cHBvcnRlZCAodG8gbWFrZSBzdXJlIHRoZQotCQkgKiByZWdp c3RlcnMgYXJlIG5vdCB1bm5lY2Vzc2FyaWx5IHJlYWQpLgotCQkgKi8KLQkJaWYgKG0yX24yICYm IElOVEVMX0dFTihkZXZfcHJpdikgPCA4ICYmCi0JCQljcnRjLT5jb25maWctPmhhc19kcnJzKSB7 CisKKwkJaWYgKG0yX24yICYmIHRyYW5zY29kZXJfaGFzX20yX24yKGRldl9wcml2LCB0cmFuc2Nv ZGVyKSkgewogCQkJbTJfbjItPmxpbmtfbSA9IEk5MTVfUkVBRChQSVBFX0xJTktfTTIodHJhbnNj b2RlcikpOwogCQkJbTJfbjItPmxpbmtfbiA9CUk5MTVfUkVBRChQSVBFX0xJTktfTjIodHJhbnNj b2RlcikpOwogCQkJbTJfbjItPmdtY2hfbSA9CUk5MTVfUkVBRChQSVBFX0RBVEFfTTIodHJhbnNj b2RlcikpCi0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=