From: Jani Nikula Subject: [PATCH] drm/i915: distinguish G33 and Pineview from each other Date: Wed, 7 Dec 2016 22:48:09 +0200 Message-ID: <1481143689-19672-1-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9F8E06E636 for ; Wed, 7 Dec 2016 20:48:16 +0000 (UTC) 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 Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org UGluZXZpZXcgZGVzZXJ2ZXMgdG8gdXNlIGl0cyBvd24gcGxhdGZvcm0gZW51bSAod2hpY2ggd2Fz IGFscmVhZHkgYWRkZWQsCnVudXNlZCwgcHJldmlvdXNseSkuIElTX0czMygpIG5vIGxvbmdlciBt YXRjaGVzIFBpbmV2aWV3LCBhbmQgZ2V0cwpyZXBsYWNlZCBieSBJU19HMzMoKSB8fCBJU19QSU5F VklFVygpIG9yIGVxdWl2YWxlbnQuIFBpbmV2aWV3IGlzIG5vCmxvbmdlciBhbiBvdXRsaWVyIGFt b25nIHBsYXRmb3JtIGRlZmluaXRpb25zLgoKQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3ly amFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv bi5jby51az4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVs LmNvbT4KU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICB8IDMgKy0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgICB8IDggKysrKystLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlX3JlZy5jIHwgNSArKystLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMgICAgfCA0ICsrLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcGNpLmMgICAgICAgICAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jICAgICAgfCA1ICsrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9zZHZvLmMgICAgICAgICB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Vu Y29yZS5jICAgICAgIHwgMiArLQogOCBmaWxlcyBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAx NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAzMzc1OGFjNWVjOWEu Ljk2OWE1OTM0NWZiMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC02ODgsNyArNjg4LDYg QEAgc3RydWN0IGludGVsX2NzciB7CiAKICNkZWZpbmUgREVWX0lORk9fRk9SX0VBQ0hfRkxBRyhm dW5jKSBcCiAJZnVuYyhpc19tb2JpbGUpOyBcCi0JZnVuYyhpc19waW5ldmlldyk7IFwKIAlmdW5j KGlzX2xwKTsgXAogCWZ1bmMoaXNfYWxwaGFfc3VwcG9ydCk7IFwKIAkvKiBLZWVwIGhhc18qIGlu IGFscGhhYmV0aWNhbCBvcmRlciAqLyBcCkBAIC0yNTMzLDcgKzI1MzIsNyBAQCBpbnRlbF9pbmZv KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICNkZWZpbmUgSVNfRzRY KGRldl9wcml2KQkoSVNfRzQ1KGRldl9wcml2KSB8fCBJU19HTTQ1KGRldl9wcml2KSkKICNkZWZp bmUgSVNfUElORVZJRVdfRyhkZXZfcHJpdikJKElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweGEw MDEpCiAjZGVmaW5lIElTX1BJTkVWSUVXX00oZGV2X3ByaXYpCShJTlRFTF9ERVZJRChkZXZfcHJp dikgPT0gMHhhMDExKQotI2RlZmluZSBJU19QSU5FVklFVyhkZXZfcHJpdikJKChkZXZfcHJpdikt PmluZm8uaXNfcGluZXZpZXcpCisjZGVmaW5lIElTX1BJTkVWSUVXKGRldl9wcml2KQkoKGRldl9w cml2KS0+aW5mby5wbGF0Zm9ybSA9PSBJTlRFTF9QSU5FVklFVykKICNkZWZpbmUgSVNfRzMzKGRl dl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5wbGF0Zm9ybSA9PSBJTlRFTF9HMzMpCiAjZGVmaW5l IElTX0lST05MQUtFX00oZGV2X3ByaXYpCShJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHgwMDQ2 KQogI2RlZmluZSBJU19JVllCUklER0UoZGV2X3ByaXYpCSgoZGV2X3ByaXYpLT5pbmZvLnBsYXRm b3JtID09IElOVEVMX0lWWUJSSURHRSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGRkMWEz NGFjODMwZi4uMzYxODM5NDVlNjFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTIwODQs NyArMjA4NCw4IEBAIHU2NCBpOTE1X2dlbV9nZXRfZ2d0dF9hbGlnbm1lbnQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LCB1NjQgc2l6ZSwKIAkgKiBNaW5pbXVtIGFsaWdubWVudCBp cyA0ayAoR1RUIHBhZ2Ugc2l6ZSksIGJ1dCBtaWdodCBiZSBncmVhdGVyCiAJICogaWYgYSBmZW5j ZSByZWdpc3RlciBpcyBuZWVkZWQgZm9yIHRoZSBvYmplY3QuCiAJICovCi0JaWYgKElOVEVMX0dF TihkZXZfcHJpdikgPj0gNCB8fCAoIWZlbmNlZCAmJiBJU19HMzMoZGV2X3ByaXYpKSB8fAorCWlm IChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDQgfHwKKwkgICAgKCFmZW5jZWQgJiYgKElTX0czMyhk ZXZfcHJpdikgfHwgSVNfUElORVZJRVcoZGV2X3ByaXYpKSkgfHwKIAkgICAgdGlsaW5nX21vZGUg PT0gSTkxNV9USUxJTkdfTk9ORSkKIAkJcmV0dXJuIDQwOTY7CiAKQEAgLTQ0OTgsOCArNDQ5OSw5 IEBAIGk5MTVfZ2VtX2xvYWRfaW5pdF9mZW5jZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDcgJiYgIUlTX1ZBTExF WVZJRVcoZGV2X3ByaXYpICYmCiAJICAgICFJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJZGV2 X3ByaXYtPm51bV9mZW5jZV9yZWdzID0gMzI7Ci0JZWxzZSBpZiAoSU5URUxfSU5GTyhkZXZfcHJp diktPmdlbiA+PSA0IHx8IElTX0k5NDVHKGRldl9wcml2KSB8fAotCQkgSVNfSTk0NUdNKGRldl9w cml2KSB8fCBJU19HMzMoZGV2X3ByaXYpKQorCWVsc2UgaWYgKElOVEVMX0lORk8oZGV2X3ByaXYp LT5nZW4gPj0gNCB8fAorCQkgSVNfSTk0NUcoZGV2X3ByaXYpIHx8IElTX0k5NDVHTShkZXZfcHJp dikgfHwKKwkJIElTX0czMyhkZXZfcHJpdikgfHwgSVNfUElORVZJRVcoZGV2X3ByaXYpKQogCQlk ZXZfcHJpdi0+bnVtX2ZlbmNlX3JlZ3MgPSAxNjsKIAllbHNlCiAJCWRldl9wcml2LT5udW1fZmVu Y2VfcmVncyA9IDg7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9m ZW5jZV9yZWcuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlX3JlZy5jCmlu ZGV4IGQwMDZiY2I2OWU5MS4uMDkxOTNjZmI1ZDhiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9mZW5jZV9yZWcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9mZW5jZV9yZWcuYwpAQCAtNTEyLDggKzUxMiw5IEBAIGk5MTVfZ2VtX2RldGVjdF9i aXRfNl9zd2l6emxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJICovCiAJ CXN3aXp6bGVfeCA9IEk5MTVfQklUXzZfU1dJWlpMRV9OT05FOwogCQlzd2l6emxlX3kgPSBJOTE1 X0JJVF82X1NXSVpaTEVfTk9ORTsKLQl9IGVsc2UgaWYgKElTX01PQklMRShkZXZfcHJpdikgfHwg KElTX0dFTjMoZGV2X3ByaXYpICYmCi0JCSAgICFJU19HMzMoZGV2X3ByaXYpKSkgeworCX0gZWxz ZSBpZiAoSVNfTU9CSUxFKGRldl9wcml2KSB8fAorCQkgICAoSVNfR0VOMyhkZXZfcHJpdikgJiYK KwkJICAgICFJU19HMzMoZGV2X3ByaXYpICYmICFJU19QSU5FVklFVyhkZXZfcHJpdikpKSB7CiAJ CXVpbnQzMl90IGRjYzsKIAogCQkvKiBPbiA5eHggY2hpcHNldHMsIGNoYW5uZWwgaW50ZXJsZWF2 ZSBieSB0aGUgQ1BVIGlzCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9zdG9sZW4uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCmluZGV4 IGM4MWIyMmYyMzhjMy4uZWZjMGU3NDhlZjg5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9zdG9sZW4uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9zdG9sZW4uYwpAQCAtMjAzLDggKzIwMyw4IEBAIHN0YXRpYyB1bnNpZ25lZCBsb25nIGk5MTVf c3RvbGVuX3RvX3BoeXNpY2FsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJ cmV0dXJuIDA7CiAKIAkvKiBtYWtlIHN1cmUgd2UgZG9uJ3QgY2xvYmJlciB0aGUgR1RUIGlmIGl0 J3Mgd2l0aGluIHN0b2xlbiBtZW1vcnkgKi8KLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8PSA0 ICYmICFJU19HMzMoZGV2X3ByaXYpICYmCi0JICAgICFJU19HNFgoZGV2X3ByaXYpKSB7CisJaWYg KElOVEVMX0dFTihkZXZfcHJpdikgPD0gNCAmJgorCSAgICAhSVNfRzMzKGRldl9wcml2KSAmJiAh SVNfUElORVZJRVcoZGV2X3ByaXYpICYmICFJU19HNFgoZGV2X3ByaXYpKSB7CiAJCXN0cnVjdCB7 CiAJCQl1MzIgc3RhcnQsIGVuZDsKIAkJfSBzdG9sZW5bMl0gPSB7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9w Y2kuYwppbmRleCBmN2VjNmU5NDRlMDkuLjkzZjUwZWYyYTMwOSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9wY2kuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3BjaS5jCkBAIC0xNDEsNyArMTQxLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZp Y2VfaW5mbyBpbnRlbF9nMzNfaW5mbyA9IHsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9k ZXZpY2VfaW5mbyBpbnRlbF9waW5ldmlld19pbmZvID0gewogCUdFTjNfRkVBVFVSRVMsCi0JLnBs YXRmb3JtID0gSU5URUxfRzMzLCAuaXNfcGluZXZpZXcgPSAxLCAuaXNfbW9iaWxlID0gMSwKKwku cGxhdGZvcm0gPSBJTlRFTF9QSU5FVklFVywgLmlzX21vYmlsZSA9IDEsCiAJLmhhc19ob3RwbHVn ID0gMSwKIAkuaGFzX292ZXJsYXkgPSAxLAogfTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwppbmRleCBhNDEwODJlMjc1MGUuLjllYWYxZTViZGFlOSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwpAQCAtODE4MCw3ICs4MTgwLDggQEAgc3RhdGljIHZvaWQgaTl4eF9j b21wdXRlX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJZWxzZQogCQlkcGxsIHw9IERQ TExCX01PREVfREFDX1NFUklBTDsKIAotCWlmIChJU19JOTQ1RyhkZXZfcHJpdikgfHwgSVNfSTk0 NUdNKGRldl9wcml2KSB8fCBJU19HMzMoZGV2X3ByaXYpKSB7CisJaWYgKElTX0k5NDVHKGRldl9w cml2KSB8fCBJU19JOTQ1R00oZGV2X3ByaXYpIHx8CisJICAgIElTX0czMyhkZXZfcHJpdikgfHwg SVNfUElORVZJRVcoZGV2X3ByaXYpKSB7CiAJCWRwbGwgfD0gKGNydGNfc3RhdGUtPnBpeGVsX211 bHRpcGxpZXIgLSAxKQogCQkJPDwgU0RWT19NVUxUSVBMSUVSX1NISUZUX0hJUkVTOwogCX0KQEAg LTg4OTMsNyArODg5NCw3IEBAIHN0YXRpYyBib29sIGk5eHhfZ2V0X3BpcGVfY29uZmlnKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjLAogCQkJID4+IERQTExfTURfVURJX01VTFRJUExJRVJfU0hJRlQp ICsgMTsKIAkJcGlwZV9jb25maWctPmRwbGxfaHdfc3RhdGUuZHBsbF9tZCA9IHRtcDsKIAl9IGVs c2UgaWYgKElTX0k5NDVHKGRldl9wcml2KSB8fCBJU19JOTQ1R00oZGV2X3ByaXYpIHx8Ci0JCSAg IElTX0czMyhkZXZfcHJpdikpIHsKKwkJICAgSVNfRzMzKGRldl9wcml2KSB8fCBJU19QSU5FVklF VyhkZXZfcHJpdikpIHsKIAkJdG1wID0gSTkxNV9SRUFEKERQTEwoY3J0Yy0+cGlwZSkpOwogCQlw aXBlX2NvbmZpZy0+cGl4ZWxfbXVsdGlwbGllciA9CiAJCQkoKHRtcCAmIFNEVk9fTVVMVElQTElF Ul9NQVNLKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCmluZGV4IDA1NGFjZDk3NGUyZC4uMmFk MTM5MDNhMDU0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCkBAIC0xMjk2LDcgKzEyOTYs NyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zZHZvX3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29k ZXIgKmludGVsX2VuY29kZXIsCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNCkgewogCQkv KiBkb25lIGluIGNydGNfbW9kZV9zZXQgYXMgdGhlIGRwbGxfbWQgcmVnIG11c3QgYmUgd3JpdHRl biBlYXJseSAqLwogCX0gZWxzZSBpZiAoSVNfSTk0NUcoZGV2X3ByaXYpIHx8IElTX0k5NDVHTShk ZXZfcHJpdikgfHwKLQkJICAgSVNfRzMzKGRldl9wcml2KSkgeworCQkgICBJU19HMzMoZGV2X3By aXYpIHx8IElTX1BJTkVWSUVXKGRldl9wcml2KSkgewogCQkvKiBkb25lIGluIGNydGNfbW9kZV9z ZXQgYXMgaXQgbGl2ZXMgaW5zaWRlIHRoZSBkcGxsIHJlZ2lzdGVyICovCiAJfSBlbHNlIHsKIAkJ c2R2b3ggfD0gKGNydGNfc3RhdGUtPnBpeGVsX211bHRpcGxpZXIgLSAxKQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91bmNvcmUuYwppbmRleCAwNzc3OWQwYzcxZTYuLjIwMDdiMTM4YWYwZSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTE4MTIsNyArMTgxMiw3IEBAIHN0YXRpYyBy ZXNldF9mdW5jIGludGVsX2dldF9ncHVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCQlyZXR1cm4gaXJvbmxha2VfZG9fcmVzZXQ7CiAJZWxzZSBpZiAoSVNfRzRYKGRl dl9wcml2KSkKIAkJcmV0dXJuIGc0eF9kb19yZXNldDsKLQllbHNlIGlmIChJU19HMzMoZGV2X3By aXYpKQorCWVsc2UgaWYgKElTX0czMyhkZXZfcHJpdikgfHwgSVNfUElORVZJRVcoZGV2X3ByaXYp KQogCQlyZXR1cm4gZzMzX2RvX3Jlc2V0OwogCWVsc2UgaWYgKElOVEVMX0lORk8oZGV2X3ByaXYp LT5nZW4gPj0gMykKIAkJcmV0dXJuIGk5MTVfZG9fcmVzZXQ7Ci0tIAoyLjEuNAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==