From: Ville Syrjala Subject: [PATCH 08/14] drm/i915: Check for IVB instead of gen7 when we think about IVB CPU eDP Date: Fri, 2 Mar 2018 11:55:06 +0200 Message-ID: <20180302095512.19329-9-ville.syrjala@linux.intel.com> References: <20180302095512.19329-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 05E166EEA1 for ; Fri, 2 Mar 2018 09:55:38 +0000 (UTC) In-Reply-To: <20180302095512.19329-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 dXNpbmcuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgfCAxNCAr KysrKysrLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCA2NDJhZTI5OGRmMDcuLjJhODJlY2Nm ZmU1NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0xOTcwLDcgKzE5NzAsNyBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9kcF9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAog CiAJLyogU3BsaXQgb3V0IHRoZSBJQlgvQ1BVIHZzIENQVCBzZXR0aW5ncyAqLwogCi0JaWYgKElT X0dFTjcoZGV2X3ByaXYpICYmIHBvcnQgPT0gUE9SVF9BKSB7CisJaWYgKElTX0lWWUJSSURHRShk ZXZfcHJpdikgJiYgcG9ydCA9PSBQT1JUX0EpIHsKIAkJaWYgKGFkanVzdGVkX21vZGUtPmZsYWdz ICYgRFJNX01PREVfRkxBR19QSFNZTkMpCiAJCQlpbnRlbF9kcC0+RFAgfD0gRFBfU1lOQ19IU19I SUdIOwogCQlpZiAoYWRqdXN0ZWRfbW9kZS0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX1BWU1lOQykK QEAgLTI2NTAsNyArMjY1MCw3IEBAIHN0YXRpYyBib29sIGludGVsX2RwX2dldF9od19zdGF0ZShz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAlpZiAoISh0bXAgJiBEUF9QT1JUX0VOKSkK IAkJZ290byBvdXQ7CiAKLQlpZiAoSVNfR0VONyhkZXZfcHJpdikgJiYgcG9ydCA9PSBQT1JUX0Ep IHsKKwlpZiAoSVNfSVZZQlJJREdFKGRldl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkgewogCQkq cGlwZSA9IFBPUlRfVE9fUElQRV9DUFQodG1wKTsKIAl9IGVsc2UgaWYgKEhBU19QQ0hfQ1BUKGRl dl9wcml2KSAmJiBwb3J0ICE9IFBPUlRfQSkgewogCQllbnVtIHBpcGUgcDsKQEAgLTI4ODcsNyAr Mjg4Nyw3IEBAIF9pbnRlbF9kcF9zZXRfbGlua190cmFpbihzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwLAogCQl9CiAJCUk5MTVfV1JJVEUoRFBfVFBfQ1RMKHBvcnQpLCB0ZW1wKTsKIAotCX0gZWxz ZSBpZiAoKElTX0dFTjcoZGV2X3ByaXYpICYmIHBvcnQgPT0gUE9SVF9BKSB8fAorCX0gZWxzZSBp ZiAoKElTX0lWWUJSSURHRShkZXZfcHJpdikgJiYgcG9ydCA9PSBQT1JUX0EpIHx8CiAJCSAgIChI QVNfUENIX0NQVChkZXZfcHJpdikgJiYgcG9ydCAhPSBQT1JUX0EpKSB7CiAJCSpEUCAmPSB+RFBf TElOS19UUkFJTl9NQVNLX0NQVDsKIApAQCAtMzIxMyw3ICszMjEzLDcgQEAgaW50ZWxfZHBfdm9s dGFnZV9tYXgoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkJcmV0dXJuIGludGVsX2RkaV9k cF92b2x0YWdlX21heChlbmNvZGVyKTsKIAllbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2 KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJcmV0dXJuIERQX1RSQUlOX1ZPTFRBR0Vf U1dJTkdfTEVWRUxfMzsKLQllbHNlIGlmIChJU19HRU43KGRldl9wcml2KSAmJiBwb3J0ID09IFBP UlRfQSkKKwllbHNlIGlmIChJU19JVllCUklER0UoZGV2X3ByaXYpICYmIHBvcnQgPT0gUE9SVF9B KQogCQlyZXR1cm4gRFBfVFJBSU5fVk9MVEFHRV9TV0lOR19MRVZFTF8yOwogCWVsc2UgaWYgKEhB U19QQ0hfQ1BUKGRldl9wcml2KSAmJiBwb3J0ICE9IFBPUlRfQSkKIAkJcmV0dXJuIERQX1RSQUlO X1ZPTFRBR0VfU1dJTkdfTEVWRUxfMzsKQEAgLTMyNDIsNyArMzI0Miw3IEBAIGludGVsX2RwX3By ZV9lbXBoYXNpc19tYXgoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgdWludDhfdCB2b2x0YWdl X3N3aW5nKQogCQlkZWZhdWx0OgogCQkJcmV0dXJuIERQX1RSQUlOX1BSRV9FTVBIX0xFVkVMXzA7 CiAJCX0KLQl9IGVsc2UgaWYgKElTX0dFTjcoZGV2X3ByaXYpICYmIHBvcnQgPT0gUE9SVF9BKSB7 CisJfSBlbHNlIGlmIChJU19JVllCUklER0UoZGV2X3ByaXYpICYmIHBvcnQgPT0gUE9SVF9BKSB7 CiAJCXN3aXRjaCAodm9sdGFnZV9zd2luZyAmIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTUFTSykg ewogCQljYXNlIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTEVWRUxfMDoKIAkJCXJldHVybiBEUF9U UkFJTl9QUkVfRU1QSF9MRVZFTF8yOwpAQCAtMzU1MSw3ICszNTUxLDcgQEAgaW50ZWxfZHBfc2V0 X3NpZ25hbF9sZXZlbHMoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkJc2lnbmFsX2xldmVs cyA9IGNodl9zaWduYWxfbGV2ZWxzKGludGVsX2RwKTsKIAl9IGVsc2UgaWYgKElTX1ZBTExFWVZJ RVcoZGV2X3ByaXYpKSB7CiAJCXNpZ25hbF9sZXZlbHMgPSB2bHZfc2lnbmFsX2xldmVscyhpbnRl bF9kcCk7Ci0JfSBlbHNlIGlmIChJU19HRU43KGRldl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkg eworCX0gZWxzZSBpZiAoSVNfSVZZQlJJREdFKGRldl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkg ewogCQlzaWduYWxfbGV2ZWxzID0gZ2VuN19lZHBfc2lnbmFsX2xldmVscyh0cmFpbl9zZXQpOwog CQltYXNrID0gRURQX0xJTktfVFJBSU5fVk9MX0VNUF9NQVNLX0lWQjsKIAl9IGVsc2UgaWYgKElT X0dFTjYoZGV2X3ByaXYpICYmIHBvcnQgPT0gUE9SVF9BKSB7CkBAIC0zNjQxLDcgKzM2NDEsNyBA QCBpbnRlbF9kcF9saW5rX2Rvd24oc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAKIAlE Uk1fREVCVUdfS01TKCJcbiIpOwogCi0JaWYgKChJU19HRU43KGRldl9wcml2KSAmJiBwb3J0ID09 IFBPUlRfQSkgfHwKKwlpZiAoKElTX0lWWUJSSURHRShkZXZfcHJpdikgJiYgcG9ydCA9PSBQT1JU X0EpIHx8CiAJICAgIChIQVNfUENIX0NQVChkZXZfcHJpdikgJiYgcG9ydCAhPSBQT1JUX0EpKSB7 CiAJCURQICY9IH5EUF9MSU5LX1RSQUlOX01BU0tfQ1BUOwogCQlEUCB8PSBEUF9MSU5LX1RSQUlO X1BBVF9JRExFX0NQVDsKLS0gCjIuMTMuNgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==