drm/exynos: set primary plane in exynos_drm_crtc_init

exynos_drm_crtc_init has all information necessary to discover primary
plane. Let's move logic for setting primary plane into this function.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index 663446ca2d098f1251542ade4f4e780eabd43c31..958972e3ee1ed85cab7b135a31867e89e08179cb 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -30,8 +30,6 @@
 #define DSD_CFG_MUX_TE_UNMASK_GLOBAL BIT(13)
 
 #define WINDOWS_NR     5
-#define PRIMARY_WIN    2
-#define CURSON_WIN     4
 
 #define MIN_FB_WIDTH_FOR_16WORD_BURST  128
 
@@ -625,7 +623,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data)
        ret = exynos_drm_crtc_init(&ctx->crtc, drm_dev);
        if (ret)
                return ret;
-       ctx->crtc.base.primary = &ctx->planes[PRIMARY_WIN].base;
 
        decon_clear_channels(&ctx->crtc);
 

diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
index b6ad2faed159ca402144bfbae5a6c71de69b1fdf..3d8c96f0b02aa9ef281f8d13014d2d9e2552e19f 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@ -635,7 +635,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data)
                decon_ctx_remove(ctx);
                return ret;
        }
-       ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base;
 
        if (ctx->encoder)
                exynos_dpi_bind(drm_dev, ctx->encoder);

diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 72e224e80565c34b13b2044ff209e77df122fc0f..ec1319781b8bb5430ce7d9041a777ce29a387301 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -176,9 +176,17 @@ int exynos_drm_crtc_init(struct exynos_drm_crtc *exynos_crtc,
                         struct drm_device *drm_dev)
 {
        struct drm_crtc *crtc = &exynos_crtc->base;
+       struct drm_plane *primary = NULL, *plane;
+
+       drm_for_each_plane(plane, drm_dev) {
+               if (plane->possible_crtcs != BIT(drm_dev->mode_config.num_crtc))
+                       continue;
+               if (!primary && plane->type == DRM_PLANE_TYPE_PRIMARY)
+                       primary = plane;
+       }
 
        drm_crtc_helper_add(crtc, &exynos_crtc_helper_funcs);
-       return drm_crtc_init_with_planes(drm_dev, crtc, NULL, NULL,
+       return drm_crtc_init_with_planes(drm_dev, crtc, primary, NULL,
                                         &exynos_crtc_funcs, NULL);
 }
 

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 23b27b82de6e2d11a88e62e198a77c1064859cb0..6643db8655005f93c0027a381594ed4a80b0d659 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -21,8 +21,6 @@
 #define MAX_PLANE      5
 #define MAX_FB_BUFFER  4
 
-#define DEFAULT_WIN    0
-
 #define to_exynos_crtc(x)      container_of(x, struct exynos_drm_crtc, base)
 #define to_exynos_plane(x)     container_of(x, struct exynos_drm_plane, base)
 

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index b3c11bca5aede0407ace313cffdfe4f3fd58ba49..14e70971547a35b3a1511319dec751b4803685ab 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -1051,7 +1051,6 @@ static int fimd_bind(struct device *dev, struct device *master, void *data)
        ret = exynos_drm_crtc_init(&ctx->crtc, drm_dev);
        if (ret)
                return ret;
-       ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base;
 
        if (ctx->driver_data->has_dp_clk) {
                ctx->dp_clk.enable = fimd_dp_clock_enable;

diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index eb1fd3a2cdf3b5207e7423193ac9b6de9e6ed26f..19cd7275b20f431a68f74947db1880f192118c24 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -387,7 +387,6 @@ static int vidi_bind(struct device *dev, struct device *master, void *data)
                DRM_ERROR("failed to create crtc.\n");
                return ret;
        }
-       ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base;
 
        drm_encoder_init(drm_dev, encoder, &exynos_vidi_encoder_funcs,
                         DRM_MODE_ENCODER_TMDS, NULL);

diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index d0dcbbfc67e5b5b37106127a3ed3087b1b567a79..8bb31a0e572e0a626208dea5031b05f45969b506 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -1157,7 +1157,6 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data)
                mixer_ctx_remove(ctx);
                goto free_ctx;
        }
-       ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base;
 
        return 0;