From: Tvrtko Ursulin Subject: [PATCH 21/22] drm/i915: Make INTEL_GEN only take dev_priv Date: Wed, 5 Oct 2016 13:33:48 +0100 Message-ID: <1475670829-14025-22-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475670829-14025-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-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id CF8176E843 for ; Wed, 5 Oct 2016 12:34:22 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id f193so19745755wmg.2 for ; Wed, 05 Oct 2016 05:34:22 -0700 (PDT) In-Reply-To: <1475670829-14025-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 OCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxp biA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggICAgICAgICAgICAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fcmVuZGVyX3N0YXRlLmMgfCA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jICAgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYyAgICAgICAgICB8IDggKysrKy0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25z KCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDFlYzU1NjBl YWRkMy4uYTdlNjhiZWFjNTcwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI2MDYsOCAr MjYwNiw4IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogCV9fcDsgXAogfSkKICNkZWZp bmUgSU5URUxfSU5GTyhwKQkoJl9fSTkxNV9fKHApLT5pbmZvKQotI2RlZmluZSBJTlRFTF9HRU4o cCkJKElOVEVMX0lORk8ocCktPmdlbikKIAorI2RlZmluZSBJTlRFTF9HRU4oZGV2X3ByaXYpCShk ZXZfcHJpdi0+aW5mby5nZW4pCiAjZGVmaW5lIElOVEVMX0RFVklEKGRldl9wcml2KQkoZGV2X3By aXYtPmluZm8uZGV2aWNlX2lkKQogCiAjZGVmaW5lIFJFVklEX0ZPUkVWRVIJCTB4ZmYKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMKaW5kZXggOTViN2U5YWZk NWY4Li5hOThjMGY0MmJhZGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX3JlbmRlcl9zdGF0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Jl bmRlcl9zdGF0ZS5jCkBAIC03Miw5ICs3Miw5IEBAIHJlbmRlcl9zdGF0ZV9nZXRfcm9kYXRhKGNv bnN0IHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCiBzdGF0aWMgaW50IHJlbmRl cl9zdGF0ZV9zZXR1cChzdHJ1Y3QgcmVuZGVyX3N0YXRlICpzbykKIHsKLQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gc28tPnZtYS0+dm0tPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KHNvLT52bWEtPnZtLT5kZXYpOwogCWNvbnN0IHN0cnVjdCBpbnRl bF9yZW5kZXJzdGF0ZV9yb2RhdGEgKnJvZGF0YSA9IHNvLT5yb2RhdGE7Ci0JY29uc3QgYm9vbCBo YXNfNjRiaXRfcmVsb2MgPSBJTlRFTF9HRU4oZGV2KSA+PSA4OworCWNvbnN0IGJvb2wgaGFzXzY0 Yml0X3JlbG9jID0gSU5URUxfR0VOKGRldl9wcml2KSA+PSA4OwogCXVuc2lnbmVkIGludCBpID0g MCwgcmVsb2NfaW5kZXggPSAwOwogCXN0cnVjdCBwYWdlICpwYWdlOwogCXUzMiAqZDsKQEAgLTEx NSw3ICsxMTUsNyBAQCBzdGF0aWMgaW50IHJlbmRlcl9zdGF0ZV9zZXR1cChzdHJ1Y3QgcmVuZGVy X3N0YXRlICpzbykKIAogCXNvLT5hdXhfYmF0Y2hfb2Zmc2V0ID0gaSAqIHNpemVvZih1MzIpOwog Ci0JaWYgKEhBU19QT09MRURfRVUoZGV2KSkgeworCWlmIChIQVNfUE9PTEVEX0VVKGRldl9wcml2 KSkgewogCQkvKgogCQkgKiBXZSBhbHdheXMgcHJvZ3JhbSAzeDYgcG9vbCBjb25maWcgYnV0IGRl cGVuZGluZyB1cG9uIHdoaWNoCiAJCSAqIHN1YnNsaWNlIGlzIGRpc2FibGVkIEhXIGRyb3BzIGRv d24gdG8gYXBwcm9wcmlhdGUgY29uZmlnCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggMDU0MGFmYzNmZWY0Li40MzM0M2E5YTA3ZWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTEyNDQ5LDcgKzEyNDQ5LDcgQEAgaW50IGludGVsX3BsYW5lX2F0b21p Y19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXN0cnVj dCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmZiOwogCWludCByZXQ7CiAKLQlp ZiAoSU5URUxfR0VOKGRldikgPj0gOSAmJiBwbGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9D VVJTT1IpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5ICYmIHBsYW5lLT50eXBlICE9 IERSTV9QTEFORV9UWVBFX0NVUlNPUikgewogCQlyZXQgPSBza2xfdXBkYXRlX3NjYWxlcl9wbGFu ZSgKIAkJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSksCiAJCQl0b19pbnRlbF9wbGFu ZV9zdGF0ZShwbGFuZV9zdGF0ZSkpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRl eCBmNzYwZDVmY2JlNDguLjhiNDc0ODgzOWMwNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3By aXRlLmMKQEAgLTc1Myw3ICs3NTMsNyBAQCBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh dGUsCiAJCQkgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KHBsYW5lLT5kZXYpOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0 YXRlLT5iYXNlLmNydGM7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRl bF9jcnRjKGNydGMpOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRl bF9wbGFuZShwbGFuZSk7CkBAIC03OTcsNyArNzk3LDcgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3Bs YW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCX0KIAogCS8qIHNldHVwIGNhbl9zY2FsZSwg bWluX3NjYWxlLCBtYXhfc2NhbGUgKi8KLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkg eworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpIHsKIAkJLyogdXNlIHNjYWxlciB3aGVu IGNvbG9ya2V5IGlzIG5vdCByZXF1aXJlZCAqLwogCQlpZiAoc3RhdGUtPmNrZXkuZmxhZ3MgPT0g STkxNV9TRVRfQ09MT1JLRVlfTk9ORSkgewogCQkJY2FuX3NjYWxlID0gMTsKQEAgLTkxMyw3ICs5 MTMsNyBAQCBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs CiAKIAkJd2lkdGhfYnl0ZXMgPSAoKHNyY194ICogY3BwKSAmIDYzKSArIHNyY193ICogY3BwOwog Ci0JCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDkgJiYgKHNyY193ID4gMjA0OCB8fCBzcmNf aCA+IDIwNDggfHwKKwkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA5ICYmIChzcmNfdyA+IDIw NDggfHwgc3JjX2ggPiAyMDQ4IHx8CiAJCSAgICB3aWR0aF9ieXRlcyA+IDQwOTYgfHwgZmItPnBp dGNoZXNbMF0gPiA0MDk2KSkgewogCQkJRFJNX0RFQlVHX0tNUygiU291cmNlIGRpbWVuc2lvbnMg ZXhjZWVkIGhhcmR3YXJlIGxpbWl0c1xuIik7CiAJCQlyZXR1cm4gLUVJTlZBTDsKQEAgLTkzMiw3 ICs5MzIsNyBAQCBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUsCiAJZHN0LT55MSA9IGNydGNfeTsKIAlkc3QtPnkyID0gY3J0Y195ICsgY3J0Y19oOwogCi0J aWYgKElOVEVMX0dFTihkZXYpID49IDkpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5 KSB7CiAJCXJldCA9IHNrbF9jaGVja19wbGFuZV9zdXJmYWNlKHN0YXRlKTsKIAkJaWYgKHJldCkK IAkJCXJldHVybiByZXQ7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==