From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 05/12] drm/i915: Replace manual lvds and sdvo/hdmi counting with intel_crtc_has_type() Date: Wed, 8 Jun 2016 13:41:40 +0300 Message-ID: <1465382507-23085-6-git-send-email-ville.syrjala@linux.intel.com> References: <1465382507-23085-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id A7F9B6E97B for ; Wed, 8 Jun 2016 10:42:07 +0000 (UTC) In-Reply-To: <1465382507-23085-1-git-send-email-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNp bmNlIHdlIG5vdyBoYXZlIHRoZSBvdXRwdXRfdHlwZXMgYml0bWFrcyBpbiB0aGUgY3J0YyBzdGF0 ZSwgdGhlcmUncyBubwpuZWVkIHRvIGl0ZXJhdGUgdGhyb3VnaCBhbGwgdGhlIGVuY29kZXJzIHRv IHNlZSBpZiBhbiBMVkRTIG9yIFNEVk8vSERNSQplbmNvZGVyIG1pZ2h0IGJlIHByZXNlbnQuCgpT aWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDQ0ICsrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGluc2Vy dGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwppbmRleCAyMGQ2YzMxNjM1YjMuLjZiOTJjNGE3ZDUwZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwpAQCAtNzU0MCwxNCArNzU0MCwxMCBAQCBzdGF0aWMgdm9pZCBpOXh4X2Nv bXB1dGVfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAl1MzIgZHBsbDsKLQlib29sIGlzX3Nkdm87CiAJc3RydWN0 IGRwbGwgKmNsb2NrID0gJmNydGNfc3RhdGUtPmRwbGw7CiAKIAlpOXh4X3VwZGF0ZV9wbGxfZGl2 aWRlcnMoY3J0YywgY3J0Y19zdGF0ZSwgcmVkdWNlZF9jbG9jayk7CiAKLQlpc19zZHZvID0gaW50 ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfU0RWTykgfHwKLQkJaW50 ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfSERNSSk7Ci0KIAlkcGxs ID0gRFBMTF9WR0FfTU9ERV9ESVM7CiAKIAlpZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0 YXRlLCBJTlRFTF9PVVRQVVRfTFZEUykpCkBAIC03NTYwLDcgKzc1NTYsOCBAQCBzdGF0aWMgdm9p ZCBpOXh4X2NvbXB1dGVfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCTw8IFNEVk9f TVVMVElQTElFUl9TSElGVF9ISVJFUzsKIAl9CiAKLQlpZiAoaXNfc2R2bykKKwlpZiAoaW50ZWxf Y3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfU0RWTykgfHwKKwkgICAgaW50 ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfSERNSSkpCiAJCWRwbGwg fD0gRFBMTF9TRFZPX0hJR0hfU1BFRUQ7CiAKIAlpZiAoY3J0Y19zdGF0ZS0+aGFzX2RwX2VuY29k ZXIpCkBAIC04ODcwLDM2ICs4ODY3LDEyIEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2NvbXB1dGVf ZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAlzdHJ1Y3QgZHJtX2NydGMgKmNy dGMgPSAmaW50ZWxfY3J0Yy0+YmFzZTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7Ci0Jc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gY3J0Y19zdGF0ZS0+YmFzZS5z dGF0ZTsKLQlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwotCXN0cnVjdCBkcm1fY29u bmVjdG9yX3N0YXRlICpjb25uZWN0b3Jfc3RhdGU7Ci0Jc3RydWN0IGludGVsX2VuY29kZXIgKmVu Y29kZXI7CiAJdTMyIGRwbGwsIGZwLCBmcDI7Ci0JaW50IGZhY3RvciwgaTsKLQlib29sIGlzX2x2 ZHMgPSBmYWxzZSwgaXNfc2R2byA9IGZhbHNlOwotCi0JZm9yX2VhY2hfY29ubmVjdG9yX2luX3N0 YXRlKHN0YXRlLCBjb25uZWN0b3IsIGNvbm5lY3Rvcl9zdGF0ZSwgaSkgewotCQlpZiAoY29ubmVj dG9yX3N0YXRlLT5jcnRjICE9IGNydGNfc3RhdGUtPmJhc2UuY3J0YykKLQkJCWNvbnRpbnVlOwot Ci0JCWVuY29kZXIgPSB0b19pbnRlbF9lbmNvZGVyKGNvbm5lY3Rvcl9zdGF0ZS0+YmVzdF9lbmNv ZGVyKTsKLQotCQlzd2l0Y2ggKGVuY29kZXItPnR5cGUpIHsKLQkJY2FzZSBJTlRFTF9PVVRQVVRf TFZEUzoKLQkJCWlzX2x2ZHMgPSB0cnVlOwotCQkJYnJlYWs7Ci0JCWNhc2UgSU5URUxfT1VUUFVU X1NEVk86Ci0JCWNhc2UgSU5URUxfT1VUUFVUX0hETUk6Ci0JCQlpc19zZHZvID0gdHJ1ZTsKLQkJ CWJyZWFrOwotCQlkZWZhdWx0OgotCQkJYnJlYWs7Ci0JCX0KLQl9CisJaW50IGZhY3RvcjsKIAog CS8qIEVuYWJsZSBhdXRvdHVuaW5nIG9mIHRoZSBQTEwgY2xvY2sgKGlmIHBlcm1pc3NpYmxlKSAq LwogCWZhY3RvciA9IDIxOwotCWlmIChpc19sdmRzKSB7CisJaWYgKGludGVsX2NydGNfaGFzX3R5 cGUoY3J0Y19zdGF0ZSwgSU5URUxfT1VUUFVUX0xWRFMpKSB7CiAJCWlmICgoaW50ZWxfcGFuZWxf dXNlX3NzYyhkZXZfcHJpdikgJiYKIAkJICAgICBkZXZfcHJpdi0+dmJ0Lmx2ZHNfc3NjX2ZyZXEg PT0gMTAwMDAwKSB8fAogCQkgICAgKEhBU19QQ0hfSUJYKGRldikgJiYgaW50ZWxfaXNfZHVhbF9s aW5rX2x2ZHMoZGV2KSkpCkBAIC04OTIzLDcgKzg4OTYsNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFr ZV9jb21wdXRlX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAKIAlkcGxsID0g MDsKIAotCWlmIChpc19sdmRzKQorCWlmIChpbnRlbF9jcnRjX2hhc190eXBlKGNydGNfc3RhdGUs IElOVEVMX09VVFBVVF9MVkRTKSkKIAkJZHBsbCB8PSBEUExMQl9NT0RFX0xWRFM7CiAJZWxzZQog CQlkcGxsIHw9IERQTExCX01PREVfREFDX1NFUklBTDsKQEAgLTg5MzEsOCArODkwNCwxMCBAQCBz dGF0aWMgdm9pZCBpcm9ubGFrZV9jb21wdXRlX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmludGVs X2NydGMsCiAJZHBsbCB8PSAoY3J0Y19zdGF0ZS0+cGl4ZWxfbXVsdGlwbGllciAtIDEpCiAJCTw8 IFBMTF9SRUZfU0RWT19IRE1JX01VTFRJUExJRVJfU0hJRlQ7CiAKLQlpZiAoaXNfc2R2bykKKwlp ZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfU0RWTykgfHwK KwkgICAgaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfSERNSSkp CiAJCWRwbGwgfD0gRFBMTF9TRFZPX0hJR0hfU1BFRUQ7CisKIAlpZiAoY3J0Y19zdGF0ZS0+aGFz X2RwX2VuY29kZXIpCiAJCWRwbGwgfD0gRFBMTF9TRFZPX0hJR0hfU1BFRUQ7CiAKQEAgLTg5NTYs NyArODkzMSw4IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2NvbXB1dGVfZHBsbChzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAkJYnJlYWs7CiAJfQogCi0JaWYgKGlzX2x2ZHMgJiYgaW50 ZWxfcGFuZWxfdXNlX3NzYyhkZXZfcHJpdikpCisJaWYgKGludGVsX2NydGNfaGFzX3R5cGUoY3J0 Y19zdGF0ZSwgSU5URUxfT1VUUFVUX0xWRFMpICYmCisJICAgIGludGVsX3BhbmVsX3VzZV9zc2Mo ZGV2X3ByaXYpKQogCQlkcGxsIHw9IFBMTEJfUkVGX0lOUFVUX1NQUkVBRFNQRUNUUlVNSU47CiAJ ZWxzZQogCQlkcGxsIHw9IFBMTF9SRUZfSU5QVVRfRFJFRkNMSzsKLS0gCjIuNy40CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK