aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/exynos/exynos_drm_crtc.c
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2014-11-26 13:43:27 -0500
committerInki Dae <daeinki@gmail.com>2015-01-25 07:28:07 -0500
commiteb88e422c502a7a1628cc919020e2ebf59450d4d (patch)
tree4253f311dd23564513ac522156d0b5bb1b5f91e0 /drivers/gpu/drm/exynos/exynos_drm_crtc.c
parent5d1741ad4b61bc5a7fbc783199aa2b8805877e76 (diff)
drm/exynos: remove drm_dev from struct exynos_drm_manager
manager-drm_dev is only accessed by exynos_drm_crtc_create() so this patch pass drm_dev as argument on exynos_drm_crtc_create() and remove it from struct exynos_drm_manager. 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_drm_crtc.c')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_crtc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 224b9af70224..1eb5750a59c9 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -299,12 +299,13 @@ static void exynos_drm_crtc_attach_mode_property(struct drm_crtc *crtc)
299 drm_object_attach_property(&crtc->base, prop, 0); 299 drm_object_attach_property(&crtc->base, prop, 0);
300} 300}
301 301
302int exynos_drm_crtc_create(struct exynos_drm_manager *manager, int pipe, 302int exynos_drm_crtc_create(struct exynos_drm_manager *manager,
303 struct drm_device *drm_dev, int pipe,
303 enum exynos_drm_output_type type) 304 enum exynos_drm_output_type type)
304{ 305{
305 struct exynos_drm_crtc *exynos_crtc; 306 struct exynos_drm_crtc *exynos_crtc;
306 struct drm_plane *plane; 307 struct drm_plane *plane;
307 struct exynos_drm_private *private = manager->drm_dev->dev_private; 308 struct exynos_drm_private *private = drm_dev->dev_private;
308 struct drm_crtc *crtc; 309 struct drm_crtc *crtc;
309 int ret; 310 int ret;
310 311
@@ -319,7 +320,7 @@ int exynos_drm_crtc_create(struct exynos_drm_manager *manager, int pipe,
319 exynos_crtc->manager = manager; 320 exynos_crtc->manager = manager;
320 exynos_crtc->pipe = pipe; 321 exynos_crtc->pipe = pipe;
321 exynos_crtc->type = type; 322 exynos_crtc->type = type;
322 plane = exynos_plane_init(manager->drm_dev, 1 << pipe, 323 plane = exynos_plane_init(drm_dev, 1 << pipe,
323 DRM_PLANE_TYPE_PRIMARY); 324 DRM_PLANE_TYPE_PRIMARY);
324 if (IS_ERR(plane)) { 325 if (IS_ERR(plane)) {
325 ret = PTR_ERR(plane); 326 ret = PTR_ERR(plane);
@@ -331,7 +332,7 @@ int exynos_drm_crtc_create(struct exynos_drm_manager *manager, int pipe,
331 332
332 private->crtc[pipe] = crtc; 333 private->crtc[pipe] = crtc;
333 334
334 ret = drm_crtc_init_with_planes(manager->drm_dev, crtc, plane, NULL, 335 ret = drm_crtc_init_with_planes(drm_dev, crtc, plane, NULL,
335 &exynos_crtc_funcs); 336 &exynos_crtc_funcs);
336 if (ret < 0) 337 if (ret < 0)
337 goto err_crtc; 338 goto err_crtc;