From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752738AbbKPOqf (ORCPT ); Mon, 16 Nov 2015 09:46:35 -0500 Received: from fw-tnat.cambridge.arm.com ([217.140.96.140]:20608 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751682AbbKPOqB (ORCPT ); Mon, 16 Nov 2015 09:46:01 -0500 From: Liviu Dudau To: Russell King , Mark Yao , Heiko Stuebner , Philipp Zabel , Daniel Vetter , David Airlie , Eric Anholt Cc: linux-rockchip , LAKML , dri-devel , LKML Subject: [PATCH 1/2] drm: Improve drm_of_component_probe() to correctly handle ports and remote ports. Date: Mon, 16 Nov 2015 14:44:52 +0000 Message-Id: <1447685093-26129-2-git-send-email-Liviu.Dudau@arm.com> X-Mailer: git-send-email 2.6.0 In-Reply-To: <1447685093-26129-1-git-send-email-Liviu.Dudau@arm.com> References: <1447685093-26129-1-git-send-email-Liviu.Dudau@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rockchip DRM driver cannot use the same compare_of() function to match ports and remote ports (aka encoders) as their OF sub-trees look different. Add a second compare function to be used when encoders are added to the component framework and patch the existing users of the function accordingly. Signed-off-by: Liviu Dudau --- drivers/gpu/drm/armada/armada_drv.c | 3 ++- drivers/gpu/drm/drm_of.c | 23 ++++++++++++++++++----- drivers/gpu/drm/imx/imx-drm-core.c | 3 ++- include/drm/drm_of.h | 6 ++++-- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index 77ab93d..3a2a929 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -274,7 +274,8 @@ static int armada_drm_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; int ret; - ret = drm_of_component_probe(dev, compare_dev_name, &armada_master_ops); + ret = drm_of_component_probe(dev, compare_dev_name, compare_dev_name, + &armada_master_ops); if (ret != -EINVAL) return ret; diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c index 493c05c..58fafd7 100644 --- a/drivers/gpu/drm/drm_of.c +++ b/drivers/gpu/drm/drm_of.c @@ -77,7 +77,8 @@ EXPORT_SYMBOL(drm_of_find_possible_crtcs); * Returns zero if successful, or one of the standard error codes if it fails. */ int drm_of_component_probe(struct device *dev, - int (*compare_of)(struct device *, void *), + int (*compare_port)(struct device *, void *), + int (*compare_encoder)(struct device *, void *), const struct component_master_ops *m_ops) { struct device_node *ep, *port, *remote; @@ -101,8 +102,14 @@ int drm_of_component_probe(struct device *dev, continue; } - component_match_add(dev, &match, compare_of, port); - of_node_put(port); + component_match_add(dev, &match, compare_port, port); + /* + * component_match_add keeps a reference to the port + * variable but does not do proper reference counting, + * so we cannot release the reference here. If that + * gets fixed, the following line should be uncommented + */ + /* of_node_put(port); */ } if (i == 0) { @@ -140,8 +147,14 @@ int drm_of_component_probe(struct device *dev, continue; } - component_match_add(dev, &match, compare_of, remote); - of_node_put(remote); + component_match_add(dev, &match, compare_encoder, remote); + /* + * component_match_add keeps a reference to the port + * variable but does not do proper reference counting, + * so we cannot release the reference here. If that + * gets fixed, the following line should be uncommented + */ + /* of_node_put(remote); */ } of_node_put(port); } diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index 64f16ea..0d36410 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -531,7 +531,8 @@ static const struct component_master_ops imx_drm_ops = { static int imx_drm_platform_probe(struct platform_device *pdev) { - int ret = drm_of_component_probe(&pdev->dev, compare_of, &imx_drm_ops); + int ret = drm_of_component_probe(&pdev->dev, compare_of, compare_of, + &imx_drm_ops); if (!ret) ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index 8544665..1c29e42 100644 --- a/include/drm/drm_of.h +++ b/include/drm/drm_of.h @@ -10,7 +10,8 @@ struct device_node; extern uint32_t drm_of_find_possible_crtcs(struct drm_device *dev, struct device_node *port); extern int drm_of_component_probe(struct device *dev, - int (*compare_of)(struct device *, void *), + int (*compare_port)(struct device *, void *), + int (*compare_encoder)(struct device *, void *), const struct component_master_ops *m_ops); #else static inline uint32_t drm_of_find_possible_crtcs(struct drm_device *dev, @@ -21,7 +22,8 @@ static inline uint32_t drm_of_find_possible_crtcs(struct drm_device *dev, static inline int drm_of_component_probe(struct device *dev, - int (*compare_of)(struct device *, void *), + int (*compare_port)(struct device *, void *), + int (*compare_encoder)(struct device *, void *), const struct component_master_ops *m_ops) { return -EINVAL; -- 2.6.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liviu Dudau Subject: [PATCH 1/2] drm: Improve drm_of_component_probe() to correctly handle ports and remote ports. Date: Mon, 16 Nov 2015 14:44:52 +0000 Message-ID: <1447685093-26129-2-git-send-email-Liviu.Dudau@arm.com> References: <1447685093-26129-1-git-send-email-Liviu.Dudau@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1447685093-26129-1-git-send-email-Liviu.Dudau@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Russell King , Mark Yao , Heiko Stuebner , Philipp Zabel , Daniel Vetter , David Airlie , Eric Anholt Cc: linux-rockchip , dri-devel , LAKML , LKML List-Id: linux-rockchip.vger.kernel.org Um9ja2NoaXAgRFJNIGRyaXZlciBjYW5ub3QgdXNlIHRoZSBzYW1lIGNvbXBhcmVfb2YoKSBmdW5j dGlvbiB0byBtYXRjaApwb3J0cyBhbmQgcmVtb3RlIHBvcnRzIChha2EgZW5jb2RlcnMpIGFzIHRo ZWlyIE9GIHN1Yi10cmVlcyBsb29rIGRpZmZlcmVudC4KQWRkIGEgc2Vjb25kIGNvbXBhcmUgZnVu Y3Rpb24gdG8gYmUgdXNlZCB3aGVuIGVuY29kZXJzIGFyZSBhZGRlZCB0byB0aGUKY29tcG9uZW50 IGZyYW1ld29yayBhbmQgcGF0Y2ggdGhlIGV4aXN0aW5nIHVzZXJzIG9mIHRoZSBmdW5jdGlvbgph Y2NvcmRpbmdseS4KClNpZ25lZC1vZmYtYnk6IExpdml1IER1ZGF1IDxMaXZpdS5EdWRhdUBhcm0u Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX2Rydi5jIHwgIDMgKystCiBk cml2ZXJzL2dwdS9kcm0vZHJtX29mLmMgICAgICAgICAgICB8IDIzICsrKysrKysrKysrKysrKysr Ky0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaW14L2lteC1kcm0tY29yZS5jICB8ICAzICsrLQogaW5j bHVkZS9kcm0vZHJtX29mLmggICAgICAgICAgICAgICAgfCAgNiArKysrLS0KIDQgZmlsZXMgY2hh bmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYXJtYWRhL2FybWFkYV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9hcm1hZGEv YXJtYWRhX2Rydi5jCmluZGV4IDc3YWI5M2QuLjNhMmE5MjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9hcm1hZGEvYXJtYWRhX2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hcm1hZGEv YXJtYWRhX2Rydi5jCkBAIC0yNzQsNyArMjc0LDggQEAgc3RhdGljIGludCBhcm1hZGFfZHJtX3By b2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJc3RydWN0IGRldmljZSAqZGV2ID0g JnBkZXYtPmRldjsKIAlpbnQgcmV0OwogCi0JcmV0ID0gZHJtX29mX2NvbXBvbmVudF9wcm9iZShk ZXYsIGNvbXBhcmVfZGV2X25hbWUsICZhcm1hZGFfbWFzdGVyX29wcyk7CisJcmV0ID0gZHJtX29m X2NvbXBvbmVudF9wcm9iZShkZXYsIGNvbXBhcmVfZGV2X25hbWUsIGNvbXBhcmVfZGV2X25hbWUs CisJCQkJICAgICAmYXJtYWRhX21hc3Rlcl9vcHMpOwogCWlmIChyZXQgIT0gLUVJTlZBTCkKIAkJ cmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9vZi5jIGIvZHJp dmVycy9ncHUvZHJtL2RybV9vZi5jCmluZGV4IDQ5M2MwNWMuLjU4ZmFmZDcgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fb2YuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX29mLmMK QEAgLTc3LDcgKzc3LDggQEAgRVhQT1JUX1NZTUJPTChkcm1fb2ZfZmluZF9wb3NzaWJsZV9jcnRj cyk7CiAgKiBSZXR1cm5zIHplcm8gaWYgc3VjY2Vzc2Z1bCwgb3Igb25lIG9mIHRoZSBzdGFuZGFy ZCBlcnJvciBjb2RlcyBpZiBpdCBmYWlscy4KICAqLwogaW50IGRybV9vZl9jb21wb25lbnRfcHJv YmUoc3RydWN0IGRldmljZSAqZGV2LAotCQkJICAgaW50ICgqY29tcGFyZV9vZikoc3RydWN0IGRl dmljZSAqLCB2b2lkICopLAorCQkJICAgaW50ICgqY29tcGFyZV9wb3J0KShzdHJ1Y3QgZGV2aWNl ICosIHZvaWQgKiksCisJCQkgICBpbnQgKCpjb21wYXJlX2VuY29kZXIpKHN0cnVjdCBkZXZpY2Ug Kiwgdm9pZCAqKSwKIAkJCSAgIGNvbnN0IHN0cnVjdCBjb21wb25lbnRfbWFzdGVyX29wcyAqbV9v cHMpCiB7CiAJc3RydWN0IGRldmljZV9ub2RlICplcCwgKnBvcnQsICpyZW1vdGU7CkBAIC0xMDEs OCArMTAyLDE0IEBAIGludCBkcm1fb2ZfY29tcG9uZW50X3Byb2JlKHN0cnVjdCBkZXZpY2UgKmRl diwKIAkJCWNvbnRpbnVlOwogCQl9CiAKLQkJY29tcG9uZW50X21hdGNoX2FkZChkZXYsICZtYXRj aCwgY29tcGFyZV9vZiwgcG9ydCk7Ci0JCW9mX25vZGVfcHV0KHBvcnQpOworCQljb21wb25lbnRf bWF0Y2hfYWRkKGRldiwgJm1hdGNoLCBjb21wYXJlX3BvcnQsIHBvcnQpOworCQkvKgorCQkgKiBj b21wb25lbnRfbWF0Y2hfYWRkIGtlZXBzIGEgcmVmZXJlbmNlIHRvIHRoZSBwb3J0CisJCSAqIHZh cmlhYmxlIGJ1dCBkb2VzIG5vdCBkbyBwcm9wZXIgcmVmZXJlbmNlIGNvdW50aW5nLAorCQkgKiBz byB3ZSBjYW5ub3QgcmVsZWFzZSB0aGUgcmVmZXJlbmNlIGhlcmUuIElmIHRoYXQKKwkJICogZ2V0 cyBmaXhlZCwgdGhlIGZvbGxvd2luZyBsaW5lIHNob3VsZCBiZSB1bmNvbW1lbnRlZAorCQkgKi8K KwkJLyogb2Zfbm9kZV9wdXQocG9ydCk7ICovCiAJfQogCiAJaWYgKGkgPT0gMCkgewpAQCAtMTQw LDggKzE0NywxNCBAQCBpbnQgZHJtX29mX2NvbXBvbmVudF9wcm9iZShzdHJ1Y3QgZGV2aWNlICpk ZXYsCiAJCQkJY29udGludWU7CiAJCQl9CiAKLQkJCWNvbXBvbmVudF9tYXRjaF9hZGQoZGV2LCAm bWF0Y2gsIGNvbXBhcmVfb2YsIHJlbW90ZSk7Ci0JCQlvZl9ub2RlX3B1dChyZW1vdGUpOworCQkJ Y29tcG9uZW50X21hdGNoX2FkZChkZXYsICZtYXRjaCwgY29tcGFyZV9lbmNvZGVyLCByZW1vdGUp OworCQkJLyoKKwkJCSAqIGNvbXBvbmVudF9tYXRjaF9hZGQga2VlcHMgYSByZWZlcmVuY2UgdG8g dGhlIHBvcnQKKwkJCSAqIHZhcmlhYmxlIGJ1dCBkb2VzIG5vdCBkbyBwcm9wZXIgcmVmZXJlbmNl IGNvdW50aW5nLAorCQkJICogc28gd2UgY2Fubm90IHJlbGVhc2UgdGhlIHJlZmVyZW5jZSBoZXJl LiBJZiB0aGF0CisJCQkgKiBnZXRzIGZpeGVkLCB0aGUgZm9sbG93aW5nIGxpbmUgc2hvdWxkIGJl IHVuY29tbWVudGVkCisJCQkgKi8KKwkJCS8qIG9mX25vZGVfcHV0KHJlbW90ZSk7ICovCiAJCX0K IAkJb2Zfbm9kZV9wdXQocG9ydCk7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2lt eC9pbXgtZHJtLWNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pbXgvaW14LWRybS1jb3JlLmMKaW5k ZXggNjRmMTZlYS4uMGQzNjQxMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2lteC9pbXgt ZHJtLWNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaW14L2lteC1kcm0tY29yZS5jCkBAIC01 MzEsNyArNTMxLDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBjb21wb25lbnRfbWFzdGVyX29wcyBp bXhfZHJtX29wcyA9IHsKIAogc3RhdGljIGludCBpbXhfZHJtX3BsYXRmb3JtX3Byb2JlKHN0cnVj dCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiB7Ci0JaW50IHJldCA9IGRybV9vZl9jb21wb25lbnRf cHJvYmUoJnBkZXYtPmRldiwgY29tcGFyZV9vZiwgJmlteF9kcm1fb3BzKTsKKwlpbnQgcmV0ID0g ZHJtX29mX2NvbXBvbmVudF9wcm9iZSgmcGRldi0+ZGV2LCBjb21wYXJlX29mLCBjb21wYXJlX29m LAorCQkJCQkgJmlteF9kcm1fb3BzKTsKIAogCWlmICghcmV0KQogCQlyZXQgPSBkbWFfc2V0X2Nv aGVyZW50X21hc2soJnBkZXYtPmRldiwgRE1BX0JJVF9NQVNLKDMyKSk7CmRpZmYgLS1naXQgYS9p bmNsdWRlL2RybS9kcm1fb2YuaCBiL2luY2x1ZGUvZHJtL2RybV9vZi5oCmluZGV4IDg1NDQ2NjUu LjFjMjllNDIgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9vZi5oCisrKyBiL2luY2x1ZGUv ZHJtL2RybV9vZi5oCkBAIC0xMCw3ICsxMCw4IEBAIHN0cnVjdCBkZXZpY2Vfbm9kZTsKIGV4dGVy biB1aW50MzJfdCBkcm1fb2ZfZmluZF9wb3NzaWJsZV9jcnRjcyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCQkJCQkgICBzdHJ1Y3QgZGV2aWNlX25vZGUgKnBvcnQpOwogZXh0ZXJuIGludCBkcm1f b2ZfY29tcG9uZW50X3Byb2JlKHN0cnVjdCBkZXZpY2UgKmRldiwKLQkJCQkgIGludCAoKmNvbXBh cmVfb2YpKHN0cnVjdCBkZXZpY2UgKiwgdm9pZCAqKSwKKwkJCQkgIGludCAoKmNvbXBhcmVfcG9y dCkoc3RydWN0IGRldmljZSAqLCB2b2lkICopLAorCQkJCSAgaW50ICgqY29tcGFyZV9lbmNvZGVy KShzdHJ1Y3QgZGV2aWNlICosIHZvaWQgKiksCiAJCQkJICBjb25zdCBzdHJ1Y3QgY29tcG9uZW50 X21hc3Rlcl9vcHMgKm1fb3BzKTsKICNlbHNlCiBzdGF0aWMgaW5saW5lIHVpbnQzMl90IGRybV9v Zl9maW5kX3Bvc3NpYmxlX2NydGNzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCkBAIC0yMSw3ICsy Miw4IEBAIHN0YXRpYyBpbmxpbmUgdWludDMyX3QgZHJtX29mX2ZpbmRfcG9zc2libGVfY3J0Y3Mo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogc3RhdGljIGlubGluZSBpbnQKIGRybV9vZl9jb21w b25lbnRfcHJvYmUoc3RydWN0IGRldmljZSAqZGV2LAotCQkgICAgICAgaW50ICgqY29tcGFyZV9v Zikoc3RydWN0IGRldmljZSAqLCB2b2lkICopLAorCQkgICAgICAgaW50ICgqY29tcGFyZV9wb3J0 KShzdHJ1Y3QgZGV2aWNlICosIHZvaWQgKiksCisJCSAgICAgICBpbnQgKCpjb21wYXJlX2VuY29k ZXIpKHN0cnVjdCBkZXZpY2UgKiwgdm9pZCAqKSwKIAkJICAgICAgIGNvbnN0IHN0cnVjdCBjb21w b25lbnRfbWFzdGVyX29wcyAqbV9vcHMpCiB7CiAJcmV0dXJuIC1FSU5WQUw7Ci0tIAoyLjYuMAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liviu.Dudau@arm.com (Liviu Dudau) Date: Mon, 16 Nov 2015 14:44:52 +0000 Subject: [PATCH 1/2] drm: Improve drm_of_component_probe() to correctly handle ports and remote ports. In-Reply-To: <1447685093-26129-1-git-send-email-Liviu.Dudau@arm.com> References: <1447685093-26129-1-git-send-email-Liviu.Dudau@arm.com> Message-ID: <1447685093-26129-2-git-send-email-Liviu.Dudau@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Rockchip DRM driver cannot use the same compare_of() function to match ports and remote ports (aka encoders) as their OF sub-trees look different. Add a second compare function to be used when encoders are added to the component framework and patch the existing users of the function accordingly. Signed-off-by: Liviu Dudau --- drivers/gpu/drm/armada/armada_drv.c | 3 ++- drivers/gpu/drm/drm_of.c | 23 ++++++++++++++++++----- drivers/gpu/drm/imx/imx-drm-core.c | 3 ++- include/drm/drm_of.h | 6 ++++-- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index 77ab93d..3a2a929 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -274,7 +274,8 @@ static int armada_drm_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; int ret; - ret = drm_of_component_probe(dev, compare_dev_name, &armada_master_ops); + ret = drm_of_component_probe(dev, compare_dev_name, compare_dev_name, + &armada_master_ops); if (ret != -EINVAL) return ret; diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c index 493c05c..58fafd7 100644 --- a/drivers/gpu/drm/drm_of.c +++ b/drivers/gpu/drm/drm_of.c @@ -77,7 +77,8 @@ EXPORT_SYMBOL(drm_of_find_possible_crtcs); * Returns zero if successful, or one of the standard error codes if it fails. */ int drm_of_component_probe(struct device *dev, - int (*compare_of)(struct device *, void *), + int (*compare_port)(struct device *, void *), + int (*compare_encoder)(struct device *, void *), const struct component_master_ops *m_ops) { struct device_node *ep, *port, *remote; @@ -101,8 +102,14 @@ int drm_of_component_probe(struct device *dev, continue; } - component_match_add(dev, &match, compare_of, port); - of_node_put(port); + component_match_add(dev, &match, compare_port, port); + /* + * component_match_add keeps a reference to the port + * variable but does not do proper reference counting, + * so we cannot release the reference here. If that + * gets fixed, the following line should be uncommented + */ + /* of_node_put(port); */ } if (i == 0) { @@ -140,8 +147,14 @@ int drm_of_component_probe(struct device *dev, continue; } - component_match_add(dev, &match, compare_of, remote); - of_node_put(remote); + component_match_add(dev, &match, compare_encoder, remote); + /* + * component_match_add keeps a reference to the port + * variable but does not do proper reference counting, + * so we cannot release the reference here. If that + * gets fixed, the following line should be uncommented + */ + /* of_node_put(remote); */ } of_node_put(port); } diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index 64f16ea..0d36410 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -531,7 +531,8 @@ static const struct component_master_ops imx_drm_ops = { static int imx_drm_platform_probe(struct platform_device *pdev) { - int ret = drm_of_component_probe(&pdev->dev, compare_of, &imx_drm_ops); + int ret = drm_of_component_probe(&pdev->dev, compare_of, compare_of, + &imx_drm_ops); if (!ret) ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index 8544665..1c29e42 100644 --- a/include/drm/drm_of.h +++ b/include/drm/drm_of.h @@ -10,7 +10,8 @@ struct device_node; extern uint32_t drm_of_find_possible_crtcs(struct drm_device *dev, struct device_node *port); extern int drm_of_component_probe(struct device *dev, - int (*compare_of)(struct device *, void *), + int (*compare_port)(struct device *, void *), + int (*compare_encoder)(struct device *, void *), const struct component_master_ops *m_ops); #else static inline uint32_t drm_of_find_possible_crtcs(struct drm_device *dev, @@ -21,7 +22,8 @@ static inline uint32_t drm_of_find_possible_crtcs(struct drm_device *dev, static inline int drm_of_component_probe(struct device *dev, - int (*compare_of)(struct device *, void *), + int (*compare_port)(struct device *, void *), + int (*compare_encoder)(struct device *, void *), const struct component_master_ops *m_ops) { return -EINVAL; -- 2.6.0