From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 27/42] drm/i915: Remove use of crtc->config from intel_dp.c Date: Mon, 11 May 2015 16:25:03 +0200 Message-ID: <1431354318-11995-28-git-send-email-maarten.lankhorst@linux.intel.com> References: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id C449D6E3F7 for ; Mon, 11 May 2015 07:25:44 -0700 (PDT) In-Reply-To: <1431354318-11995-1-git-send-email-maarten.lankhorst@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 Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIHwgMzMgKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTggaW5zZXJ0 aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggZWRh MWIyMmMzMTExLi5lNjg3NmZhY2E3ZjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtMTUz Niw3ICsxNTM2LDkgQEAgc3RhdGljIHZvaWQgaW50ZWxfZHBfcHJlcGFyZShzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqZW5jb2RlcikKIAlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2lu dGVsX2RwKCZlbmNvZGVyLT5iYXNlKTsKIAllbnVtIHBvcnQgcG9ydCA9IGRwX3RvX2RpZ19wb3J0 KGludGVsX2RwKS0+cG9ydDsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2Ny dGMoZW5jb2Rlci0+YmFzZS5jcnRjKTsKLQlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0 ZWRfbW9kZSA9ICZjcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKKwlzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPQorCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMt PmJhc2Uuc3RhdGUpOworCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0g JnBpcGVfY29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7CiAKIAkvKgogCSAqIFRoZXJlIGFyZSBm b3VyIGtpbmRzIG9mIERQIHJlZ2lzdGVyczoKQEAgLTE1NjQsNyArMTU2Niw3IEBAIHN0YXRpYyB2 b2lkIGludGVsX2RwX3ByZXBhcmUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiAJaW50 ZWxfZHAtPkRQIHw9IERQX1ZPTFRBR0VfMF80IHwgRFBfUFJFX0VNUEhBU0lTXzA7CiAJaW50ZWxf ZHAtPkRQIHw9IERQX1BPUlRfV0lEVEgoaW50ZWxfZHAtPmxhbmVfY291bnQpOwogCi0JaWYgKGNy dGMtPmNvbmZpZy0+aGFzX2F1ZGlvKQorCWlmIChwaXBlX2NvbmZpZy0+aGFzX2F1ZGlvKQogCQlp bnRlbF9kcC0+RFAgfD0gRFBfQVVESU9fT1VUUFVUX0VOQUJMRTsKIAogCS8qIFNwbGl0IG91dCB0 aGUgSUJYL0NQVSB2cyBDUFQgc2V0dGluZ3MgKi8KQEAgLTI1MDQsNiArMjUwNiw4IEBAIHN0YXRp YyB2b2lkIGludGVsX2VuYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoZW5jb2Rlci0+YmFzZS5jcnRjKTsKKwlzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPQorCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNy dGMtPmJhc2Uuc3RhdGUpOwogCXVpbnQzMl90IGRwX3JlZyA9IEk5MTVfUkVBRChpbnRlbF9kcC0+ b3V0cHV0X3JlZyk7CiAJdW5zaWduZWQgaW50IGxhbmVfbWFzayA9IDB4MDsKIApAQCAtMjUzMiw3 ICsyNTM2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyKQogCWludGVsX2RwX2NvbXBsZXRlX2xpbmtfdHJhaW4oaW50ZWxfZHApOwog CWludGVsX2RwX3N0b3BfbGlua190cmFpbihpbnRlbF9kcCk7CiAKLQlpZiAoY3J0Yy0+Y29uZmln LT5oYXNfYXVkaW8pIHsKKwlpZiAocGlwZV9jb25maWctPmhhc19hdWRpbykgewogCQlEUk1fREVC VUdfRFJJVkVSKCJFbmFibGluZyBEUCBhdWRpbyBvbiBwaXBlICVjXG4iLAogCQkJCSBwaXBlX25h bWUoY3J0Yy0+cGlwZSkpOwogCQlpbnRlbF9hdWRpb19jb2RlY19lbmFibGUoZW5jb2Rlcik7CkBA IC0yNzQxLDYgKzI3NDUsOCBAQCBzdGF0aWMgdm9pZCBjaHZfcHJlX2VuYWJsZV9kcChzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9 CiAJCXRvX2ludGVsX2NydGMoZW5jb2Rlci0+YmFzZS5jcnRjKTsKIAllbnVtIGRwaW9fY2hhbm5l bCBjaCA9IHZsdl9kcG9ydF90b19jaGFubmVsKGRwb3J0KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqcGlwZV9jb25maWcgPQorCQl0b19pbnRlbF9jcnRjX3N0YXRlKGludGVsX2NydGMtPmJh c2Uuc3RhdGUpOwogCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAlpbnQgZGF0YSwgaSwg c3RhZ2dlcjsKIAl1MzIgdmFsOwpAQCAtMjc4MiwxMyArMjc4OCwxMyBAQCBzdGF0aWMgdm9pZCBj aHZfcHJlX2VuYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAl9CiAKIAkv KiBEYXRhIGxhbmUgc3RhZ2dlciBwcm9ncmFtbWluZyAqLwotCWlmIChpbnRlbF9jcnRjLT5jb25m aWctPnBvcnRfY2xvY2sgPiAyNzAwMDApCisJaWYgKHBpcGVfY29uZmlnLT5wb3J0X2Nsb2NrID4g MjcwMDAwKQogCQlzdGFnZ2VyID0gMHgxODsKLQllbHNlIGlmIChpbnRlbF9jcnRjLT5jb25maWct PnBvcnRfY2xvY2sgPiAxMzUwMDApCisJZWxzZSBpZiAocGlwZV9jb25maWctPnBvcnRfY2xvY2sg PiAxMzUwMDApCiAJCXN0YWdnZXIgPSAweGQ7Ci0JZWxzZSBpZiAoaW50ZWxfY3J0Yy0+Y29uZmln LT5wb3J0X2Nsb2NrID4gNjc1MDApCisJZWxzZSBpZiAocGlwZV9jb25maWctPnBvcnRfY2xvY2sg PiA2NzUwMCkKIAkJc3RhZ2dlciA9IDB4NzsKLQllbHNlIGlmIChpbnRlbF9jcnRjLT5jb25maWct PnBvcnRfY2xvY2sgPiAzMzc1MCkKKwllbHNlIGlmIChwaXBlX2NvbmZpZy0+cG9ydF9jbG9jayA+ IDMzNzUwKQogCQlzdGFnZ2VyID0gMHg0OwogCWVsc2UKIAkJc3RhZ2dlciA9IDB4MjsKQEAgLTQz MDIsNyArNDMwOCw3IEBAIGludGVsX2RwX2NoZWNrX2xpbmtfc3RhdHVzKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCiAJaWYgKFdBUk5fT04oIWludGVsX2VuY29kZXItPmJhc2UuY3J0YykpCiAJ CXJldHVybjsKIAotCWlmICghdG9faW50ZWxfY3J0YyhpbnRlbF9lbmNvZGVyLT5iYXNlLmNydGMp LT5hY3RpdmUpCisJaWYgKCFpbnRlbF9lbmNvZGVyLT5iYXNlLmNydGMtPnN0YXRlLT5hY3RpdmUp CiAJCXJldHVybjsKIAogCS8qIFRyeSB0byByZWFkIHJlY2VpdmVyIHN0YXR1cyBpZiB0aGUgbGlu ayBhcHBlYXJzIHRvIGJlIHVwICovCkBAIC01MjU1LDcgKzUyNjEsOCBAQCBzdGF0aWMgdm9pZCBp bnRlbF9kcF9zZXRfZHJyc19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcmVmcmVz aF9yYXRlKQogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwogCXN0cnVjdCBpbnRlbF9k aWdpdGFsX3BvcnQgKmRpZ19wb3J0ID0gTlVMTDsKIAlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw ID0gZGV2X3ByaXYtPmRycnMuZHA7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSBO VUxMOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOworCXN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpwaXBlX2NvbmZpZzsKIAl1MzIgcmVnLCB2YWw7CiAJZW51bSBkcnJzX3JlZnJlc2hf cmF0ZV90eXBlIGluZGV4ID0gRFJSU19ISUdIX1JSOwogCkBAIC01Mjc3LDYgKzUyODQsNyBAQCBz dGF0aWMgdm9pZCBpbnRlbF9kcF9zZXRfZHJyc19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCBpbnQgcmVmcmVzaF9yYXRlKQogCWRpZ19wb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHAp OwogCWVuY29kZXIgPSAmZGlnX3BvcnQtPmJhc2U7CiAJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2Ny dGMoZW5jb2Rlci0+YmFzZS5jcnRjKTsKKwlwaXBlX2NvbmZpZyA9IHRvX2ludGVsX2NydGNfc3Rh dGUoaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZSk7CiAKIAlpZiAoIWludGVsX2NydGMpIHsKIAkJRFJN X0RFQlVHX0tNUygiRFJSUzogaW50ZWxfY3J0YyBub3QgaW5pdGlhbGl6ZWRcbiIpOwpAQCAtNTI5 OCwxMSArNTMwNiw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2RwX3NldF9kcnJzX3N0YXRlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIGludCByZWZyZXNoX3JhdGUpCiAJCXJldHVybjsKIAl9CiAKLQlp ZiAoIWludGVsX2NydGMtPmFjdGl2ZSkgewotCQlEUk1fREVCVUdfS01TKCJlRFAgZW5jb2RlciBk aXNhYmxlZC4gQ1JUQyBub3QgQWN0aXZlXG4iKTsKLQkJcmV0dXJuOwotCX0KLQogCWlmIChJTlRF TF9JTkZPKGRldiktPmdlbiA+PSA4ICYmICFJU19DSEVSUllWSUVXKGRldikpIHsKIAkJc3dpdGNo IChpbmRleCkgewogCQljYXNlIERSUlNfSElHSF9SUjoKQEAgLTUzMTYsNyArNTMxOSw3IEBAIHN0 YXRpYyB2b2lkIGludGVsX2RwX3NldF9kcnJzX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IGludCByZWZyZXNoX3JhdGUpCiAJCQlEUk1fRVJST1IoIlVuc3VwcG9ydGVkIHJlZnJlc2hyYXRl IHR5cGVcbiIpOwogCQl9CiAJfSBlbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+IDYpIHsK LQkJcmVnID0gUElQRUNPTkYoaW50ZWxfY3J0Yy0+Y29uZmlnLT5jcHVfdHJhbnNjb2Rlcik7CisJ CXJlZyA9IFBJUEVDT05GKHBpcGVfY29uZmlnLT5jcHVfdHJhbnNjb2Rlcik7CiAJCXZhbCA9IEk5 MTVfUkVBRChyZWcpOwogCiAJCWlmIChpbmRleCA+IERSUlNfSElHSF9SUikgewotLSAKMi4xLjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==