From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 18/19] drm/i915: Make INTEL_GEN only take dev_priv Date: Tue, 11 Oct 2016 14:21:51 +0100 Message-ID: <1476192112-25336-19-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476192112-25336-1-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-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id AF0556E676 for ; Tue, 11 Oct 2016 13:22:26 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id p80so3752828lfp.1 for ; Tue, 11 Oct 2016 06:22:26 -0700 (PDT) In-Reply-To: <1476192112-25336-1-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 ZXZfcHJpdi4gKFZpbGxlIFN5cmphbGEpCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggICAgICAgICAgICAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f cmVuZGVyX3N0YXRlLmMgfCA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jICAgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUu YyAgICAgICAgICB8IDggKysrKy0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCsp LCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGY5ZjlhMjE4ZDVm ZS4uM2YzOGI5NzU1NzYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI2MDQsOCArMjYw NCw4IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogCV9fcDsgXAogfSkKICNkZWZpbmUg SU5URUxfSU5GTyhwKQkoJl9fSTkxNV9fKHApLT5pbmZvKQotI2RlZmluZSBJTlRFTF9HRU4ocCkJ KElOVEVMX0lORk8ocCktPmdlbikKIAorI2RlZmluZSBJTlRFTF9HRU4oZGV2X3ByaXYpCSgoZGV2 X3ByaXYpLT5pbmZvLmdlbikKICNkZWZpbmUgSU5URUxfREVWSUQoZGV2X3ByaXYpCSgoZGV2X3By aXYpLT5pbmZvLmRldmljZV9pZCkKIAogI2RlZmluZSBSRVZJRF9GT1JFVkVSCQkweGZmCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCmluZGV4IDk1YjdlOWFm ZDVmOC4uYTk4YzBmNDJiYWRkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9yZW5kZXJfc3RhdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9y ZW5kZXJfc3RhdGUuYwpAQCAtNzIsOSArNzIsOSBAQCByZW5kZXJfc3RhdGVfZ2V0X3JvZGF0YShj b25zdCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAogc3RhdGljIGludCByZW5k ZXJfc3RhdGVfc2V0dXAoc3RydWN0IHJlbmRlcl9zdGF0ZSAqc28pCiB7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IHNvLT52bWEtPnZtLT5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShzby0+dm1hLT52bS0+ZGV2KTsKIAljb25zdCBzdHJ1Y3QgaW50 ZWxfcmVuZGVyc3RhdGVfcm9kYXRhICpyb2RhdGEgPSBzby0+cm9kYXRhOwotCWNvbnN0IGJvb2wg aGFzXzY0Yml0X3JlbG9jID0gSU5URUxfR0VOKGRldikgPj0gODsKKwljb25zdCBib29sIGhhc182 NGJpdF9yZWxvYyA9IElOVEVMX0dFTihkZXZfcHJpdikgPj0gODsKIAl1bnNpZ25lZCBpbnQgaSA9 IDAsIHJlbG9jX2luZGV4ID0gMDsKIAlzdHJ1Y3QgcGFnZSAqcGFnZTsKIAl1MzIgKmQ7CkBAIC0x MTUsNyArMTE1LDcgQEAgc3RhdGljIGludCByZW5kZXJfc3RhdGVfc2V0dXAoc3RydWN0IHJlbmRl cl9zdGF0ZSAqc28pCiAKIAlzby0+YXV4X2JhdGNoX29mZnNldCA9IGkgKiBzaXplb2YodTMyKTsK IAotCWlmIChIQVNfUE9PTEVEX0VVKGRldikpIHsKKwlpZiAoSEFTX1BPT0xFRF9FVShkZXZfcHJp dikpIHsKIAkJLyoKIAkJICogV2UgYWx3YXlzIHByb2dyYW0gM3g2IHBvb2wgY29uZmlnIGJ1dCBk ZXBlbmRpbmcgdXBvbiB3aGljaAogCQkgKiBzdWJzbGljZSBpcyBkaXNhYmxlZCBIVyBkcm9wcyBk b3duIHRvIGFwcHJvcHJpYXRlIGNvbmZpZwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CmluZGV4IGMzZmI5ZjcwMGM3YS4uZWRhMzhlNTNmNjhhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCkBAIC0xMjQ1Miw3ICsxMjQ1Miw3IEBAIGludCBpbnRlbF9wbGFuZV9hdG9t aWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlzdHJ1 Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5mYjsKIAlpbnQgcmV0OwogCi0J aWYgKElOVEVMX0dFTihkZXYpID49IDkgJiYgcGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVf Q1VSU09SKSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSAmJiBwbGFuZS0+dHlwZSAh PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IpIHsKIAkJcmV0ID0gc2tsX3VwZGF0ZV9zY2FsZXJfcGxh bmUoCiAJCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpLAogCQkJdG9faW50ZWxfcGxh bmVfc3RhdGUocGxhbmVfc3RhdGUpKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5k ZXggZjc2MGQ1ZmNiZTQ4Li44YjQ3NDg4MzljMDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jCkBAIC03NTMsNyArNzUzLDcgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlLAogCQkJIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiB7Ci0Jc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShwbGFuZS0+ZGV2KTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBz dGF0ZS0+YmFzZS5jcnRjOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50 ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50 ZWxfcGxhbmUocGxhbmUpOwpAQCAtNzk3LDcgKzc5Nyw3IEBAIGludGVsX2NoZWNrX3Nwcml0ZV9w bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAl9CiAKIAkvKiBzZXR1cCBjYW5fc2NhbGUs IG1pbl9zY2FsZSwgbWF4X3NjYWxlICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDkp IHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KSB7CiAJCS8qIHVzZSBzY2FsZXIgd2hl biBjb2xvcmtleSBpcyBub3QgcmVxdWlyZWQgKi8KIAkJaWYgKHN0YXRlLT5ja2V5LmZsYWdzID09 IEk5MTVfU0VUX0NPTE9SS0VZX05PTkUpIHsKIAkJCWNhbl9zY2FsZSA9IDE7CkBAIC05MTMsNyAr OTEzLDcgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l LAogCiAJCXdpZHRoX2J5dGVzID0gKChzcmNfeCAqIGNwcCkgJiA2MykgKyBzcmNfdyAqIGNwcDsK IAotCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA5ICYmIChzcmNfdyA+IDIwNDggfHwgc3Jj X2ggPiAyMDQ4IHx8CisJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOSAmJiAoc3JjX3cgPiAy MDQ4IHx8IHNyY19oID4gMjA0OCB8fAogCQkgICAgd2lkdGhfYnl0ZXMgPiA0MDk2IHx8IGZiLT5w aXRjaGVzWzBdID4gNDA5NikpIHsKIAkJCURSTV9ERUJVR19LTVMoIlNvdXJjZSBkaW1lbnNpb25z IGV4Y2VlZCBoYXJkd2FyZSBsaW1pdHNcbiIpOwogCQkJcmV0dXJuIC1FSU5WQUw7CkBAIC05MzIs NyArOTMyLDcgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBs YW5lLAogCWRzdC0+eTEgPSBjcnRjX3k7CiAJZHN0LT55MiA9IGNydGNfeSArIGNydGNfaDsKIAot CWlmIChJTlRFTF9HRU4oZGV2KSA+PSA5KSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g OSkgewogCQlyZXQgPSBza2xfY2hlY2tfcGxhbmVfc3VyZmFjZShzdGF0ZSk7CiAJCWlmIChyZXQp CiAJCQlyZXR1cm4gcmV0OwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=