From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [REBASED PATCH 1/2] drm/i915: Move intel_add_dsi_properties to intel_dsi Date: Mon, 10 Jun 2019 22:45:14 +0300 Message-ID: <20190610194515.7030-1-jani.nikula@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 ESMTPS id 723B588FDA for ; Mon, 10 Jun 2019 19:44:40 +0000 (UTC) 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: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmFuZGl0YSBLdWxrYXJuaSA8dmFuZGl0YS5rdWxrYXJuaUBpbnRlbC5jb20+CgpTaW5j ZSBpbnRlbF9hZGRfZHNpX3Byb3BlcnRpZXMgd2lsbCBiZSB1c2VkIGJ5IG90aGVyCnBsYXRmb3Jt cyB0b28gbW92ZSBpdCBvdXQgb2YgcGxhdGZvcm0gc3BlY2lmaWMgZmlsZS4KClNpZ25lZC1vZmYt Ynk6IFZhbmRpdGEgS3Vsa2FybmkgPHZhbmRpdGEua3Vsa2FybmlAaW50ZWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RzaS5jIHwgMzIgKysrKysrKysrKysrKysrKysrKysrKysrCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuaCB8ICAzICsrKwogZHJpdmVycy9ncHUvZHJt L2k5MTUvdmx2X2RzaS5jICAgfCA0MiArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog MyBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCA0MSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RzaS5jCmluZGV4IDVmZWMwMmFjZWFlZC4uMjYxMjRhOGZlNTMxIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kc2kuYwpAQCAtMTE2LDYgKzExNiwxMiBAQCBpbnRlbF9kc2lfZ2V0 X3BhbmVsX29yaWVudGF0aW9uKHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcikKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNvbm5lY3Rvci0+YmFz ZS5kZXYpOwogCWVudW0gZHJtX3BhbmVsX29yaWVudGF0aW9uIG9yaWVudGF0aW9uOwogCisJaWYg KElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CisJ CW9yaWVudGF0aW9uID0gdmx2X2RzaV9nZXRfaHdfcGFuZWxfb3JpZW50YXRpb24oY29ubmVjdG9y KTsKKwkJaWYgKG9yaWVudGF0aW9uICE9IERSTV9NT0RFX1BBTkVMX09SSUVOVEFUSU9OX1VOS05P V04pCisJCQlyZXR1cm4gb3JpZW50YXRpb247CisJfQorCiAJb3JpZW50YXRpb24gPSBkZXZfcHJp di0+dmJ0LmRzaS5vcmllbnRhdGlvbjsKIAlpZiAob3JpZW50YXRpb24gIT0gRFJNX01PREVfUEFO RUxfT1JJRU5UQVRJT05fVU5LTk9XTikKIAkJcmV0dXJuIG9yaWVudGF0aW9uOwpAQCAtMTI2LDMg KzEzMiwyOSBAQCBpbnRlbF9kc2lfZ2V0X3BhbmVsX29yaWVudGF0aW9uKHN0cnVjdCBpbnRlbF9j b25uZWN0b3IgKmNvbm5lY3RvcikKIAogCXJldHVybiBEUk1fTU9ERV9QQU5FTF9PUklFTlRBVElP Tl9OT1JNQUw7CiB9CisKK3ZvaWQgaW50ZWxfZHNpX2FkZF9wcm9wZXJ0aWVzKHN0cnVjdCBpbnRl bF9jb25uZWN0b3IgKmNvbm5lY3RvcikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGNvbm5lY3Rvci0+YmFzZS5kZXYpOworCisJaWYgKGNvbm5lY3Rvci0+ cGFuZWwuZml4ZWRfbW9kZSkgeworCQl1MzIgYWxsb3dlZF9zY2FsZXJzOworCisJCWFsbG93ZWRf c2NhbGVycyA9IEJJVChEUk1fTU9ERV9TQ0FMRV9BU1BFQ1QpIHwKKwkJCQkJQklUKERSTV9NT0RF X1NDQUxFX0ZVTExTQ1JFRU4pOworCQlpZiAoIUhBU19HTUNIKGRldl9wcml2KSkKKwkJCWFsbG93 ZWRfc2NhbGVycyB8PSBCSVQoRFJNX01PREVfU0NBTEVfQ0VOVEVSKTsKKworCQlkcm1fY29ubmVj dG9yX2F0dGFjaF9zY2FsaW5nX21vZGVfcHJvcGVydHkoJmNvbm5lY3Rvci0+YmFzZSwKKwkJCQkJ CQkJYWxsb3dlZF9zY2FsZXJzKTsKKworCQljb25uZWN0b3ItPmJhc2Uuc3RhdGUtPnNjYWxpbmdf bW9kZSA9IERSTV9NT0RFX1NDQUxFX0FTUEVDVDsKKworCQljb25uZWN0b3ItPmJhc2UuZGlzcGxh eV9pbmZvLnBhbmVsX29yaWVudGF0aW9uID0KKwkJCWludGVsX2RzaV9nZXRfcGFuZWxfb3JpZW50 YXRpb24oY29ubmVjdG9yKTsKKwkJZHJtX2Nvbm5lY3Rvcl9pbml0X3BhbmVsX29yaWVudGF0aW9u X3Byb3BlcnR5KAorCQkJCSZjb25uZWN0b3ItPmJhc2UsCisJCQkJY29ubmVjdG9yLT5wYW5lbC5m aXhlZF9tb2RlLT5oZGlzcGxheSwKKwkJCQljb25uZWN0b3ItPnBhbmVsLmZpeGVkX21vZGUtPnZk aXNwbGF5KTsKKwl9Cit9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k c2kuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaS5oCmluZGV4IDZkMjA0MzQ2MzZj ZC4uMTFmN2JmYjI4Mjk5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k c2kuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuaApAQCAtMTYyLDYgKzE2 Miw3IEBAIGludCBpbnRlbF9kc2lfYml0cmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfZHNpICppbnRl bF9kc2kpOwogaW50IGludGVsX2RzaV90bHB4X25zKGNvbnN0IHN0cnVjdCBpbnRlbF9kc2kgKmlu dGVsX2RzaSk7CiBlbnVtIGRybV9wYW5lbF9vcmllbnRhdGlvbgogaW50ZWxfZHNpX2dldF9wYW5l bF9vcmllbnRhdGlvbihzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpOwordm9pZCBp bnRlbF9kc2lfYWRkX3Byb3BlcnRpZXMoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9y KTsKIAogLyogdmx2X2RzaS5jICovCiB2b2lkIHZsdl9kc2lfd2FpdF9mb3JfZmlmb19lbXB0eShz dHJ1Y3QgaW50ZWxfZHNpICppbnRlbF9kc2ksIGVudW0gcG9ydCBwb3J0KTsKQEAgLTE3Myw2ICsx NzQsOCBAQCBzdHJ1Y3QgaW50ZWxfZHNpX2hvc3QgKmludGVsX2RzaV9ob3N0X2luaXQoc3RydWN0 IGludGVsX2RzaSAqaW50ZWxfZHNpLAogCQkJCQkgICBjb25zdCBzdHJ1Y3QgbWlwaV9kc2lfaG9z dF9vcHMgKmZ1bmNzLAogCQkJCQkgICBlbnVtIHBvcnQgcG9ydCk7CiB2b2lkIHZsdl9kc2lfaW5p dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOworZW51bSBkcm1fcGFuZWxfb3Jp ZW50YXRpb24KK3Zsdl9kc2lfZ2V0X2h3X3BhbmVsX29yaWVudGF0aW9uKHN0cnVjdCBpbnRlbF9j b25uZWN0b3IgKmNvbm5lY3Rvcik7CiAKIC8qIHZsdl9kc2lfcGxsLmMgKi8KIGludCB2bHZfZHNp X3BsbF9jb21wdXRlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvdmx2X2RzaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvdmx2 X2RzaS5jCmluZGV4IGUyNzJkODI2MjEwYS4uOWY5MTE2MjNkNjg1IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS92bHZfZHNpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvdmx2 X2RzaS5jCkBAIC0xNTkxLDcgKzE1OTEsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jb25u ZWN0b3JfZnVuY3MgaW50ZWxfZHNpX2Nvbm5lY3Rvcl9mdW5jcyA9IHsKIAkuYXRvbWljX2R1cGxp Y2F0ZV9zdGF0ZSA9IGludGVsX2RpZ2l0YWxfY29ubmVjdG9yX2R1cGxpY2F0ZV9zdGF0ZSwKIH07 CiAKLXN0YXRpYyBlbnVtIGRybV9wYW5lbF9vcmllbnRhdGlvbgorZW51bSBkcm1fcGFuZWxfb3Jp ZW50YXRpb24KIHZsdl9kc2lfZ2V0X2h3X3BhbmVsX29yaWVudGF0aW9uKHN0cnVjdCBpbnRlbF9j b25uZWN0b3IgKmNvbm5lY3RvcikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGNvbm5lY3Rvci0+YmFzZS5kZXYpOwpAQCAtMTYyOSw0NiArMTYyOSw2IEBA IHZsdl9kc2lfZ2V0X2h3X3BhbmVsX29yaWVudGF0aW9uKHN0cnVjdCBpbnRlbF9jb25uZWN0b3Ig KmNvbm5lY3RvcikKIAlyZXR1cm4gb3JpZW50YXRpb247CiB9CiAKLXN0YXRpYyBlbnVtIGRybV9w YW5lbF9vcmllbnRhdGlvbgotdmx2X2RzaV9nZXRfcGFuZWxfb3JpZW50YXRpb24oc3RydWN0IGlu dGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoY29ubmVjdG9yLT5iYXNlLmRldik7Ci0JZW51bSBkcm1fcGFuZWxf b3JpZW50YXRpb24gb3JpZW50YXRpb247Ci0KLQlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikg fHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKLQkJb3JpZW50YXRpb24gPSB2bHZfZHNpX2dl dF9od19wYW5lbF9vcmllbnRhdGlvbihjb25uZWN0b3IpOwotCQlpZiAob3JpZW50YXRpb24gIT0g RFJNX01PREVfUEFORUxfT1JJRU5UQVRJT05fVU5LTk9XTikKLQkJCXJldHVybiBvcmllbnRhdGlv bjsKLQl9Ci0KLQlyZXR1cm4gaW50ZWxfZHNpX2dldF9wYW5lbF9vcmllbnRhdGlvbihjb25uZWN0 b3IpOwotfQotCi1zdGF0aWMgdm9pZCBpbnRlbF9kc2lfYWRkX3Byb3BlcnRpZXMoc3RydWN0IGlu dGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoY29ubmVjdG9yLT5iYXNlLmRldik7Ci0KLQlpZiAoY29ubmVjdG9y LT5wYW5lbC5maXhlZF9tb2RlKSB7Ci0JCXUzMiBhbGxvd2VkX3NjYWxlcnM7Ci0KLQkJYWxsb3dl ZF9zY2FsZXJzID0gQklUKERSTV9NT0RFX1NDQUxFX0FTUEVDVCkgfCBCSVQoRFJNX01PREVfU0NB TEVfRlVMTFNDUkVFTik7Ci0JCWlmICghSEFTX0dNQ0goZGV2X3ByaXYpKQotCQkJYWxsb3dlZF9z Y2FsZXJzIHw9IEJJVChEUk1fTU9ERV9TQ0FMRV9DRU5URVIpOwotCi0JCWRybV9jb25uZWN0b3Jf YXR0YWNoX3NjYWxpbmdfbW9kZV9wcm9wZXJ0eSgmY29ubmVjdG9yLT5iYXNlLAotCQkJCQkJCQlh bGxvd2VkX3NjYWxlcnMpOwotCi0JCWNvbm5lY3Rvci0+YmFzZS5zdGF0ZS0+c2NhbGluZ19tb2Rl ID0gRFJNX01PREVfU0NBTEVfQVNQRUNUOwotCi0JCWNvbm5lY3Rvci0+YmFzZS5kaXNwbGF5X2lu Zm8ucGFuZWxfb3JpZW50YXRpb24gPQotCQkJdmx2X2RzaV9nZXRfcGFuZWxfb3JpZW50YXRpb24o Y29ubmVjdG9yKTsKLQkJZHJtX2Nvbm5lY3Rvcl9pbml0X3BhbmVsX29yaWVudGF0aW9uX3Byb3Bl cnR5KAotCQkJCSZjb25uZWN0b3ItPmJhc2UsCi0JCQkJY29ubmVjdG9yLT5wYW5lbC5maXhlZF9t b2RlLT5oZGlzcGxheSwKLQkJCQljb25uZWN0b3ItPnBhbmVsLmZpeGVkX21vZGUtPnZkaXNwbGF5 KTsKLQl9Ci19Ci0KICNkZWZpbmUgTlNfS0haX1JBVElPCQkxMDAwMDAwCiAKICNkZWZpbmUgUFJF UEFSRV9DTlRfTUFYCQkweDNGCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeA==