From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Weinehall Subject: [PATCH 04/12] drm/i915: INTEL_GEN() fixes, part 1 Date: Mon, 29 Aug 2016 13:31:44 +0300 Message-ID: <20160829103152.31282-5-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 1F3BC6E509 for ; Mon, 29 Aug 2016 10:32:06 +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 UGFzcyBkZXZfcHJpdiB0byBhbGwgaW5zdGFuY2VzIG9mIElOVEVMX0dFTigpLCBhbmQgbWFrZSB0 aGUgbWFjcm8KdXNlIHRoZSBuZXcgbm9uLXBvbHltb3JwaCB2ZXJzaW9uIG9mIElOVEVMX0lORk8o KS4KClNpZ25lZC1vZmYtYnk6IERhdmlkIFdlaW5laGFsbCA8ZGF2aWQud2VpbmVoYWxsQGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAg ICAgICB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5j IHwgMyArLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgICAgIHwg MiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgICAgICAgICAgfCAzICsr LQogNCBmaWxlcyBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggM2NmNTIyMGRmYWU0Li5lM2I0MmU4MTc1ODAgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjU2NSw3ICsyNTY1LDcgQEAgc3RydWN0IGRybV9pOTE1 X2NtZF90YWJsZSB7CiB9KQogI2RlZmluZSBJTlRFTF9JTkZPKHApCSgmX19JOTE1X18ocCktPmlu Zm8pCiAjZGVmaW5lIF9fSU5URUxfSU5GTyhkZXZfcHJpdikJKCZkZXZfcHJpdi0+aW5mbykKLSNk ZWZpbmUgSU5URUxfR0VOKHApCShJTlRFTF9JTkZPKHApLT5nZW4pCisjZGVmaW5lIElOVEVMX0dF TihkZXZfcHJpdikJKF9fSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbikKICNkZWZpbmUgSU5URUxf REVWSUQocCkJKElOVEVMX0lORk8ocCktPmRldmljZV9pZCkKICNkZWZpbmUgX19JTlRFTF9ERVZJ RChkZXZfcHJpdikJKF9fSU5URUxfSU5GTyhkZXZfcHJpdiktPmRldmljZV9pZCkKIApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYwppbmRleCBkNmQyMzkyMTEw ODcuLmE5OGMwZjQyYmFkZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fcmVuZGVyX3N0YXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVu ZGVyX3N0YXRlLmMKQEAgLTcyLDEwICs3Miw5IEBAIHJlbmRlcl9zdGF0ZV9nZXRfcm9kYXRhKGNv bnN0IHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCiBzdGF0aWMgaW50IHJlbmRl cl9zdGF0ZV9zZXR1cChzdHJ1Y3QgcmVuZGVyX3N0YXRlICpzbykKIHsKLQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gc28tPnZtYS0+dm0tPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KHNvLT52bWEtPnZtLT5kZXYpOwogCWNvbnN0IHN0cnVjdCBpbnRl bF9yZW5kZXJzdGF0ZV9yb2RhdGEgKnJvZGF0YSA9IHNvLT5yb2RhdGE7Ci0JY29uc3QgYm9vbCBo YXNfNjRiaXRfcmVsb2MgPSBJTlRFTF9HRU4oZGV2KSA+PSA4OworCWNvbnN0IGJvb2wgaGFzXzY0 Yml0X3JlbG9jID0gSU5URUxfR0VOKGRldl9wcml2KSA+PSA4OwogCXVuc2lnbmVkIGludCBpID0g MCwgcmVsb2NfaW5kZXggPSAwOwogCXN0cnVjdCBwYWdlICpwYWdlOwogCXUzMiAqZDsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA2MmNmN2E0OWE1MjEuLjhmZDdkM2Q5YTFl OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTI0MzIsNyArMTI0MzIs NyBAQCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcyhzdHJ1Y3QgZHJtX2NydGNf c3RhdGUgKmNydGNfc3RhdGUsCiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBwbGFuZV9z dGF0ZS0+ZmI7CiAJaW50IHJldDsKIAotCWlmIChJTlRFTF9HRU4oZGV2KSA+PSA5ICYmIHBsYW5l LT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikgeworCWlmIChJTlRFTF9HRU4oZGV2X3By aXYpID49IDkgJiYgcGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKSB7CiAJCXJl dCA9IHNrbF91cGRhdGVfc2NhbGVyX3BsYW5lKAogCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj X3N0YXRlKSwKIAkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKSk7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDBkZjc4M2E2NmJmYi4uOGQ4MWE0YzhlNzFkIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtNzQ4LDYgKzc0OCw3IEBAIGludGVs X2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCSBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh dGUgKnN0YXRlKQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUocGxhbmUtPmRldik7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CiAJ c3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmJhc2UuY3J0YzsKIAlzdHJ1Y3QgaW50ZWxf Y3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CkBAIC05MjcsNyArOTI4LDcg QEAgaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWRz dC0+eTEgPSBjcnRjX3k7CiAJZHN0LT55MiA9IGNydGNfeSArIGNydGNfaDsKIAotCWlmIChJTlRF TF9HRU4oZGV2KSA+PSA5KSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkgewogCQly ZXQgPSBza2xfY2hlY2tfcGxhbmVfc3VyZmFjZShzdGF0ZSk7CiAJCWlmIChyZXQpCiAJCQlyZXR1 cm4gcmV0OwotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=