this patch set fixes the issues that two drivers use same hardware, FIMD and HDMI, and also I'd like to add my colleagues who dedicated to developing and improving Exynos DRM Driver to maintainer entry.
this is based on git repository below: git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git, branch name: drm-fixes commit-id: 081794564e3000e602de290d1121792c33b475a4
and you can refer to our working repository below: http://git.infradead.org/users/kmpark/linux-2.6-samsung, branch name: exynos-drm-fixes
Inki Dae (2): drm/exynos: fixed build dependency for DRM_EXYNOS_FIMD MAINTAINERS: added maintainer entry for Exynos DRM Driver.
Seung-Woo Kim (2): drm/exynos: use release_mem_region instead of release_resource drm/exynos: fix build dependency for DRM_EXYNOS_HDMI
MAINTAINERS | 3 +++ drivers/gpu/drm/exynos/Kconfig | 4 ++-- drivers/gpu/drm/exynos/exynos_hdmi.c | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-)
From: Seung-Woo Kim sw0312.kim@samsung.com
To make a api pair of request_mem_region and release_mem_region, release_mem_region is used instead of release_resource.
Signed-off-by: Seung-Woo Kim sw0312.kim@samsung.com Signed-off-by: Inki Dae inki.dae@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com --- drivers/gpu/drm/exynos/exynos_hdmi.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index f48f7ce..3429d3f 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -1116,8 +1116,8 @@ err_ddc: err_iomap: iounmap(hdata->regs); err_req_region: - release_resource(hdata->regs_res); - kfree(hdata->regs_res); + release_mem_region(hdata->regs_res->start, + resource_size(hdata->regs_res)); err_resource: hdmi_resources_cleanup(hdata); err_data: @@ -1145,8 +1145,8 @@ static int __devexit hdmi_remove(struct platform_device *pdev)
iounmap(hdata->regs);
- release_resource(hdata->regs_res); - kfree(hdata->regs_res); + release_mem_region(hdata->regs_res->start, + resource_size(hdata->regs_res));
/* hdmiphy i2c driver */ i2c_del_driver(&hdmiphy_driver);
From: Seung-Woo Kim sw0312.kim@samsung.com
DRM_EXYNOS_HDMI driver and VIDEO_SAMSUNG_S5P_TV driver should be not enabled at once because they use same HW blocks. So dependency for DRM_EXYNOS_HDMI is fixed to check VIDEO_SAMSUNG_S5P_TV=n.
Signed-off-by: Seung-Woo Kim sw0312.kim@samsung.com Signed-off-by: Inki Dae inki.dae@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com --- drivers/gpu/drm/exynos/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index f9aaa56..4ab915e 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig @@ -21,7 +21,7 @@ config DRM_EXYNOS_FIMD
config DRM_EXYNOS_HDMI tristate "Exynos DRM HDMI" - depends on DRM_EXYNOS + depends on DRM_EXYNOS && !VIDEO_SAMSUNG_S5P_TV help Choose this option if you want to use Exynos HDMI for DRM. If M is selected, the module will be called exynos_drm_hdmi
FB based FIMD and DRM based FIMD drivers use same hardware so with this patch, only one of them would be selected.
Signed-off-by: Inki Dae inki.dae@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com --- drivers/gpu/drm/exynos/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index 4ab915e..b9e5266 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig @@ -13,7 +13,7 @@ config DRM_EXYNOS
config DRM_EXYNOS_FIMD tristate "Exynos DRM FIMD" - depends on DRM_EXYNOS + depends on DRM_EXYNOS && !FB_S3C default n help Choose this option if you want to use Exynos FIMD for DRM.
I'd like to add my colleagues who dedicated to developing and improving our driver to maintainer entry.
Signed-off-by: Inki Dae inki.dae@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com --- MAINTAINERS | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS index 1094edf..1ec0d95 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2330,6 +2330,9 @@ F: include/drm/i915*
DRM DRIVERS FOR EXYNOS M: Inki Dae inki.dae@samsung.com +M: Joonyoung Shim jy0922.shim@samsung.com +M: Seung-Woo Kim sw0312.kim@samsung.com +M: Kyungmin Park kyungmin.park@samsung.com L: dri-devel@lists.freedesktop.org S: Supported F: drivers/gpu/drm/exynos
dri-devel@lists.freedesktop.org
-
Inki Dae