From: Ville Syrjala Subject: [PATCH 3/5] drm/i915: Check for IVB instead of gen7 when we think about IVB CPU eDP Date: Thu, 17 May 2018 20:03:07 +0300 Message-ID: <20180517170309.28630-3-ville.syrjala@linux.intel.com> References: <20180517170309.28630-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id AFD826EAF2 for ; Thu, 17 May 2018 17:03:18 +0000 (UTC) In-Reply-To: <20180517170309.28630-1-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkFs bW9zdCBhbGwgb2YgdGhlIEdFTjcgY2hlY2tzIGluIHRoZSBEUCBjb2RlIGFyZSBhY3R1YWxseSBs b29raW5nIGZvcgpJVkIuIEhTVyBkb2Vzbid0IGV2ZW4gdGFrZSB0aGVzZSBjb2RlcGF0aHMsIGFu ZCBWTFYgaXMgZXhjbHVkZWQgb24KYWNjb3VudCBvZiBub3QgaGF2aW5nIHBvcnQgQS4gU28gbGV0 J3MgY2hhbmdlIHRoZSBjaGVja3MgdG8gSVNfSVZCIHRvCm1ha2UgdGhlIGNvZGUgbGVzcyBjb25m dXNpbmcuCgpSZXZpZXdlZC1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4K U2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIHwgMTQgKysrKysrKy0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggNTM4YjEwMDg0YTlkLi4yNjNlNGIxZDFkYjkgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtMTk4OSw3ICsxOTg5LDcgQEAgc3RhdGljIHZvaWQg aW50ZWxfZHBfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAogCS8qIFNw bGl0IG91dCB0aGUgSUJYL0NQVSB2cyBDUFQgc2V0dGluZ3MgKi8KIAotCWlmIChJU19HRU43KGRl dl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkgeworCWlmIChJU19JVllCUklER0UoZGV2X3ByaXYp ICYmIHBvcnQgPT0gUE9SVF9BKSB7CiAJCWlmIChhZGp1c3RlZF9tb2RlLT5mbGFncyAmIERSTV9N T0RFX0ZMQUdfUEhTWU5DKQogCQkJaW50ZWxfZHAtPkRQIHw9IERQX1NZTkNfSFNfSElHSDsKIAkJ aWYgKGFkanVzdGVkX21vZGUtPmZsYWdzICYgRFJNX01PREVfRkxBR19QVlNZTkMpCkBAIC0yNjY5 LDcgKzI2NjksNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9kcF9nZXRfaHdfc3RhdGUoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIsCiAJaWYgKCEodG1wICYgRFBfUE9SVF9FTikpCiAJCWdvdG8g b3V0OwogCi0JaWYgKElTX0dFTjcoZGV2X3ByaXYpICYmIHBvcnQgPT0gUE9SVF9BKSB7CisJaWYg KElTX0lWWUJSSURHRShkZXZfcHJpdikgJiYgcG9ydCA9PSBQT1JUX0EpIHsKIAkJKnBpcGUgPSBQ T1JUX1RPX1BJUEVfQ1BUKHRtcCk7CiAJfSBlbHNlIGlmIChIQVNfUENIX0NQVChkZXZfcHJpdikg JiYgcG9ydCAhPSBQT1JUX0EpIHsKIAkJZW51bSBwaXBlIHA7CkBAIC0yOTA4LDcgKzI5MDgsNyBA QCBfaW50ZWxfZHBfc2V0X2xpbmtfdHJhaW4oc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAkJ fQogCQlJOTE1X1dSSVRFKERQX1RQX0NUTChwb3J0KSwgdGVtcCk7CiAKLQl9IGVsc2UgaWYgKChJ U19HRU43KGRldl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkgfHwKKwl9IGVsc2UgaWYgKChJU19J VllCUklER0UoZGV2X3ByaXYpICYmIHBvcnQgPT0gUE9SVF9BKSB8fAogCQkgICAoSEFTX1BDSF9D UFQoZGV2X3ByaXYpICYmIHBvcnQgIT0gUE9SVF9BKSkgewogCQkqRFAgJj0gfkRQX0xJTktfVFJB SU5fTUFTS19DUFQ7CiAKQEAgLTMyMjcsNyArMzIyNyw3IEBAIGludGVsX2RwX3ZvbHRhZ2VfbWF4 KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCXJldHVybiBpbnRlbF9kZGlfZHBfdm9sdGFn ZV9tYXgoZW5jb2Rlcik7CiAJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNf Q0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCXJldHVybiBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX0xF VkVMXzM7Ci0JZWxzZSBpZiAoSVNfR0VONyhkZXZfcHJpdikgJiYgcG9ydCA9PSBQT1JUX0EpCisJ ZWxzZSBpZiAoSVNfSVZZQlJJREdFKGRldl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkKIAkJcmV0 dXJuIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTEVWRUxfMjsKIAllbHNlIGlmIChIQVNfUENIX0NQ VChkZXZfcHJpdikgJiYgcG9ydCAhPSBQT1JUX0EpCiAJCXJldHVybiBEUF9UUkFJTl9WT0xUQUdF X1NXSU5HX0xFVkVMXzM7CkBAIC0zMjU2LDcgKzMyNTYsNyBAQCBpbnRlbF9kcF9wcmVfZW1waGFz aXNfbWF4KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsIHVpbnQ4X3Qgdm9sdGFnZV9zd2luZykK IAkJZGVmYXVsdDoKIAkJCXJldHVybiBEUF9UUkFJTl9QUkVfRU1QSF9MRVZFTF8wOwogCQl9Ci0J fSBlbHNlIGlmIChJU19HRU43KGRldl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkgeworCX0gZWxz ZSBpZiAoSVNfSVZZQlJJREdFKGRldl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkgewogCQlzd2l0 Y2ggKHZvbHRhZ2Vfc3dpbmcgJiBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX01BU0spIHsKIAkJY2Fz ZSBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX0xFVkVMXzA6CiAJCQlyZXR1cm4gRFBfVFJBSU5fUFJF X0VNUEhfTEVWRUxfMjsKQEAgLTM1NjUsNyArMzU2NSw3IEBAIGludGVsX2RwX3NldF9zaWduYWxf bGV2ZWxzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCXNpZ25hbF9sZXZlbHMgPSBjaHZf c2lnbmFsX2xldmVscyhpbnRlbF9kcCk7CiAJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9w cml2KSkgewogCQlzaWduYWxfbGV2ZWxzID0gdmx2X3NpZ25hbF9sZXZlbHMoaW50ZWxfZHApOwot CX0gZWxzZSBpZiAoSVNfR0VONyhkZXZfcHJpdikgJiYgcG9ydCA9PSBQT1JUX0EpIHsKKwl9IGVs c2UgaWYgKElTX0lWWUJSSURHRShkZXZfcHJpdikgJiYgcG9ydCA9PSBQT1JUX0EpIHsKIAkJc2ln bmFsX2xldmVscyA9IGdlbjdfZWRwX3NpZ25hbF9sZXZlbHModHJhaW5fc2V0KTsKIAkJbWFzayA9 IEVEUF9MSU5LX1RSQUlOX1ZPTF9FTVBfTUFTS19JVkI7CiAJfSBlbHNlIGlmIChJU19HRU42KGRl dl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkgewpAQCAtMzY1NSw3ICszNjU1LDcgQEAgaW50ZWxf ZHBfbGlua19kb3duKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJRFJNX0RFQlVH X0tNUygiXG4iKTsKIAotCWlmICgoSVNfR0VONyhkZXZfcHJpdikgJiYgcG9ydCA9PSBQT1JUX0Ep IHx8CisJaWYgKChJU19JVllCUklER0UoZGV2X3ByaXYpICYmIHBvcnQgPT0gUE9SVF9BKSB8fAog CSAgICAoSEFTX1BDSF9DUFQoZGV2X3ByaXYpICYmIHBvcnQgIT0gUE9SVF9BKSkgewogCQlEUCAm PSB+RFBfTElOS19UUkFJTl9NQVNLX0NQVDsKIAkJRFAgfD0gRFBfTElOS19UUkFJTl9QQVRfSURM RV9DUFQ7Ci0tIAoyLjE2LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=