From: Daniel Vetter Subject: [PATCH 5/6] drm/i915: use for_each_intel_connector_iter in intel_display.c Date: Mon, 19 Dec 2016 09:24:22 +0100 Message-ID: <20161219082423.27798-5-daniel.vetter@ffwll.ch> References: <20161219082423.27798-1-daniel.vetter@ffwll.ch> 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 913766E421 for ; Mon, 19 Dec 2016 08:24:36 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id a20so17222188wme.2 for ; Mon, 19 Dec 2016 00:24:36 -0800 (PST) In-Reply-To: <20161219082423.27798-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development Cc: Daniel Vetter , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org VGhpcyBnZXRzIHJpZCBvZiB0aGUgbGFzdCB1c2VycyBvZiBmb3JfZWFjaF9pbnRlbF9jb25uZWN0 b3IoKSwgcmVtb3ZlCnRoYXQgdG9vLgoKQXQgZmlyc3QgSSB3YXNuJ3Qgc3VyZSB3aGV0aGVyIHRo ZSAyIGxvb3BzIGluIHRoZSBtb2Rlc2V0IHN0YXRlCmNoZWNrZXIgc2hvdWxkIGluc3RlYWQgb25s eSBsb29wIG92ZXIgdGhlIGNvbm5lY3RvcnMgaW4gdGhlIGF0b21pYwpjb21taXQuIEJ1dCB3ZSBu ZXZlciBhZGQgY29ubmVjdG9ycyB0byBhbiBhdG9taWMgdXBkYXRlIGlmIHRoZXkgZG9uJ3QKKG9y IHdvbid0IGhhdmUpIGEgQ1JUQyBhc3NpZ25lZCwgd2hpY2ggbWVhbnMgdGhlcmUnZCBiZSBhIGdh cCBpbiBjaGVjawpjb3ZlcmFnZS4gSGVuY2UgbG9vcCBvdmVyIGV2ZXJ5dGhpbmcgb24gdGhvc2Ug dG9vLgoKU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDUgLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDIwICsrKysrKysrKysrKysr KystLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNTc5MTRmMDA4ZWQ4Li5mZTJiMzdmZTBiOTEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNDg4LDExICs0ODgsNiBAQCBzdHJ1Y3QgaTkx NV9ob3RwbHVnIHsKIAkJCSAgICAmKGRldiktPm1vZGVfY29uZmlnLmVuY29kZXJfbGlzdCwJXAog CQkJICAgIGJhc2UuaGVhZCkKIAotI2RlZmluZSBmb3JfZWFjaF9pbnRlbF9jb25uZWN0b3IoZGV2 LCBpbnRlbF9jb25uZWN0b3IpCQlcCi0JbGlzdF9mb3JfZWFjaF9lbnRyeShpbnRlbF9jb25uZWN0 b3IsCQkJXAotCQkJICAgICYoZGV2KS0+bW9kZV9jb25maWcuY29ubmVjdG9yX2xpc3QsCVwKLQkJ CSAgICBiYXNlLmhlYWQpCi0KICNkZWZpbmUgZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yX2l0ZXIo aW50ZWxfY29ubmVjdG9yLCBpdGVyKSBcCiAJd2hpbGUgKChpbnRlbF9jb25uZWN0b3IgPSB0b19p bnRlbF9jb25uZWN0b3IoZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXJfbmV4dChpdGVyKSkpKQogCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNDM4ZDI3ZjkzYWNhLi5lMDI5ZGJh OTZiY2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEyNjYxLDggKzEy NjYxLDEwIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2NydGNfaGVscGVyX2Z1bmNzIGludGVs X2hlbHBlcl9mdW5jcyA9IHsKIHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfdXBkYXRlX2Nvbm5l Y3Rvcl9hdG9taWNfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgaW50 ZWxfY29ubmVjdG9yICpjb25uZWN0b3I7CisJc3RydWN0IGRybV9jb25uZWN0b3JfbGlzdF9pdGVy IGNvbm5faXRlcjsKIAotCWZvcl9lYWNoX2ludGVsX2Nvbm5lY3RvcihkZXYsIGNvbm5lY3Rvcikg eworCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX2dldChkZXYsICZjb25uX2l0ZXIpOworCWZvcl9l YWNoX2ludGVsX2Nvbm5lY3Rvcl9pdGVyKGNvbm5lY3RvciwgJmNvbm5faXRlcikgewogCQlpZiAo Y29ubmVjdG9yLT5iYXNlLnN0YXRlLT5jcnRjKQogCQkJZHJtX2Nvbm5lY3Rvcl91bnJlZmVyZW5j ZSgmY29ubmVjdG9yLT5iYXNlKTsKIApAQCAtMTI2NzgsNiArMTI2ODAsNyBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9jb25uZWN0b3JfYXRvbWljX3N0YXRlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJCQljb25uZWN0b3ItPmJhc2Uuc3RhdGUtPmNydGMgPSBOVUxMOwogCQl9 CiAJfQorCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX3B1dCgmY29ubl9pdGVyKTsKIH0KIAogc3Rh dGljIHZvaWQKQEAgLTEzNjEwLDYgKzEzNjEzLDcgQEAgdmVyaWZ5X2VuY29kZXJfc3RhdGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsK IAlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3I7CisJc3RydWN0IGRybV9jb25uZWN0 b3JfbGlzdF9pdGVyIGNvbm5faXRlcjsKIAogCWZvcl9lYWNoX2ludGVsX2VuY29kZXIoZGV2LCBl bmNvZGVyKSB7CiAJCWJvb2wgZW5hYmxlZCA9IGZhbHNlOwpAQCAtMTM2MTksNyArMTM2MjMsOCBA QCB2ZXJpZnlfZW5jb2Rlcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJICAgICAg ZW5jb2Rlci0+YmFzZS5iYXNlLmlkLAogCQkJICAgICAgZW5jb2Rlci0+YmFzZS5uYW1lKTsKIAot CQlmb3JfZWFjaF9pbnRlbF9jb25uZWN0b3IoZGV2LCBjb25uZWN0b3IpIHsKKwkJZHJtX2Nvbm5l Y3Rvcl9saXN0X2l0ZXJfZ2V0KGRldiwgJmNvbm5faXRlcik7CisJCWZvcl9lYWNoX2ludGVsX2Nv bm5lY3Rvcl9pdGVyKGNvbm5lY3RvciwgJmNvbm5faXRlcikgewogCQkJaWYgKGNvbm5lY3Rvci0+ YmFzZS5zdGF0ZS0+YmVzdF9lbmNvZGVyICE9ICZlbmNvZGVyLT5iYXNlKQogCQkJCWNvbnRpbnVl OwogCQkJZW5hYmxlZCA9IHRydWU7CkBAIC0xMzYyOCw2ICsxMzYzMyw3IEBAIHZlcmlmeV9lbmNv ZGVyX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQkJCWVuY29kZXItPmJhc2UuY3J0 YywKIAkJCSAgICAgImNvbm5lY3RvcidzIGNydGMgZG9lc24ndCBtYXRjaCBlbmNvZGVyIGNydGNc biIpOwogCQl9CisJCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX3B1dCgmY29ubl9pdGVyKTsKIAog CQlJOTE1X1NUQVRFX1dBUk4oISFlbmNvZGVyLT5iYXNlLmNydGMgIT0gZW5hYmxlZCwKIAkJICAg ICAiZW5jb2RlcidzIGVuYWJsZWQgc3RhdGUgbWlzbWF0Y2ggIgpAQCAtMTY2MzgsNiArMTY2NDQs NyBAQCBpbnQgaW50ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiBzdGF0 aWMgdm9pZCBpbnRlbF9lbmFibGVfcGlwZV9hKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJ c3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yOworCXN0cnVjdCBkcm1fY29ubmVjdG9y X2xpc3RfaXRlciBjb25uX2l0ZXI7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNydCA9IE5VTEw7 CiAJc3RydWN0IGludGVsX2xvYWRfZGV0ZWN0X3BpcGUgbG9hZF9kZXRlY3RfdGVtcDsKIAlzdHJ1 Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggKmN0eCA9IGRldi0+bW9kZV9jb25maWcuYWNxdWly ZV9jdHg7CkBAIC0xNjY0NSwxMiArMTY2NTIsMTQgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxl X3BpcGVfYShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCS8qIFdlIGNhbid0IGp1c3Qgc3dpdGNo IG9uIHRoZSBwaXBlIEEsIHdlIG5lZWQgdG8gc2V0IHRoaW5ncyB1cCB3aXRoIGEKIAkgKiBwcm9w ZXIgbW9kZSBhbmQgb3V0cHV0IGNvbmZpZ3VyYXRpb24uIEFzIGEgZ3Jvc3MgaGFjaywgZW5hYmxl IHBpcGUgQQogCSAqIGJ5IGVuYWJsaW5nIHRoZSBsb2FkIGRldGVjdCBwaXBlIG9uY2UuICovCi0J Zm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubmVjdG9yKSB7CisJZHJtX2Nvbm5lY3Rv cl9saXN0X2l0ZXJfZ2V0KGRldiwgJmNvbm5faXRlcik7CisJZm9yX2VhY2hfaW50ZWxfY29ubmVj dG9yX2l0ZXIoY29ubmVjdG9yLCAmY29ubl9pdGVyKSB7CiAJCWlmIChjb25uZWN0b3ItPmVuY29k ZXItPnR5cGUgPT0gSU5URUxfT1VUUFVUX0FOQUxPRykgewogCQkJY3J0ID0gJmNvbm5lY3Rvci0+ YmFzZTsKIAkJCWJyZWFrOwogCQl9CiAJfQorCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX3B1dCgm Y29ubl9pdGVyKTsKIAogCWlmICghY3J0KQogCQlyZXR1cm47CkBAIC0xNjg5Niw2ICsxNjkwNSw3 IEBAIHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjOwogCXN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyOwogCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcjsKKwlz dHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXIgY29ubl9pdGVyOwogCWludCBpOwogCiAJZGV2 X3ByaXYtPmFjdGl2ZV9jcnRjcyA9IDA7CkBAIC0xNjk3Myw3ICsxNjk4Myw4IEBAIHN0YXRpYyB2 b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCQkJICAgICAgcGlwZV9uYW1lKHBpcGUpKTsKIAl9CiAKLQlmb3JfZWFjaF9pbnRlbF9jb25u ZWN0b3IoZGV2LCBjb25uZWN0b3IpIHsKKwlkcm1fY29ubmVjdG9yX2xpc3RfaXRlcl9nZXQoZGV2 LCAmY29ubl9pdGVyKTsKKwlmb3JfZWFjaF9pbnRlbF9jb25uZWN0b3JfaXRlcihjb25uZWN0b3Is ICZjb25uX2l0ZXIpIHsKIAkJaWYgKGNvbm5lY3Rvci0+Z2V0X2h3X3N0YXRlKGNvbm5lY3Rvcikp IHsKIAkJCWNvbm5lY3Rvci0+YmFzZS5kcG1zID0gRFJNX01PREVfRFBNU19PTjsKIApAQCAtMTcw MDEsNiArMTcwMTIsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3Rh dGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5iYXNl LmlkLCBjb25uZWN0b3ItPmJhc2UubmFtZSwKIAkJCSAgICAgIGVuYWJsZWRkaXNhYmxlZChjb25u ZWN0b3ItPmJhc2UuZW5jb2RlcikpOwogCX0KKwlkcm1fY29ubmVjdG9yX2xpc3RfaXRlcl9wdXQo JmNvbm5faXRlcik7CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykgewogCQljcnRj LT5iYXNlLmh3bW9kZSA9IGNydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOwotLSAKMi4x MS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK