From: Tvrtko Ursulin Subject: [CI 18/19] drm/i915: Make INTEL_GEN only take dev_priv Date: Thu, 13 Oct 2016 11:03:09 +0100 Message-ID: <1476352990-2504-18-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476352990-2504-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-qk0-x241.google.com (mail-qk0-x241.google.com [IPv6:2607:f8b0:400d:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id A06B56EA05 for ; Thu, 13 Oct 2016 10:03:35 +0000 (UTC) Received: by mail-qk0-x241.google.com with SMTP id v138so5492224qka.2 for ; Thu, 13 Oct 2016 03:03:35 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id yo1sm21209210wjc.16.2016.10.13.03.03.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 03:03:33 -0700 (PDT) In-Reply-To: <1476352990-2504-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 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRGF2aWQgV2VpbmVoYWxsIDxk YXZpZC53ZWluZWhhbGxAbGludXguaW50ZWwuY29tPgpBY2tlZC1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQWNrZWQtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3Vs YUBsaW51eC5pbnRlbC5jb20+CkFja2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4KQWNrZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz dEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAg ICAgICAgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJf c3RhdGUuYyB8IDYgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg ICAgICAgICB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICAgICAg ICAgIHwgOCArKysrLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDkgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggYjAwMTZlZTNiOTA2Li5kZWM1 ODJmOTM0Y2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjYwNyw4ICsyNjA3LDggQEAg c3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAJX19wOyBcCiB9KQogI2RlZmluZSBJTlRFTF9J TkZPKHApCSgmX19JOTE1X18ocCktPmluZm8pCi0jZGVmaW5lIElOVEVMX0dFTihwKQkoSU5URUxf SU5GTyhwKS0+Z2VuKQogCisjZGVmaW5lIElOVEVMX0dFTihkZXZfcHJpdikJKChkZXZfcHJpdikt PmluZm8uZ2VuKQogI2RlZmluZSBJTlRFTF9ERVZJRChkZXZfcHJpdikJKChkZXZfcHJpdiktPmlu Zm8uZGV2aWNlX2lkKQogCiAjZGVmaW5lIFJFVklEX0ZPUkVWRVIJCTB4ZmYKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMKaW5kZXggOTViN2U5YWZkNWY4Li5h OThjMGY0MmJhZGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Jl bmRlcl9zdGF0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9z dGF0ZS5jCkBAIC03Miw5ICs3Miw5IEBAIHJlbmRlcl9zdGF0ZV9nZXRfcm9kYXRhKGNvbnN0IHN0 cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCiBzdGF0aWMgaW50IHJlbmRlcl9zdGF0 ZV9zZXR1cChzdHJ1Y3QgcmVuZGVyX3N0YXRlICpzbykKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gc28tPnZtYS0+dm0tPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KHNvLT52bWEtPnZtLT5kZXYpOwogCWNvbnN0IHN0cnVjdCBpbnRlbF9yZW5k ZXJzdGF0ZV9yb2RhdGEgKnJvZGF0YSA9IHNvLT5yb2RhdGE7Ci0JY29uc3QgYm9vbCBoYXNfNjRi aXRfcmVsb2MgPSBJTlRFTF9HRU4oZGV2KSA+PSA4OworCWNvbnN0IGJvb2wgaGFzXzY0Yml0X3Jl bG9jID0gSU5URUxfR0VOKGRldl9wcml2KSA+PSA4OwogCXVuc2lnbmVkIGludCBpID0gMCwgcmVs b2NfaW5kZXggPSAwOwogCXN0cnVjdCBwYWdlICpwYWdlOwogCXUzMiAqZDsKQEAgLTExNSw3ICsx MTUsNyBAQCBzdGF0aWMgaW50IHJlbmRlcl9zdGF0ZV9zZXR1cChzdHJ1Y3QgcmVuZGVyX3N0YXRl ICpzbykKIAogCXNvLT5hdXhfYmF0Y2hfb2Zmc2V0ID0gaSAqIHNpemVvZih1MzIpOwogCi0JaWYg KEhBU19QT09MRURfRVUoZGV2KSkgeworCWlmIChIQVNfUE9PTEVEX0VVKGRldl9wcml2KSkgewog CQkvKgogCQkgKiBXZSBhbHdheXMgcHJvZ3JhbSAzeDYgcG9vbCBjb25maWcgYnV0IGRlcGVuZGlu ZyB1cG9uIHdoaWNoCiAJCSAqIHN1YnNsaWNlIGlzIGRpc2FibGVkIEhXIGRyb3BzIGRvd24gdG8g YXBwcm9wcmlhdGUgY29uZmlnCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXgg ZTRmNjgwZjJlODZkLi5mZDg2MDQzMmY0NDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKQEAgLTEyNDUwLDcgKzEyNDUwLDcgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxj X2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXN0cnVjdCBkcm1f ZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmZiOwogCWludCByZXQ7CiAKLQlpZiAoSU5U RUxfR0VOKGRldikgPj0gOSAmJiBwbGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9DVVJTT1Ip IHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5ICYmIHBsYW5lLT50eXBlICE9IERSTV9Q TEFORV9UWVBFX0NVUlNPUikgewogCQlyZXQgPSBza2xfdXBkYXRlX3NjYWxlcl9wbGFuZSgKIAkJ CXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSksCiAJCQl0b19pbnRlbF9wbGFuZV9zdGF0 ZShwbGFuZV9zdGF0ZSkpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf c3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCBmNzYw ZDVmY2JlNDguLjhiNDc0ODgzOWMwNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMK QEAgLTc1Myw3ICs3NTMsNyBAQCBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCiAJCQkgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJ CQkgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gcGxhbmUtPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KHBsYW5lLT5kZXYpOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5i YXNlLmNydGM7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj KGNydGMpOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFu ZShwbGFuZSk7CkBAIC03OTcsNyArNzk3LDcgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCX0KIAogCS8qIHNldHVwIGNhbl9zY2FsZSwgbWluX3Nj YWxlLCBtYXhfc2NhbGUgKi8KLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgeworCWlm IChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpIHsKIAkJLyogdXNlIHNjYWxlciB3aGVuIGNvbG9y a2V5IGlzIG5vdCByZXF1aXJlZCAqLwogCQlpZiAoc3RhdGUtPmNrZXkuZmxhZ3MgPT0gSTkxNV9T RVRfQ09MT1JLRVlfTk9ORSkgewogCQkJY2FuX3NjYWxlID0gMTsKQEAgLTkxMyw3ICs5MTMsNyBA QCBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIAkJ d2lkdGhfYnl0ZXMgPSAoKHNyY194ICogY3BwKSAmIDYzKSArIHNyY193ICogY3BwOwogCi0JCWlm IChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDkgJiYgKHNyY193ID4gMjA0OCB8fCBzcmNfaCA+IDIw NDggfHwKKwkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA5ICYmIChzcmNfdyA+IDIwNDggfHwg c3JjX2ggPiAyMDQ4IHx8CiAJCSAgICB3aWR0aF9ieXRlcyA+IDQwOTYgfHwgZmItPnBpdGNoZXNb MF0gPiA0MDk2KSkgewogCQkJRFJNX0RFQlVHX0tNUygiU291cmNlIGRpbWVuc2lvbnMgZXhjZWVk IGhhcmR3YXJlIGxpbWl0c1xuIik7CiAJCQlyZXR1cm4gLUVJTlZBTDsKQEAgLTkzMiw3ICs5MzIs NyBAQCBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ ZHN0LT55MSA9IGNydGNfeTsKIAlkc3QtPnkyID0gY3J0Y195ICsgY3J0Y19oOwogCi0JaWYgKElO VEVMX0dFTihkZXYpID49IDkpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KSB7CiAJ CXJldCA9IHNrbF9jaGVja19wbGFuZV9zdXJmYWNlKHN0YXRlKTsKIAkJaWYgKHJldCkKIAkJCXJl dHVybiByZXQ7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==