3 files changed, 45 insertions, 12 deletions

diff --git a/Documentation/devicetree/bindings/video/exynos_mixer.txt b/Documentation/devicetree/bindings/video/exynos_mixer.txt
index 9131b99cd8ff..3334b0a8e343 100644
--- a/Documentation/devicetree/bindings/video/exynos_mixer.txt
+++ b/Documentation/devicetree/bindings/video/exynos_mixer.txt
@@ -5,6 +5,7 @@ Required properties:
         1) "samsung,exynos5-mixer" <DEPRECATED>
         2) "samsung,exynos4210-mixer"
         3) "samsung,exynos5250-mixer"
+        4) "samsung,exynos5420-mixer"
 
 - reg: physical base address of the mixer and length of memory mapped
         region.
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 62255011c9d6..b1280b43931c 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -78,6 +78,7 @@ struct mixer_resources {
 enum mixer_version_id {
         MXR_VER_0_0_0_16,
         MXR_VER_16_0_33_0,
+        MXR_VER_128_0_0_184,
 };
 
 struct mixer_context {
@@ -283,17 +284,19 @@ static void mixer_cfg_scan(struct mixer_context *ctx, unsigned int height)
         val = (ctx->interlace ? MXR_CFG_SCAN_INTERLACE :
                                 MXR_CFG_SCAN_PROGRASSIVE);
 
-        /* choosing between porper HD and SD mode */
-        if (height <= 480)
-                val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD;
-        else if (height <= 576)
-                val |= MXR_CFG_SCAN_PAL | MXR_CFG_SCAN_SD;
-        else if (height <= 720)
-                val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
-        else if (height <= 1080)
-                val |= MXR_CFG_SCAN_HD_1080 | MXR_CFG_SCAN_HD;
-        else
-                val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
+        if (ctx->mxr_ver != MXR_VER_128_0_0_184) {
+                /* choosing between proper HD and SD mode */
+                if (height <= 480)
+                        val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD;
+                else if (height <= 576)
+                        val |= MXR_CFG_SCAN_PAL | MXR_CFG_SCAN_SD;
+                else if (height <= 720)
+                        val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
+                else if (height <= 1080)
+                        val |= MXR_CFG_SCAN_HD_1080 | MXR_CFG_SCAN_HD;
+                else
+                        val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
+        }
 
         mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_SCAN_MASK);
 }
@@ -557,6 +560,14 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win)
         /* setup geometry */
         mixer_reg_write(res, MXR_GRAPHIC_SPAN(win), win_data->fb_width);
 
+        /* setup display size */
+        if (ctx->mxr_ver == MXR_VER_128_0_0_184 &&
+                win == MIXER_DEFAULT_WIN) {
+                val  = MXR_MXR_RES_HEIGHT(win_data->fb_height);
+                val |= MXR_MXR_RES_WIDTH(win_data->fb_width);
+                mixer_reg_write(res, MXR_RESOLUTION, val);
+        }
+
         val  = MXR_GRP_WH_WIDTH(win_data->crtc_width);
         val |= MXR_GRP_WH_HEIGHT(win_data->crtc_height);
         val |= MXR_GRP_WH_H_SCALE(x_ratio);
@@ -581,7 +592,8 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win)
         mixer_cfg_layer(ctx, win, true);
 
         /* layer update mandatory for mixer 16.0.33.0 */
-        if (ctx->mxr_ver == MXR_VER_16_0_33_0)
+        if (ctx->mxr_ver == MXR_VER_16_0_33_0 ||
+                ctx->mxr_ver == MXR_VER_128_0_0_184)
                 mixer_layer_update(ctx);
 
         mixer_run(ctx);
@@ -816,6 +828,7 @@ static void mixer_win_disable(void *ctx, int win)
 
 static int mixer_check_mode(void *ctx, struct drm_display_mode *mode)
 {
+        struct mixer_context *mixer_ctx = ctx;
         u32 w, h;
 
         w = mode->hdisplay;
@@ -825,6 +838,10 @@ static int mixer_check_mode(void *ctx, struct drm_display_mode *mode)
                 mode->hdisplay, mode->vdisplay, mode->vrefresh,
                 (mode->flags & DRM_MODE_FLAG_INTERLACE) ? 1 : 0);
 
+        if (mixer_ctx->mxr_ver == MXR_VER_0_0_0_16 ||
+                mixer_ctx->mxr_ver == MXR_VER_128_0_0_184)
+                return 0;
+
         if ((w >= 464 && w <= 720 && h >= 261 && h <= 576) ||
                 (w >= 1024 && w <= 1280 && h >= 576 && h <= 720) ||
                 (w >= 1664 && w <= 1920 && h >= 936 && h <= 1080))
@@ -1115,6 +1132,11 @@ static int vp_resources_init(struct exynos_drm_hdmi_context *ctx,
         return 0;
 }
 
+static struct mixer_drv_data exynos5420_mxr_drv_data = {
+        .version = MXR_VER_128_0_0_184,
+        .is_vp_enabled = 0,
+};
+
 static struct mixer_drv_data exynos5250_mxr_drv_data = {
         .version = MXR_VER_16_0_33_0,
         .is_vp_enabled = 0,
@@ -1145,6 +1167,9 @@ static struct of_device_id mixer_match_types[] = {
                 .compatible = "samsung,exynos5250-mixer",
                 .data   = &exynos5250_mxr_drv_data,
         }, {
+                .compatible = "samsung,exynos5420-mixer",
+                .data   = &exynos5420_mxr_drv_data,
+        }, {
                 /* end node */
         }
 };
diff --git a/drivers/gpu/drm/exynos/regs-mixer.h b/drivers/gpu/drm/exynos/regs-mixer.h
index 5d8dbc0301e6..4537026bc385 100644
--- a/drivers/gpu/drm/exynos/regs-mixer.h
+++ b/drivers/gpu/drm/exynos/regs-mixer.h
@@ -44,6 +44,9 @@
 #define MXR_CM_COEFF_Y                  0x0080
 #define MXR_CM_COEFF_CB                 0x0084
 #define MXR_CM_COEFF_CR                 0x0088
+#define MXR_MO                          0x0304
+#define MXR_RESOLUTION                  0x0310
+
 #define MXR_GRAPHIC0_BASE_S             0x2024
 #define MXR_GRAPHIC1_BASE_S             0x2044
 
@@ -119,6 +122,10 @@
 #define MXR_GRP_WH_WIDTH(x)             MXR_MASK_VAL(x, 26, 16)
 #define MXR_GRP_WH_HEIGHT(x)            MXR_MASK_VAL(x, 10, 0)
 
+/* bits for MXR_RESOLUTION */
+#define MXR_MXR_RES_HEIGHT(x)           MXR_MASK_VAL(x, 26, 16)
+#define MXR_MXR_RES_WIDTH(x)            MXR_MASK_VAL(x, 10, 0)
+
 /* bits for MXR_GRAPHICn_SXY */
 #define MXR_GRP_SXY_SX(x)               MXR_MASK_VAL(x, 26, 16)
 #define MXR_GRP_SXY_SY(x)               MXR_MASK_VAL(x, 10, 0)