From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Weinehall Subject: [PATCH 02/12] drm/i915: IS_MOBILE() fixes Date: Mon, 29 Aug 2016 13:31:42 +0300 Message-ID: <20160829103152.31282-3-david.weinehall@linux.intel.com> References: <20160829103152.31282-1-david.weinehall@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 6778A6E4BD for ; Mon, 29 Aug 2016 10:32:02 +0000 (UTC) In-Reply-To: <20160829103152.31282-1-david.weinehall@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 Cc: --dry-run@freedesktop.org List-Id: intel-gfx@lists.freedesktop.org UGFzcyBkZXZfcHJpdiB0byBhbGwgaW5zdGFuY2VzIG9mIElTX01PQklMRSgpLCBjb252ZXJ0IHRo ZQpvbmx5IHVzZXIgb2YgSU5URUxfSU5GTygpLT5pc19tb2JpbGUgdG8gdXNlIElTX01PQklMRSgp LAphbmQgbWFrZSB0aGUgbWFjcm8gdXNlIHRoZSBuZXcgbm9uLXBvbHltb3JwaCB2ZXJzaW9uIG9m IElOVEVMX0lORk8oKS4KClNpZ25lZC1vZmYtYnk6IERhdmlkIFdlaW5laGFsbCA8ZGF2aWQud2Vp bmVoYWxsQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oICAgICAgIHwgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9mZW5jZS5j IHwgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgfCA5ICsrKysr LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jICAgICB8IDUgKysrKy0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zZHZvLmMgICAgIHwgNCArKy0tCiA2IGZpbGVzIGNoYW5nZWQsIDE2IGlu c2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4 IGI1NDRmNDNmYzUzMy4uMjJiNzViOTNkMDg0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAg LTI1NjQsNyArMjU2NCw3IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogCV9fcDsgXAog fSkKICNkZWZpbmUgSU5URUxfSU5GTyhwKQkoJl9fSTkxNV9fKHApLT5pbmZvKQotI2RlZmluZSBf X0lOVEVMX0lORk8oZGV2X3ByaXYpCShkZXZfcHJpdi0+aW5mbykKKyNkZWZpbmUgX19JTlRFTF9J TkZPKGRldl9wcml2KQkoJmRldl9wcml2LT5pbmZvKQogI2RlZmluZSBJTlRFTF9HRU4ocCkJKElO VEVMX0lORk8ocCktPmdlbikKICNkZWZpbmUgSU5URUxfREVWSUQocCkJKElOVEVMX0lORk8ocCkt PmRldmljZV9pZCkKICNkZWZpbmUgX19JTlRFTF9ERVZJRChkZXZfcHJpdikJKF9fSU5URUxfSU5G TyhkZXZfcHJpdiktPmRldmljZV9pZCkKQEAgLTI2MjgsNyArMjYyOCw3IEBAIHN0cnVjdCBkcm1f aTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBJU19TS1lMQUtFKGRldikJKElOVEVMX0lORk8oZGV2 KS0+aXNfc2t5bGFrZSkKICNkZWZpbmUgSVNfQlJPWFRPTihkZXYpCQkoSU5URUxfSU5GTyhkZXYp LT5pc19icm94dG9uKQogI2RlZmluZSBJU19LQUJZTEFLRShkZXYpCShJTlRFTF9JTkZPKGRldikt PmlzX2thYnlsYWtlKQotI2RlZmluZSBJU19NT0JJTEUoZGV2KQkJKElOVEVMX0lORk8oZGV2KS0+ aXNfbW9iaWxlKQorI2RlZmluZSBJU19NT0JJTEUoZGV2X3ByaXYpCShfX0lOVEVMX0lORk8oZGV2 X3ByaXYpLT5pc19tb2JpbGUpCiAjZGVmaW5lIElTX0hTV19FQVJMWV9TRFYoZGV2KQkoSVNfSEFT V0VMTChkZXYpICYmIFwKIAkJCQkgKElOVEVMX0RFVklEKGRldikgJiAweEZGMDApID09IDB4MEMw MCkKICNkZWZpbmUgSVNfQkRXX1VMVChkZXYpCQkoSVNfQlJPQURXRUxMKGRldikgJiYgXApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZmVuY2UuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlLmMKaW5kZXggOGRmMWZhNzIzNGU4Li4zNTlkYTZi MmNjMWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZmVuY2UuYwpAQCAtNDk5LDcgKzQ5 OSw4IEBAIGk5MTVfZ2VtX2RldGVjdF9iaXRfNl9zd2l6emxlKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJCSAqLwogCQlzd2l6emxlX3ggPSBJOTE1X0JJVF82X1NXSVpaTEVfTk9ORTsKIAkJc3dp enpsZV95ID0gSTkxNV9CSVRfNl9TV0laWkxFX05PTkU7Ci0JfSBlbHNlIGlmIChJU19NT0JJTEUo ZGV2KSB8fCAoSVNfR0VOMyhkZXYpICYmICFJU19HMzMoZGV2KSkpIHsKKwl9IGVsc2UgaWYgKElT X01PQklMRShkZXZfcHJpdikgfHwKKwkgICAgICAgICAgIChJU19HRU4zKGRldl9wcml2KSAmJiAh SVNfRzMzKGRldl9wcml2KSkpIHsKIAkJdWludDMyX3QgZGNjOwogCiAJCS8qIE9uIDl4eCBjaGlw c2V0cywgY2hhbm5lbCBpbnRlcmxlYXZlIGJ5IHRoZSBDUFUgaXMKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwppbmRleCAxOWZmZDAyNGRkZWMuLjYyY2Y3YTQ5YTUyMSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTYxOSw3ICsxNjE5LDcgQEAgc3RhdGljIHZv aWQgaTl4eF9lbmFibGVfcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCWFzc2VydF9waXBl X2Rpc2FibGVkKGRldl9wcml2LCBjcnRjLT5waXBlKTsKIAogCS8qIFBMTCBpcyBwcm90ZWN0ZWQg YnkgcGFuZWwsIG1ha2Ugc3VyZSB3ZSBjYW4gd3JpdGUgaXQgKi8KLQlpZiAoSVNfTU9CSUxFKGRl dikgJiYgIUlTX0k4MzAoZGV2KSkKKwlpZiAoSVNfTU9CSUxFKGRldl9wcml2KSAmJiAhSVNfSTgz MChkZXZfcHJpdikpCiAJCWFzc2VydF9wYW5lbF91bmxvY2tlZChkZXZfcHJpdiwgY3J0Yy0+cGlw ZSk7CiAKIAkvKiBFbmFibGUgRFZPIDJ4IGNsb2NrIG9uIGJvdGggUExMcyBpZiBuZWNlc3Nhcnkg Ki8KQEAgLTc1MzAsNyArNzUzMCw3IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgaW50ZWxfaHBsbF92 Y28oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAllbHNlCiAJCXJldHVybiAwOwogCi0JdG1wID0g STkxNV9SRUFEKElTX01PQklMRShkZXYpID8gSFBMTFZDT19NT0JJTEUgOiBIUExMVkNPKTsKKwl0 bXAgPSBJOTE1X1JFQUQoSVNfTU9CSUxFKGRldl9wcml2KSA/IEhQTExWQ09fTU9CSUxFIDogSFBM TFZDTyk7CiAKIAl2Y28gPSB2Y29fdGFibGVbdG1wICYgMHg3XTsKIAlpZiAodmNvID09IDApCkBA IC04NjM4LDcgKzg2MzgsOCBAQCBzdGF0aWMgdm9pZCBpOXh4X2dldF9wZml0X2NvbmZpZyhzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGRldik7CiAJdWludDMyX3QgdG1wOwogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+ Z2VuIDw9IDMgJiYgKElTX0k4MzAoZGV2KSB8fCAhSVNfTU9CSUxFKGRldikpKQorCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpIDw9IDMgJiYKKwkgICAgKElTX0k4MzAoZGV2X3ByaXYpIHx8ICFJU19N T0JJTEUoZGV2X3ByaXYpKSkKIAkJcmV0dXJuOwogCiAJdG1wID0gSTkxNV9SRUFEKFBGSVRfQ09O VFJPTCk7CkBAIC0xNTI5Nyw3ICsxNTI5OCw3IEBAIHN0YXRpYyBib29sIGhhc19lZHBfYShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoZGV2KTsKIAotCWlmICghSVNfTU9CSUxFKGRldikpCisJaWYgKCFJU19NT0JJ TEUoZGV2X3ByaXYpKQogCQlyZXR1cm4gZmFsc2U7CiAKIAlpZiAoKEk5MTVfUkVBRChEUF9BKSAm IERQX0RFVEVDVEVEKSA9PSAwKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHZkcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCmluZGV4IGUxZDQ3 ZDUxZWE0Ny4uYTY2NjkyZDY3OWRiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9sdmRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCkBAIC05 NTEsNiArOTUxLDggQEAgc3RhdGljIGJvb2wgY29tcHV0ZV9pc19kdWFsX2xpbmtfbHZkcyhzdHJ1 Y3QgaW50ZWxfbHZkc19lbmNvZGVyICpsdmRzX2VuY29kZXIpCiAKIHN0YXRpYyBib29sIGludGVs X2x2ZHNfc3VwcG9ydGVkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CisJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCiAJLyogV2l0aCB0aGUgaW50 cm9kdWN0aW9uIG9mIHRoZSBQQ0ggd2UgZ2FpbmVkIGEgZGVkaWNhdGVkCiAJICogTFZEUyBwcmVz ZW5jZSBwaW4sIHVzZSBpdC4gKi8KIAlpZiAoSEFTX1BDSF9JQlgoZGV2KSB8fCBIQVNfUENIX0NQ VChkZXYpKQpAQCAtOTU4LDcgKzk2MCw4IEBAIHN0YXRpYyBib29sIGludGVsX2x2ZHNfc3VwcG9y dGVkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAkvKiBPdGhlcndpc2UgTFZEUyB3YXMgb25s eSBhdHRhY2hlZCB0byBtb2JpbGUgcHJvZHVjdHMsCiAJICogZXhjZXB0IGZvciB0aGUgaW5nbG9y aW91cyA4MzBnbSAqLwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA0ICYmIElTX01PQklM RShkZXYpICYmICFJU19JODMwKGRldikpCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPD0gNCAm JgorCSAgICBJU19NT0JJTEUoZGV2X3ByaXYpICYmICFJU19JODMwKGRldl9wcml2KSkKIAkJcmV0 dXJuIHRydWU7CiAKIAlyZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBh YmE2ZmQwMzZjNGUuLjBjOTEyMzViY2VmNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC02 MjI2LDcgKzYyMjYsNyBAQCBzdGF0aWMgdTMyIHB2aWRfdG9fZXh0dmlkKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwgdTggcHh2aWQpCiAJY29uc3QgaW50IHZkID0gX3B4dmlkX3Rv X3ZkKHB4dmlkKTsKIAljb25zdCBpbnQgdm0gPSB2ZCAtIDExMjU7CiAKLQlpZiAoSU5URUxfSU5G TyhkZXZfcHJpdiktPmlzX21vYmlsZSkKKwlpZiAoSVNfTU9CSUxFKGRldl9wcml2KSkKIAkJcmV0 dXJuIHZtID4gMCA/IHZtIDogMDsKIAogCXJldHVybiB2ZDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Nkdm8uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nk dm8uYwppbmRleCBjNTUxMDI0ZDQ4NzEuLjc1NzdkZDIwNTQ0ZSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Nkdm8uYwpAQCAtMjQxMCwxMCArMjQxMCwxMCBAQCBzdGF0aWMgdm9pZAogaW50ZWxfc2R2 b19hZGRfaGRtaV9wcm9wZXJ0aWVzKHN0cnVjdCBpbnRlbF9zZHZvICppbnRlbF9zZHZvLAogCQkJ ICAgICAgIHN0cnVjdCBpbnRlbF9zZHZvX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogewotCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSBjb25uZWN0b3ItPmJhc2UuYmFzZS5kZXY7CisJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjb25uZWN0b3ItPmJhc2UuYmFzZS5k ZXYpOwogCiAJaW50ZWxfYXR0YWNoX2ZvcmNlX2F1ZGlvX3Byb3BlcnR5KCZjb25uZWN0b3ItPmJh c2UuYmFzZSk7Ci0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDQgJiYgSVNfTU9CSUxFKGRl dikpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA0ICYmIElTX01PQklMRShkZXZfcHJp dikpIHsKIAkJaW50ZWxfYXR0YWNoX2Jyb2FkY2FzdF9yZ2JfcHJvcGVydHkoJmNvbm5lY3Rvci0+ YmFzZS5iYXNlKTsKIAkJaW50ZWxfc2R2by0+Y29sb3JfcmFuZ2VfYXV0byA9IHRydWU7CiAJfQot LSAKMi45LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=