Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1274102 > unrolled thread
| Started by | Liviu Dudau <Liviu.Dudau@arm.com> |
|---|---|
| First post | 2015-11-20 15:30 +0100 |
| Last post | 2015-11-24 00:30 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v2 0/2] Improve drm_of_component_probe() and move rockchip to use it Liviu Dudau <Liviu.Dudau@arm.com> - 2015-11-20 15:30 +0100
[PATCH v2 1/2] drm: Improve drm_of_component_probe() to correctly handle ports and remote ports. Liviu Dudau <Liviu.Dudau@arm.com> - 2015-11-20 15:30 +0100
Re: [PATCH v2 0/2] Improve drm_of_component_probe() and move rockchip to use it Heiko Stübner <heiko@sntech.de> - 2015-11-24 00:30 +0100
| From | Liviu Dudau <Liviu.Dudau@arm.com> |
|---|---|
| Date | 2015-11-20 15:30 +0100 |
| Subject | [PATCH v2 0/2] Improve drm_of_component_probe() and move rockchip to use it |
| Message-ID | <qwURj-8na-15@gated-at.bofh.it> |
Hello,
This is v2 of the patchset trying to make drm_of_component_probe() cope with finding
both local crtc ports and remote encoder ones. Heiko Stübner was nice enough to test
an earlier version that was patched following Russell's suggestions on rk3288, but
I haven't seen any reports from iMX or Armada users.
Changelog:
v2: Updated the drm_of_component_probe() comment to explain why the reference count
is not dropped. Fixed the compare_port() function for rockchip as described by
Russell.
v1: Original submission. http://lists.freedesktop.org/archives/dri-devel/2015-November/094546.html
Liviu Dudau (2):
drm: Improve drm_of_component_probe() to correctly handle ports and remote ports.
drm/rockchip: Convert the probe function to the generic drm_of_component_probe()
drivers/gpu/drm/armada/armada_drv.c | 3 +-
drivers/gpu/drm/drm_of.c | 19 ++++--
drivers/gpu/drm/imx/imx-drm-core.c | 3 +-
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 98 ++++++-----------------------
include/drm/drm_of.h | 6 +-
5 files changed, 40 insertions(+), 89 deletions(-)
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Liviu Dudau <Liviu.Dudau@arm.com> |
|---|---|
| Date | 2015-11-20 15:30 +0100 |
| Subject | [PATCH v2 1/2] drm: Improve drm_of_component_probe() to correctly handle ports and remote ports. |
| Message-ID | <qwURk-8na-21@gated-at.bofh.it> |
| In reply to | #1274102 |
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 <Liviu.Dudau@arm.com>
---
drivers/gpu/drm/armada/armada_drv.c | 3 ++-
drivers/gpu/drm/drm_of.c | 19 ++++++++++++++-----
drivers/gpu/drm/imx/imx-drm-core.c | 3 ++-
include/drm/drm_of.h | 6 ++++--
4 files changed, 22 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..34589d3 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,12 @@ 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, so we need to keep the reference count
+ * increment from of_parse_phandle()
+ */
}
if (i == 0) {
@@ -140,8 +145,12 @@ 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, so we need to keep the reference count
+ * increment from of_graph_get_remote_port_parent()
+ */
}
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.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Heiko Stübner <heiko@sntech.de> |
|---|---|
| Date | 2015-11-24 00:30 +0100 |
| Message-ID | <qy8Iy-6V-19@gated-at.bofh.it> |
| In reply to | #1274102 |
Am Freitag, 20. November 2015, 14:22:03 schrieb Liviu Dudau: > Hello, > > This is v2 of the patchset trying to make drm_of_component_probe() cope with > finding both local crtc ports and remote encoder ones. Heiko Stübner was > nice enough to test an earlier version that was patched following Russell's > suggestions on rk3288, but I haven't seen any reports from iMX or Armada > users. > > Changelog: > v2: Updated the drm_of_component_probe() comment to explain why the > reference count is not dropped. Fixed the compare_port() function for > rockchip as described by Russell. Now works nicely on my rk3288-veyron-jerry again. Tested-by: Heiko Stuebner <heiko@sntech.de> Thanks Heiko -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web