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-04 15:25:27 -0500
committerInki Dae <daeinki@gmail.com>2015-01-25 07:28:06 -0500
commite09f2b0d953235f886e190c5057dae5c5f678b2e (patch)
tree6e18580bf2079621de833d239a2c0a2bbd3e1980 /drivers/gpu/drm/exynos/exynos_drm_crtc.c
parent357193cd782e0716027c1b1ae5bae79e1db7d4ca (diff)
drm/exynos: add pipe param to exynos_drm_crtc_create()
Get the pipe value from a parameter instead of getting it from manager->pipe. We are removing manager->pipe. 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.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 1cdf7050ee89..68aae38b2cf9 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -299,7 +299,7 @@ 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) 302int exynos_drm_crtc_create(struct exynos_drm_manager *manager, int pipe)
303{ 303{
304 struct exynos_drm_crtc *exynos_crtc; 304 struct exynos_drm_crtc *exynos_crtc;
305 struct drm_plane *plane; 305 struct drm_plane *plane;
@@ -316,8 +316,8 @@ int exynos_drm_crtc_create(struct exynos_drm_manager *manager)
316 316
317 exynos_crtc->dpms = DRM_MODE_DPMS_OFF; 317 exynos_crtc->dpms = DRM_MODE_DPMS_OFF;
318 exynos_crtc->manager = manager; 318 exynos_crtc->manager = manager;
319 exynos_crtc->pipe = manager->pipe; 319 exynos_crtc->pipe = pipe;
320 plane = exynos_plane_init(manager->drm_dev, 1 << manager->pipe, 320 plane = exynos_plane_init(manager->drm_dev, 1 << pipe,
321 DRM_PLANE_TYPE_PRIMARY); 321 DRM_PLANE_TYPE_PRIMARY);
322 if (IS_ERR(plane)) { 322 if (IS_ERR(plane)) {
323 ret = PTR_ERR(plane); 323 ret = PTR_ERR(plane);
@@ -327,7 +327,7 @@ int exynos_drm_crtc_create(struct exynos_drm_manager *manager)
327 manager->crtc = &exynos_crtc->base; 327 manager->crtc = &exynos_crtc->base;
328 crtc = &exynos_crtc->base; 328 crtc = &exynos_crtc->base;
329 329
330 private->crtc[manager->pipe] = crtc; 330 private->crtc[pipe] = crtc;
331 331
332 ret = drm_crtc_init_with_planes(manager->drm_dev, crtc, plane, NULL, 332 ret = drm_crtc_init_with_planes(manager->drm_dev, crtc, plane, NULL,
333 &exynos_crtc_funcs); 333 &exynos_crtc_funcs);