From: Tvrtko Ursulin Subject: [PATCH 06/22] drm/i915: Make HAS_GMCH_DISPLAY only take dev_priv Date: Wed, 5 Oct 2016 13:33:33 +0100 Message-ID: <1475670829-14025-7-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-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id C58AE6E831 for ; Wed, 5 Oct 2016 12:34:06 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id b184so24370219wma.3 for ; Wed, 05 Oct 2016 05:34:06 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk1vcmUgLnJv ZGF0YSBzdHJpbmcgc2F2aW5nIGJ5IGF2b2lkIF9fSTkxNV9fIG1hZ2ljIGluc2lkZSBXQVJOcy4K ClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgMiArLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYyAgICAgICAgIHwgNiArKystLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgICB8IDggKysrKy0tLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICAgICAgICAgICB8IDIgKy0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RzaS5jICAgICAgICAgICB8IDIgKy0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2ZpZm9fdW5kZXJydW4uYyB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2hkbWkuYyAgICAgICAgICB8IDUgKysrLS0KIDcgZmlsZXMgY2hhbmdlZCwgMTQgaW5z ZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg NmFiY2ZiODlkNzYwLi5iOWM4Mjk3NGM4MjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAt Mjg2NSw3ICsyODY1LDcgQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAjZGVmaW5lIEhB U19QQ0hfTk9QKGRldl9wcml2KSAoSU5URUxfUENIX1RZUEUoZGV2X3ByaXYpID09IFBDSF9OT1Ap CiAjZGVmaW5lIEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpIChJTlRFTF9QQ0hfVFlQRShkZXZfcHJp dikgIT0gUENIX05PTkUpCiAKLSNkZWZpbmUgSEFTX0dNQ0hfRElTUExBWShkZXYpIChJTlRFTF9J TkZPKGRldiktPmhhc19nbWNoX2Rpc3BsYXkpCisjZGVmaW5lIEhBU19HTUNIX0RJU1BMQVkoZGV2 X3ByaXYpIChkZXZfcHJpdi0+aW5mby5oYXNfZ21jaF9kaXNwbGF5KQogCiAvKiBEUEYgPT0gZHlu YW1pYyBwYXJpdHkgZmVhdHVyZSAqLwogI2RlZmluZSBIQVNfTDNfRFBGKGRldikgKElOVEVMX0lO Rk8oZGV2KS0+aGFzX2wzX2RwZikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2NvbG9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCmluZGV4IDk1 YTcyNzcxZWVhNi4uNTM2MmMwNzkzMmQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jb2xvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMK QEAgLTI3Myw3ICsyNzMsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X2xvYWRfbHV0c19pbnRlcm5hbChz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBl OwogCWludCBpOwogCi0JaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2KSkgeworCWlmIChIQVNfR01D SF9ESVNQTEFZKGRldl9wcml2KSkgewogCQlpZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0 YXRlLCBJTlRFTF9PVVRQVVRfRFNJKSkKIAkJCWFzc2VydF9kc2lfcGxsX2VuYWJsZWQoZGV2X3By aXYpOwogCQllbHNlCkBAIC0yODgsNyArMjg4LDcgQEAgc3RhdGljIHZvaWQgaTl4eF9sb2FkX2x1 dHNfaW50ZXJuYWwoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCShkcm1fY29sb3JfbHV0X2V4 dHJhY3QobHV0W2ldLmdyZWVuLCA4KSA8PCA4KSB8CiAJCQkJZHJtX2NvbG9yX2x1dF9leHRyYWN0 KGx1dFtpXS5ibHVlLCA4KTsKIAotCQkJaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2KSkKKwkJCWlm IChIQVNfR01DSF9ESVNQTEFZKGRldl9wcml2KSkKIAkJCQlJOTE1X1dSSVRFKFBBTEVUVEUocGlw ZSwgaSksIHdvcmQpOwogCQkJZWxzZQogCQkJCUk5MTVfV1JJVEUoTEdDX1BBTEVUVEUocGlwZSwg aSksIHdvcmQpOwpAQCAtMjk3LDcgKzI5Nyw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfbG9hZF9sdXRz X2ludGVybmFsKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJZm9yIChpID0gMDsgaSA8IDI1Njsg aSsrKSB7CiAJCQl1aW50MzJfdCB3b3JkID0gKGkgPDwgMTYpIHwgKGkgPDwgOCkgfCBpOwogCi0J CQlpZiAoSEFTX0dNQ0hfRElTUExBWShkZXYpKQorCQkJaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2 X3ByaXYpKQogCQkJCUk5MTVfV1JJVEUoUEFMRVRURShwaXBlLCBpKSwgd29yZCk7CiAJCQllbHNl CiAJCQkJSTkxNV9XUklURShMR0NfUEFMRVRURShwaXBlLCBpKSwgd29yZCk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggN2EwNWYxN2U3Y2Q2Li5mMzIyOThhZjQ1MGMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTUwMzMsNyArNTAzMyw3IEBAIGlu dGVsX3ByZV9kaXNhYmxlX3ByaW1hcnlfbm9hdG9taWMoc3RydWN0IGRybV9jcnRjICpjcnRjKQog CSAqIGV2ZW50IHdoaWNoIGlzIGFmdGVyIHRoZSB2Ymxhbmsgc3RhcnQgZXZlbnQsIHNvIHdlIG5l ZWQgdG8gaGF2ZSBhCiAJICogd2FpdC1mb3ItdmJsYW5rIGJldHdlZW4gZGlzYWJsaW5nIHRoZSBw bGFuZSBhbmQgdGhlIHBpcGUuCiAJICovCi0JaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2KSkgewor CWlmIChIQVNfR01DSF9ESVNQTEFZKGRldl9wcml2KSkgewogCQlpbnRlbF9zZXRfbWVtb3J5X2N4 c3IoZGV2X3ByaXYsIGZhbHNlKTsKIAkJZGV2X3ByaXYtPndtLnZsdi5jeHNyID0gZmFsc2U7CiAJ CWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIHBpcGUpOwpAQCAtNTA5OCw3ICs1MDk4LDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqb2xkX2NydGNfc3RhdGUpCiAJCQlpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KCZjcnRjLT5i YXNlKTsKIAl9CiAKLQlpZiAocGlwZV9jb25maWctPmRpc2FibGVfY3hzciAmJiBIQVNfR01DSF9E SVNQTEFZKGRldikpIHsKKwlpZiAocGlwZV9jb25maWctPmRpc2FibGVfY3hzciAmJiBIQVNfR01D SF9ESVNQTEFZKGRldl9wcml2KSkgewogCQljcnRjLT53bS5jeHNyX2FsbG93ZWQgPSBmYWxzZTsK IAogCQkvKgpAQCAtMTA4OTIsNyArMTA4OTIsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX3Vw ZGF0ZV9jdXJzb3Ioc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlwb3MgfD0geSA8PCBDVVJTT1Jf WV9TSElGVDsKIAogCQkvKiBJTEsrIGRvIHRoaXMgYXV0b21hZ2ljYWxseSAqLwotCQlpZiAoSEFT X0dNQ0hfRElTUExBWShkZXYpICYmCisJCWlmIChIQVNfR01DSF9ESVNQTEFZKGRldl9wcml2KSAm JgogCQkgICAgcGxhbmVfc3RhdGUtPmJhc2Uucm90YXRpb24gPT0gRFJNX1JPVEFURV8xODApIHsK IAkJCWJhc2UgKz0gKHBsYW5lX3N0YXRlLT5iYXNlLmNydGNfaCAqCiAJCQkJIHBsYW5lX3N0YXRl LT5iYXNlLmNydGNfdyAtIDEpICogNDsKQEAgLTE2NTkwLDcgKzE2NTkwLDcgQEAgc3RhdGljIHZv aWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAlpZiAoY3J0 Yy0+YWN0aXZlICYmICFpbnRlbF9jcnRjX2hhc19lbmNvZGVycyhjcnRjKSkKIAkJaW50ZWxfY3J0 Y19kaXNhYmxlX25vYXRvbWljKCZjcnRjLT5iYXNlKTsKIAotCWlmIChjcnRjLT5hY3RpdmUgfHwg SEFTX0dNQ0hfRElTUExBWShkZXYpKSB7CisJaWYgKGNydGMtPmFjdGl2ZSB8fCBIQVNfR01DSF9E SVNQTEFZKGRldl9wcml2KSkgewogCQkvKgogCQkgKiBXZSBzdGFydCBvdXQgd2l0aCB1bmRlcnJ1 biByZXBvcnRpbmcgZGlzYWJsZWQgdG8gYXZvaWQgcmFjZXMuCiAJCSAqIEZvciBjb3JyZWN0IGJv b2trZWVwaW5nIG1hcmsgdGhpcyBvbiBhY3RpdmUgY3J0Y3MuCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YwppbmRleCAwYjZmMWJhYjY3MWQuLjUxZDkyYTljNmNiMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jCkBAIC0xNTgzLDcgKzE1ODMsNyBAQCBpbnRlbF9kcF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQlyZXR1cm4gcmV0OwogCQl9CiAKLQkJaWYgKEhB U19HTUNIX0RJU1BMQVkoZGV2KSkKKwkJaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpKQog CQkJaW50ZWxfZ21jaF9wYW5lbF9maXR0aW5nKGludGVsX2NydGMsIHBpcGVfY29uZmlnLAogCQkJ CQkJIGludGVsX2Nvbm5lY3Rvci0+cGFuZWwuZml0dGluZ19tb2RlKTsKIAkJZWxzZQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kc2kuYwppbmRleCA3MjdhZGFhY2U5NmMuLjViMWU0NDVhODBkMCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHNpLmMKQEAgLTEzNDYsNyArMTM0Niw3IEBAIHN0YXRpYyBpbnQgaW50 ZWxfZHNpX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkJ RFJNX0RFQlVHX0tNUygibm8gc2NhbGluZyBub3Qgc3VwcG9ydGVkXG4iKTsKIAkJCXJldHVybiAt RUlOVkFMOwogCQl9Ci0JCWlmIChIQVNfR01DSF9ESVNQTEFZKGRldikgJiYKKwkJaWYgKEhBU19H TUNIX0RJU1BMQVkodG9faTkxNShkZXYpKSAmJgogCQkgICAgdmFsID09IERSTV9NT0RFX1NDQUxF X0NFTlRFUikgewogCQkJRFJNX0RFQlVHX0tNUygiY2VudGVyaW5nIG5vdCBzdXBwb3J0ZWRcbiIp OwogCQkJcmV0dXJuIC1FSU5WQUw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9maWZvX3VuZGVycnVuLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9maWZvX3Vu ZGVycnVuLmMKaW5kZXggZWJiNGZlZDgzMjJlLi4wNzY4OTNjYzM4OTAgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZpZm9fdW5kZXJydW4uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9maWZvX3VuZGVycnVuLmMKQEAgLTI1NCw3ICsyNTQsNyBAQCBzdGF0 aWMgYm9vbCBfX2ludGVsX3NldF9jcHVfZmlmb191bmRlcnJ1bl9yZXBvcnRpbmcoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAlvbGQgPSAhaW50ZWxfY3J0Yy0+Y3B1X2ZpZm9fdW5kZXJydW5fZGlz YWJsZWQ7CiAJaW50ZWxfY3J0Yy0+Y3B1X2ZpZm9fdW5kZXJydW5fZGlzYWJsZWQgPSAhZW5hYmxl OwogCi0JaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2KSkKKwlpZiAoSEFTX0dNQ0hfRElTUExBWShk ZXZfcHJpdikpCiAJCWk5eHhfc2V0X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldiwgcGlwZSwg ZW5hYmxlLCBvbGQpOwogCWVsc2UgaWYgKElTX0dFTjUoZGV2KSB8fCBJU19HRU42KGRldikpCiAJ CWlyb25sYWtlX3NldF9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXYsIHBpcGUsIGVuYWJsZSk7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMKaW5kZXggMzk3ZTEwZjRiNmYwLi5hZDNmZjRmZTYz Y2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMKQEAgLTEyNjUsNiArMTI2NSw3IEBAIGlu dGVsX2hkbWlfbW9kZV92YWxpZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogewog CXN0cnVjdCBpbnRlbF9oZG1pICpoZG1pID0gaW50ZWxfYXR0YWNoZWRfaGRtaShjb25uZWN0b3Ip OwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9oZG1pX3RvX2RldihoZG1pKTsKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJZW51bSBk cm1fbW9kZV9zdGF0dXMgc3RhdHVzOwogCWludCBjbG9jazsKIAlpbnQgbWF4X2RvdGNsayA9IHRv X2k5MTUoY29ubmVjdG9yLT5kZXYpLT5tYXhfZG90Y2xrX2ZyZXE7CkBAIC0xMjg3LDcgKzEyODgs NyBAQCBpbnRlbF9oZG1pX21vZGVfdmFsaWQoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv ciwKIAlzdGF0dXMgPSBoZG1pX3BvcnRfY2xvY2tfdmFsaWQoaGRtaSwgY2xvY2ssIHRydWUpOwog CiAJLyogaWYgd2UgY2FuJ3QgZG8gOGJwYyB3ZSBtYXkgc3RpbGwgYmUgYWJsZSB0byBkbyAxMmJw YyAqLwotCWlmICghSEFTX0dNQ0hfRElTUExBWShkZXYpICYmIHN0YXR1cyAhPSBNT0RFX09LKQor CWlmICghSEFTX0dNQ0hfRElTUExBWShkZXZfcHJpdikgJiYgc3RhdHVzICE9IE1PREVfT0spCiAJ CXN0YXR1cyA9IGhkbWlfcG9ydF9jbG9ja192YWxpZChoZG1pLCBjbG9jayAqIDMgLyAyLCB0cnVl KTsKIAogCXJldHVybiBzdGF0dXM7CkBAIC0xMjk3LDcgKzEyOTgsNyBAQCBzdGF0aWMgYm9vbCBo ZG1pXzEyYnBjX3Bvc3NpYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQog ewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjX3N0YXRlLT5iYXNlLmNydGMtPmRldjsK IAotCWlmIChIQVNfR01DSF9ESVNQTEFZKGRldikpCisJaWYgKEhBU19HTUNIX0RJU1BMQVkodG9f aTkxNShkZXYpKSkKIAkJcmV0dXJuIGZhbHNlOwogCiAJLyoKLS0gCjIuNy40CgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK