summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/exynos/exynos_mixer.c
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2014-11-05 19:51:35 -0200
committerInki Dae <daeinki@gmail.com>2015-01-25 21:28:07 +0900
commit5d1741ad4b61bc5a7fbc783199aa2b8805877e76 (patch)
tree9b8c6a390b9f273746c81c1a407ad3b65140a753 /drivers/gpu/drm/exynos/exynos_mixer.c
parent8a326edda468c4c6972c39594366bcb5c109e526 (diff)
downloadlinux-5d1741ad4b61bc5a7fbc783199aa2b8805877e76.tar.gz
linux-5d1741ad4b61bc5a7fbc783199aa2b8805877e76.tar.bz2
linux-5d1741ad4b61bc5a7fbc783199aa2b8805877e76.zip
drm/exynos: move 'type' from manager to crtc struct
'type' is now part of the struct exynos_drm_crtc. This is just another step in the struct exynos_drm_manager removal. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_mixer.c')
-rw-r--r--drivers/gpu/drm/exynos/exynos_mixer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 57c4622f9d41..50ae1e3d9578 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -1261,7 +1261,8 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data)
if (ret)
return ret;
- ret = exynos_drm_crtc_create(&ctx->manager, ctx->pipe);
+ ret = exynos_drm_crtc_create(&ctx->manager, ctx->pipe,
+ EXYNOS_DISPLAY_TYPE_HDMI);
if (ret) {
mixer_mgr_remove(&ctx->manager);
return ret;
@@ -1297,7 +1298,6 @@ static int mixer_probe(struct platform_device *pdev)
mutex_init(&ctx->mixer_mutex);
- ctx->manager.type = EXYNOS_DISPLAY_TYPE_HDMI;
ctx->manager.ops = &mixer_manager_ops;
if (dev->of_node) {
@@ -1321,7 +1321,7 @@ static int mixer_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, ctx);
ret = exynos_drm_component_add(&pdev->dev, EXYNOS_DEVICE_TYPE_CRTC,
- ctx->manager.type);
+ EXYNOS_DISPLAY_TYPE_HDMI);
if (ret)
return ret;