From: Tvrtko Ursulin Subject: [PATCH 5/5] drm/i915: Convert i915_drv.c to INTEL_GEN Date: Fri, 4 Nov 2016 14:42:48 +0000 Message-ID: <1478270568-7902-6-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1478270568-7902-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-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4FAFC6E9AE for ; Fri, 4 Nov 2016 14:43:05 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id u144so4248254wmu.0 for ; Fri, 04 Nov 2016 07:43:05 -0700 (PDT) In-Reply-To: <1478270568-7902-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpZ25lZC1v ZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyB8IDE0ICsrKysrKystLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jCmluZGV4IDM1OTQwMTkyZTU2OS4uMDk2YzM2OGJkYTBiIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMKQEAgLTM3NCwxMiArMzc0LDEyIEBAIHN0YXRpYyBpbnQKIGludGVsX2FsbG9jX21j aGJhcl9yZXNvdXJjZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlpbnQgcmVnID0gSU5URUxfSU5G TyhkZXYpLT5nZW4gPj0gNCA/IE1DSEJBUl9JOTY1IDogTUNIQkFSX0k5MTU7CisJaW50IHJlZyA9 IElOVEVMX0dFTihkZXZfcHJpdikgPj0gNCA/IE1DSEJBUl9JOTY1IDogTUNIQkFSX0k5MTU7CiAJ dTMyIHRlbXBfbG8sIHRlbXBfaGkgPSAwOwogCXU2NCBtY2hiYXJfYWRkcjsKIAlpbnQgcmV0Owog Ci0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDQpCisJaWYgKElOVEVMX0dFTihkZXZfcHJp dikgPj0gNCkKIAkJcGNpX3JlYWRfY29uZmlnX2R3b3JkKGRldl9wcml2LT5icmlkZ2VfZGV2LCBy ZWcgKyA0LCAmdGVtcF9oaSk7CiAJcGNpX3JlYWRfY29uZmlnX2R3b3JkKGRldl9wcml2LT5icmlk Z2VfZGV2LCByZWcsICZ0ZW1wX2xvKTsKIAltY2hiYXJfYWRkciA9ICgodTY0KXRlbXBfaGkgPDwg MzIpIHwgdGVtcF9sbzsKQEAgLTQwNiw3ICs0MDYsNyBAQCBpbnRlbF9hbGxvY19tY2hiYXJfcmVz b3VyY2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmV0dXJuIHJldDsKIAl9CiAKLQlpZiAo SU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA0 KQogCQlwY2lfd3JpdGVfY29uZmlnX2R3b3JkKGRldl9wcml2LT5icmlkZ2VfZGV2LCByZWcgKyA0 LAogCQkJCSAgICAgICB1cHBlcl8zMl9iaXRzKGRldl9wcml2LT5tY2hfcmVzLnN0YXJ0KSk7CiAK QEAgLTQyMCw3ICs0MjAsNyBAQCBzdGF0aWMgdm9pZAogaW50ZWxfc2V0dXBfbWNoYmFyKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShkZXYpOwotCWludCBtY2hiYXJfcmVnID0gSU5URUxfSU5GTyhkZXYpLT5nZW4g Pj0gNCA/IE1DSEJBUl9JOTY1IDogTUNIQkFSX0k5MTU7CisJaW50IG1jaGJhcl9yZWcgPSBJTlRF TF9HRU4oZGV2X3ByaXYpID49IDQgPyBNQ0hCQVJfSTk2NSA6IE1DSEJBUl9JOTE1OwogCXUzMiB0 ZW1wOwogCWJvb2wgZW5hYmxlZDsKIApAQCAtNDYwLDcgKzQ2MCw3IEBAIHN0YXRpYyB2b2lkCiBp bnRlbF90ZWFyZG93bl9tY2hiYXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0JaW50IG1jaGJhcl9y ZWcgPSBJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA0ID8gTUNIQkFSX0k5NjUgOiBNQ0hCQVJfSTkx NTsKKwlpbnQgbWNoYmFyX3JlZyA9IElOVEVMX0dFTihkZXZfcHJpdikgPj0gNCA/IE1DSEJBUl9J OTY1IDogTUNIQkFSX0k5MTU7CiAKIAlpZiAoZGV2X3ByaXYtPm1jaGJhcl9uZWVkX2Rpc2FibGUp IHsKIAkJaWYgKElTX0k5MTVHKGRldl9wcml2KSB8fCBJU19JOTE1R00oZGV2X3ByaXYpKSB7CkBA IC04NzksNyArODc5LDcgQEAgc3RhdGljIGludCBpOTE1X21taW9fc2V0dXAoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAkgKiB0aGUgcmVnaXN0ZXIgQkFSIHJlbWFpbnMgdGhlIHNhbWUgc2l6ZSBm b3IgYWxsIHRoZSBlYXJsaWVyCiAJICogZ2VuZXJhdGlvbnMgdXAgdG8gSXJvbmxha2UuCiAJICov Ci0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNSkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2 KSA8IDUpCiAJCW1taW9fc2l6ZSA9IDUxMiAqIDEwMjQ7CiAJZWxzZQogCQltbWlvX3NpemUgPSAy ICogMTAyNCAqIDEwMjQ7CkBAIC0xNTEyLDcgKzE1MTIsNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJt X3N1c3BlbmRfbGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIGhpYmVybmF0aW9uKQog CSAqIEZ1aml0c3UgRlNDIFM3MTEwCiAJICogQWNlciBBc3BpcmUgMTgzMFQKIAkgKi8KLQlpZiAo IShoaWJlcm5hdGlvbiAmJiBJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuIDwgNikpCisJaWYgKCEo aGliZXJuYXRpb24gJiYgSU5URUxfR0VOKGRldl9wcml2KSA8IDYpKQogCQlwY2lfc2V0X3Bvd2Vy X3N0YXRlKHBkZXYsIFBDSV9EM2hvdCk7CiAKIAlkZXZfcHJpdi0+c3VzcGVuZGVkX3RvX2lkbGUg PSBzdXNwZW5kX3RvX2lkbGUoZGV2X3ByaXYpOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=