From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 03/19] drm/i915: Make HAS_GMCH_DISPLAY only take dev_priv Date: Tue, 11 Oct 2016 14:21:36 +0100 Message-ID: <1476192112-25336-4-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-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id C910A6E66D for ; Tue, 11 Oct 2016 13:22:12 +0000 (UTC) Received: by mail-lf0-x241.google.com with SMTP id b75so3720770lfg.3 for ; Tue, 11 Oct 2016 06:22:12 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk1vcmUgLnJv ZGF0YSBzdHJpbmcgc2F2aW5nIGJ5IGF2b2lkIF9fSTkxNV9fIG1hZ2ljIGluc2lkZSBXQVJOcy4K CnYyOiBBZGQgcGFyYW50aGVzZXMgYXJvdW5kIGRldl9wcml2LiAoVmlsbGUgU3lyamFsYSkKClNp Z25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgMiArLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYyAgICAgICAgIHwgNiArKystLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgICB8IDggKysrKy0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICAgICAgICAgICB8IDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RzaS5jICAgICAgICAgICB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2ZpZm9fdW5kZXJydW4uYyB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2hkbWkuYyAgICAgICAgICB8IDUgKysrLS0KIDcgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0 aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggM2Nh YTFjNzY3NTEyLi4xYTQ2OThlNjY1YmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjg2 Myw3ICsyODYzLDcgQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAjZGVmaW5lIEhBU19Q Q0hfTk9QKGRldl9wcml2KSAoSU5URUxfUENIX1RZUEUoZGV2X3ByaXYpID09IFBDSF9OT1ApCiAj ZGVmaW5lIEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpIChJTlRFTF9QQ0hfVFlQRShkZXZfcHJpdikg IT0gUENIX05PTkUpCiAKLSNkZWZpbmUgSEFTX0dNQ0hfRElTUExBWShkZXYpIChJTlRFTF9JTkZP KGRldiktPmhhc19nbWNoX2Rpc3BsYXkpCisjZGVmaW5lIEhBU19HTUNIX0RJU1BMQVkoZGV2X3By aXYpICgoZGV2X3ByaXYpLT5pbmZvLmhhc19nbWNoX2Rpc3BsYXkpCiAKIC8qIERQRiA9PSBkeW5h bWljIHBhcml0eSBmZWF0dXJlICovCiAjZGVmaW5lIEhBU19MM19EUEYoZGV2KSAoSU5URUxfSU5G TyhkZXYpLT5oYXNfbDNfZHBmKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfY29sb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMKaW5kZXggOTVh NzI3NzFlZWE2Li41MzYyYzA3OTMyZDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2NvbG9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYwpA QCAtMjczLDcgKzI3Myw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfbG9hZF9sdXRzX2ludGVybmFsKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKIAllbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7 CiAJaW50IGk7CiAKLQlpZiAoSEFTX0dNQ0hfRElTUExBWShkZXYpKSB7CisJaWYgKEhBU19HTUNI X0RJU1BMQVkoZGV2X3ByaXYpKSB7CiAJCWlmIChpbnRlbF9jcnRjX2hhc190eXBlKGNydGNfc3Rh dGUsIElOVEVMX09VVFBVVF9EU0kpKQogCQkJYXNzZXJ0X2RzaV9wbGxfZW5hYmxlZChkZXZfcHJp dik7CiAJCWVsc2UKQEAgLTI4OCw3ICsyODgsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X2xvYWRfbHV0 c19pbnRlcm5hbChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJKGRybV9jb2xvcl9sdXRfZXh0 cmFjdChsdXRbaV0uZ3JlZW4sIDgpIDw8IDgpIHwKIAkJCQlkcm1fY29sb3JfbHV0X2V4dHJhY3Qo bHV0W2ldLmJsdWUsIDgpOwogCi0JCQlpZiAoSEFTX0dNQ0hfRElTUExBWShkZXYpKQorCQkJaWYg KEhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpKQogCQkJCUk5MTVfV1JJVEUoUEFMRVRURShwaXBl LCBpKSwgd29yZCk7CiAJCQllbHNlCiAJCQkJSTkxNV9XUklURShMR0NfUEFMRVRURShwaXBlLCBp KSwgd29yZCk7CkBAIC0yOTcsNyArMjk3LDcgQEAgc3RhdGljIHZvaWQgaTl4eF9sb2FkX2x1dHNf aW50ZXJuYWwoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlmb3IgKGkgPSAwOyBpIDwgMjU2OyBp KyspIHsKIAkJCXVpbnQzMl90IHdvcmQgPSAoaSA8PCAxNikgfCAoaSA8PCA4KSB8IGk7CiAKLQkJ CWlmIChIQVNfR01DSF9ESVNQTEFZKGRldikpCisJCQlpZiAoSEFTX0dNQ0hfRElTUExBWShkZXZf cHJpdikpCiAJCQkJSTkxNV9XUklURShQQUxFVFRFKHBpcGUsIGkpLCB3b3JkKTsKIAkJCWVsc2UK IAkJCQlJOTE1X1dSSVRFKExHQ19QQUxFVFRFKHBpcGUsIGkpLCB3b3JkKTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAwYTY5ZTgwODIxZWUuLmI3Njg1OTM2ZDMyNCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNTAzNiw3ICs1MDM2LDcgQEAgaW50 ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeV9ub2F0b21pYyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJ ICogZXZlbnQgd2hpY2ggaXMgYWZ0ZXIgdGhlIHZibGFuayBzdGFydCBldmVudCwgc28gd2UgbmVl ZCB0byBoYXZlIGEKIAkgKiB3YWl0LWZvci12YmxhbmsgYmV0d2VlbiBkaXNhYmxpbmcgdGhlIHBs YW5lIGFuZCB0aGUgcGlwZS4KIAkgKi8KLQlpZiAoSEFTX0dNQ0hfRElTUExBWShkZXYpKSB7CisJ aWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpKSB7CiAJCWludGVsX3NldF9tZW1vcnlfY3hz cihkZXZfcHJpdiwgZmFsc2UpOwogCQlkZXZfcHJpdi0+d20udmx2LmN4c3IgPSBmYWxzZTsKIAkJ aW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgcGlwZSk7CkBAIC01MTAxLDcgKzUxMDEsNyBAQCBz dGF0aWMgdm9pZCBpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpvbGRfY3J0Y19zdGF0ZSkKIAkJCWludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoJmNydGMtPmJh c2UpOwogCX0KIAotCWlmIChwaXBlX2NvbmZpZy0+ZGlzYWJsZV9jeHNyICYmIEhBU19HTUNIX0RJ U1BMQVkoZGV2KSkgeworCWlmIChwaXBlX2NvbmZpZy0+ZGlzYWJsZV9jeHNyICYmIEhBU19HTUNI X0RJU1BMQVkoZGV2X3ByaXYpKSB7CiAJCWNydGMtPndtLmN4c3JfYWxsb3dlZCA9IGZhbHNlOwog CiAJCS8qCkBAIC0xMDg5NSw3ICsxMDg5NSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfdXBk YXRlX2N1cnNvcihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCXBvcyB8PSB5IDw8IENVUlNPUl9Z X1NISUZUOwogCiAJCS8qIElMSysgZG8gdGhpcyBhdXRvbWFnaWNhbGx5ICovCi0JCWlmIChIQVNf R01DSF9ESVNQTEFZKGRldikgJiYKKwkJaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpICYm CiAJCSAgICBwbGFuZV9zdGF0ZS0+YmFzZS5yb3RhdGlvbiA9PSBEUk1fUk9UQVRFXzE4MCkgewog CQkJYmFzZSArPSAocGxhbmVfc3RhdGUtPmJhc2UuY3J0Y19oICoKIAkJCQkgcGxhbmVfc3RhdGUt PmJhc2UuY3J0Y193IC0gMSkgKiA0OwpAQCAtMTY1OTMsNyArMTY1OTMsNyBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCWlmIChjcnRj LT5hY3RpdmUgJiYgIWludGVsX2NydGNfaGFzX2VuY29kZXJzKGNydGMpKQogCQlpbnRlbF9jcnRj X2Rpc2FibGVfbm9hdG9taWMoJmNydGMtPmJhc2UpOwogCi0JaWYgKGNydGMtPmFjdGl2ZSB8fCBI QVNfR01DSF9ESVNQTEFZKGRldikpIHsKKwlpZiAoY3J0Yy0+YWN0aXZlIHx8IEhBU19HTUNIX0RJ U1BMQVkoZGV2X3ByaXYpKSB7CiAJCS8qCiAJCSAqIFdlIHN0YXJ0IG91dCB3aXRoIHVuZGVycnVu IHJlcG9ydGluZyBkaXNhYmxlZCB0byBhdm9pZCByYWNlcy4KIAkJICogRm9yIGNvcnJlY3QgYm9v a2tlZXBpbmcgbWFyayB0aGlzIG9uIGFjdGl2ZSBjcnRjcy4KZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5j CmluZGV4IDBiNmYxYmFiNjcxZC4uNTFkOTJhOWM2Y2IxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rw LmMKQEAgLTE1ODMsNyArMTU4Myw3IEBAIGludGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBp bnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJCXJldHVybiByZXQ7CiAJCX0KIAotCQlpZiAoSEFT X0dNQ0hfRElTUExBWShkZXYpKQorCQlpZiAoSEFTX0dNQ0hfRElTUExBWShkZXZfcHJpdikpCiAJ CQlpbnRlbF9nbWNoX3BhbmVsX2ZpdHRpbmcoaW50ZWxfY3J0YywgcGlwZV9jb25maWcsCiAJCQkJ CQkgaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXR0aW5nX21vZGUpOwogCQllbHNlCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RzaS5jCmluZGV4IDcyN2FkYWFjZTk2Yy4uNWIxZTQ0NWE4MGQwIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kc2kuYwpAQCAtMTM0Niw3ICsxMzQ2LDcgQEAgc3RhdGljIGludCBpbnRl bF9kc2lfc2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCQlE Uk1fREVCVUdfS01TKCJubyBzY2FsaW5nIG5vdCBzdXBwb3J0ZWRcbiIpOwogCQkJcmV0dXJuIC1F SU5WQUw7CiAJCX0KLQkJaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2KSAmJgorCQlpZiAoSEFTX0dN Q0hfRElTUExBWSh0b19pOTE1KGRldikpICYmCiAJCSAgICB2YWwgPT0gRFJNX01PREVfU0NBTEVf Q0VOVEVSKSB7CiAJCQlEUk1fREVCVUdfS01TKCJjZW50ZXJpbmcgbm90IHN1cHBvcnRlZFxuIik7 CiAJCQlyZXR1cm4gLUVJTlZBTDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2ZpZm9fdW5kZXJydW4uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZpZm9fdW5k ZXJydW4uYwppbmRleCBlYmI0ZmVkODMyMmUuLjA3Njg5M2NjMzg5MCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmlmb191bmRlcnJ1bi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2ZpZm9fdW5kZXJydW4uYwpAQCAtMjU0LDcgKzI1NCw3IEBAIHN0YXRp YyBib29sIF9faW50ZWxfc2V0X2NwdV9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCW9sZCA9ICFpbnRlbF9jcnRjLT5jcHVfZmlmb191bmRlcnJ1bl9kaXNh YmxlZDsKIAlpbnRlbF9jcnRjLT5jcHVfZmlmb191bmRlcnJ1bl9kaXNhYmxlZCA9ICFlbmFibGU7 CiAKLQlpZiAoSEFTX0dNQ0hfRElTUExBWShkZXYpKQorCWlmIChIQVNfR01DSF9ESVNQTEFZKGRl dl9wcml2KSkKIAkJaTl4eF9zZXRfZmlmb191bmRlcnJ1bl9yZXBvcnRpbmcoZGV2LCBwaXBlLCBl bmFibGUsIG9sZCk7CiAJZWxzZSBpZiAoSVNfR0VONShkZXYpIHx8IElTX0dFTjYoZGV2KSkKIAkJ aXJvbmxha2Vfc2V0X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldiwgcGlwZSwgZW5hYmxlKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwppbmRleCAzOTdlMTBmNGI2ZjAuLmFkM2ZmNGZlNjNj ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwpAQCAtMTI2NSw2ICsxMjY1LDcgQEAgaW50 ZWxfaGRtaV9tb2RlX3ZhbGlkKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiB7CiAJ c3RydWN0IGludGVsX2hkbWkgKmhkbWkgPSBpbnRlbF9hdHRhY2hlZF9oZG1pKGNvbm5lY3Rvcik7 CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2hkbWlfdG9fZGV2KGhkbWkpOworCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAllbnVtIGRy bV9tb2RlX3N0YXR1cyBzdGF0dXM7CiAJaW50IGNsb2NrOwogCWludCBtYXhfZG90Y2xrID0gdG9f aTkxNShjb25uZWN0b3ItPmRldiktPm1heF9kb3RjbGtfZnJlcTsKQEAgLTEyODcsNyArMTI4OCw3 IEBAIGludGVsX2hkbWlfbW9kZV92YWxpZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9y LAogCXN0YXR1cyA9IGhkbWlfcG9ydF9jbG9ja192YWxpZChoZG1pLCBjbG9jaywgdHJ1ZSk7CiAK IAkvKiBpZiB3ZSBjYW4ndCBkbyA4YnBjIHdlIG1heSBzdGlsbCBiZSBhYmxlIHRvIGRvIDEyYnBj ICovCi0JaWYgKCFIQVNfR01DSF9ESVNQTEFZKGRldikgJiYgc3RhdHVzICE9IE1PREVfT0spCisJ aWYgKCFIQVNfR01DSF9ESVNQTEFZKGRldl9wcml2KSAmJiBzdGF0dXMgIT0gTU9ERV9PSykKIAkJ c3RhdHVzID0gaGRtaV9wb3J0X2Nsb2NrX3ZhbGlkKGhkbWksIGNsb2NrICogMyAvIDIsIHRydWUp OwogCiAJcmV0dXJuIHN0YXR1czsKQEAgLTEyOTcsNyArMTI5OCw3IEBAIHN0YXRpYyBib29sIGhk bWlfMTJicGNfcG9zc2libGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7 CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGNfc3RhdGUtPmJhc2UuY3J0Yy0+ZGV2Owog Ci0JaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2KSkKKwlpZiAoSEFTX0dNQ0hfRElTUExBWSh0b19p OTE1KGRldikpKQogCQlyZXR1cm4gZmFsc2U7CiAKIAkvKgotLSAKMi43LjQKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=