@@ -228,6 +228,7 @@ struct exynos_drm_driver_info {
#define DRM_COMPONENT_DRIVER BIT(0) /* supports component framework */
#define DRM_VIRTUAL_DEVICE BIT(1) /* create virtual platform device */
#define DRM_DMA_DEVICE BIT(2) /* can be used for dma allocations */
+#define DRM_SHARED_DEVICE BIT(3) /* devices shared with V4L2 subsystem */
#define DRV_PTR(drv, cond) (IS_ENABLED(cond) ? &drv : NULL)
@@ -279,6 +280,17 @@ struct exynos_drm_driver_info {
}
};
+int exynos_drm_check_shared_device(struct device *dev)
+{
+ /*
+ * Exynos DRM drivers handle only devices that support
+ * the LCD Writeback data path, rest is handled by V4L2 driver
+ */
+ if (!of_property_read_bool(dev->of_node, "samsung,lcd-wb"))
+ return -ENODEV;
+ return 0;
+}
+
static int compare_dev(struct device *dev, void *data)
{
return dev == (struct device *)data;
@@ -300,7 +312,10 @@ static struct component_match *exynos_drm_match_add(struct device *dev)
&info->driver->driver,
(void *)platform_bus_type.match))) {
put_device(p);
- component_match_add(dev, &match, compare_dev, d);
+
+ if (!(info->flags & DRM_SHARED_DEVICE) ||
+ exynos_drm_check_shared_device(d) == 0)
+ component_match_add(dev, &match, compare_dev, d);
p = d;
}
put_device(p);
@@ -274,6 +274,8 @@ static inline int exynos_dpi_bind(struct drm_device *dev,
}
#endif
+int exynos_drm_check_shared_device(struct device *dev);
+
int exynos_atomic_commit(struct drm_device *dev, struct drm_atomic_state *state,
bool nonblock);
int exynos_atomic_check(struct drm_device *dev, struct drm_atomic_state *state);
Some hardware modules, like FIMC in Exynos4 series are shared between V4L2 (camera support) and DRM (memory-to-memory processing) subsystems. This patch provides a simple check to let such drivers to be used in the driver components framework. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 17 ++++++++++++++++- drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 ++ 2 files changed, 18 insertions(+), 1 deletion(-)