From: Tvrtko Ursulin Subject: [PATCH v3 18/19] drm/i915: Make INTEL_GEN only take dev_priv Date: Fri, 14 Oct 2016 09:17:22 +0100 Message-ID: <1476433042-14261-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476352990-2504-18-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id A82056E097 for ; Fri, 14 Oct 2016 08:17:32 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id b75so16687817lfg.3 for ; Fri, 14 Oct 2016 01:17:32 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id q8sm29743008wjj.7.2016.10.14.01.17.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Oct 2016 01:17:30 -0700 (PDT) In-Reply-To: <1476352990-2504-18-git-send-email-tvrtko.ursulin@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDk2 OCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MuCgp2MjogQWRkIHBhcmFudGhlc2VzIGFyb3VuZCBk ZXZfcHJpdi4gKFZpbGxlIFN5cmphbGEpCnYzOiBSZWJhc2UuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0 a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRGF2aWQg V2VpbmVoYWxsIDxkYXZpZC53ZWluZWhhbGxAbGludXguaW50ZWwuY29tPgpBY2tlZC1ieTogRGFu aWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQWNrZWQtYnk6IEphbmkgTmlrdWxh IDxqYW5pLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+CkFja2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNo cmlzQGNocmlzLXdpbHNvbi5jby51az4KQWNrZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFy dGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCAgICAgICAgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9yZW5kZXJfc3RhdGUuYyB8IDYgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jICAgICAgICAgICAgICB8IDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jICAgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYyAgICAgICAgICB8IDggKysrKy0tLS0KIDUgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9u cygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggYjlhODQ0 N2NhNGM3Li42ZjMwOGI0YjczYTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjYwOCw4 ICsyNjA4LDggQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAJX19wOyBcCiB9KQogI2Rl ZmluZSBJTlRFTF9JTkZPKHApCSgmX19JOTE1X18ocCktPmluZm8pCi0jZGVmaW5lIElOVEVMX0dF TihwKQkoSU5URUxfSU5GTyhwKS0+Z2VuKQogCisjZGVmaW5lIElOVEVMX0dFTihkZXZfcHJpdikJ KChkZXZfcHJpdiktPmluZm8uZ2VuKQogI2RlZmluZSBJTlRFTF9ERVZJRChkZXZfcHJpdikJKChk ZXZfcHJpdiktPmluZm8uZGV2aWNlX2lkKQogCiAjZGVmaW5lIFJFVklEX0ZPUkVWRVIJCTB4ZmYK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMKaW5kZXggOTVi N2U5YWZkNWY4Li5hOThjMGY0MmJhZGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX3JlbmRlcl9zdGF0ZS5jCkBAIC03Miw5ICs3Miw5IEBAIHJlbmRlcl9zdGF0ZV9nZXRfcm9k YXRhKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCiBzdGF0aWMgaW50 IHJlbmRlcl9zdGF0ZV9zZXR1cChzdHJ1Y3QgcmVuZGVyX3N0YXRlICpzbykKIHsKLQlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gc28tPnZtYS0+dm0tPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHNvLT52bWEtPnZtLT5kZXYpOwogCWNvbnN0IHN0cnVj dCBpbnRlbF9yZW5kZXJzdGF0ZV9yb2RhdGEgKnJvZGF0YSA9IHNvLT5yb2RhdGE7Ci0JY29uc3Qg Ym9vbCBoYXNfNjRiaXRfcmVsb2MgPSBJTlRFTF9HRU4oZGV2KSA+PSA4OworCWNvbnN0IGJvb2wg aGFzXzY0Yml0X3JlbG9jID0gSU5URUxfR0VOKGRldl9wcml2KSA+PSA4OwogCXVuc2lnbmVkIGlu dCBpID0gMCwgcmVsb2NfaW5kZXggPSAwOwogCXN0cnVjdCBwYWdlICpwYWdlOwogCXUzMiAqZDsK QEAgLTExNSw3ICsxMTUsNyBAQCBzdGF0aWMgaW50IHJlbmRlcl9zdGF0ZV9zZXR1cChzdHJ1Y3Qg cmVuZGVyX3N0YXRlICpzbykKIAogCXNvLT5hdXhfYmF0Y2hfb2Zmc2V0ID0gaSAqIHNpemVvZih1 MzIpOwogCi0JaWYgKEhBU19QT09MRURfRVUoZGV2KSkgeworCWlmIChIQVNfUE9PTEVEX0VVKGRl dl9wcml2KSkgewogCQkvKgogCQkgKiBXZSBhbHdheXMgcHJvZ3JhbSAzeDYgcG9vbCBjb25maWcg YnV0IGRlcGVuZGluZyB1cG9uIHdoaWNoCiAJCSAqIHN1YnNsaWNlIGlzIGRpc2FibGVkIEhXIGRy b3BzIGRvd24gdG8gYXBwcm9wcmlhdGUgY29uZmlnCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRl eCBlNjlkMTUxMDAzNzcuLjc4MjJhNDEzYzJjYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBA IC0yNzQ3LDcgKzI3NDcsNyBAQCBzdGF0aWMgaW50IGlyb25sYWtlX2VuYWJsZV92Ymxhbmsoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgaW50IHBpcGUpCiB7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXVuc2lnbmVkIGxvbmcgaXJx ZmxhZ3M7Ci0JdWludDMyX3QgYml0ID0gSU5URUxfR0VOKGRldikgPj0gNyA/CisJdWludDMyX3Qg Yml0ID0gSU5URUxfR0VOKGRldl9wcml2KSA+PSA3ID8KIAkJREVfUElQRV9WQkxBTktfSVZCKHBp cGUpIDogREVfUElQRV9WQkxBTksocGlwZSk7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3By aXYtPmlycV9sb2NrLCBpcnFmbGFncyk7CkBAIC0yNzk3LDcgKzI3OTcsNyBAQCBzdGF0aWMgdm9p ZCBpcm9ubGFrZV9kaXNhYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25l ZCBpbnQgcGlwZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGRldik7CiAJdW5zaWduZWQgbG9uZyBpcnFmbGFnczsKLQl1aW50MzJfdCBiaXQgPSBJTlRF TF9HRU4oZGV2KSA+PSA3ID8KKwl1aW50MzJfdCBiaXQgPSBJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDcgPwogCQlERV9QSVBFX1ZCTEFOS19JVkIocGlwZSkgOiBERV9QSVBFX1ZCTEFOSyhwaXBlKTsK IAogCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBlNGY2ODBmMmU4NmQuLmZkODYwNDMy ZjQ0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTI0NTAsNyArMTI0 NTAsNyBAQCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcyhzdHJ1Y3QgZHJtX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBwbGFu ZV9zdGF0ZS0+ZmI7CiAJaW50IHJldDsKIAotCWlmIChJTlRFTF9HRU4oZGV2KSA+PSA5ICYmIHBs YW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikgeworCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDkgJiYgcGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKSB7CiAJ CXJldCA9IHNrbF91cGRhdGVfc2NhbGVyX3BsYW5lKAogCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShj cnRjX3N0YXRlKSwKIAkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKSk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IGY3NjBkNWZjYmU0OC4uOGI0NzQ4ODM5YzA3 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtNzUzLDcgKzc1Myw3IEBAIGlu dGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSBzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCSBzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKnN0YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2Owor CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocGxhbmUtPmRldik7 CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmJhc2UuY3J0YzsKIAlzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3RydWN0IGludGVs X3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKQEAgLTc5Nyw3ICs3 OTcsNyBAQCBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs CiAJfQogCiAJLyogc2V0dXAgY2FuX3NjYWxlLCBtaW5fc2NhbGUsIG1heF9zY2FsZSAqLwotCWlm IChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikg Pj0gOSkgewogCQkvKiB1c2Ugc2NhbGVyIHdoZW4gY29sb3JrZXkgaXMgbm90IHJlcXVpcmVkICov CiAJCWlmIChzdGF0ZS0+Y2tleS5mbGFncyA9PSBJOTE1X1NFVF9DT0xPUktFWV9OT05FKSB7CiAJ CQljYW5fc2NhbGUgPSAxOwpAQCAtOTEzLDcgKzkxMyw3IEBAIGludGVsX2NoZWNrX3Nwcml0ZV9w bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogCQl3aWR0aF9ieXRlcyA9ICgoc3JjX3gg KiBjcHApICYgNjMpICsgc3JjX3cgKiBjcHA7CiAKLQkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu IDwgOSAmJiAoc3JjX3cgPiAyMDQ4IHx8IHNyY19oID4gMjA0OCB8fAorCQlpZiAoSU5URUxfR0VO KGRldl9wcml2KSA8IDkgJiYgKHNyY193ID4gMjA0OCB8fCBzcmNfaCA+IDIwNDggfHwKIAkJICAg IHdpZHRoX2J5dGVzID4gNDA5NiB8fCBmYi0+cGl0Y2hlc1swXSA+IDQwOTYpKSB7CiAJCQlEUk1f REVCVUdfS01TKCJTb3VyY2UgZGltZW5zaW9ucyBleGNlZWQgaGFyZHdhcmUgbGltaXRzXG4iKTsK IAkJCXJldHVybiAtRUlOVkFMOwpAQCAtOTMyLDcgKzkzMiw3IEBAIGludGVsX2NoZWNrX3Nwcml0 ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlkc3QtPnkxID0gY3J0Y195OwogCWRz dC0+eTIgPSBjcnRjX3kgKyBjcnRjX2g7CiAKLQlpZiAoSU5URUxfR0VOKGRldikgPj0gOSkgewor CWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpIHsKIAkJcmV0ID0gc2tsX2NoZWNrX3BsYW5l X3N1cmZhY2Uoc3RhdGUpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKLS0gCjIuNy40Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK