Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / exynos / exynos_drm_fimc.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
index 835b6af009706135bfda7d78c264ce826f65bea4..842d6b8dc3c435ee7d836402d4169847aef75d31 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
@@ -461,7 +461,6 @@ static int fimc_src_set_fmt_order(struct fimc_context *ctx, u32 fmt)
                cfg |= EXYNOS_MSCTRL_C_INT_IN_3PLANE;
                break;
        case DRM_FORMAT_NV12:
-       case DRM_FORMAT_NV12MT:
        case DRM_FORMAT_NV16:
                cfg |= (EXYNOS_MSCTRL_ORDER2P_LSB_CBCR |
                        EXYNOS_MSCTRL_C_INT_IN_2PLANE);
@@ -511,7 +510,6 @@ static int fimc_src_set_fmt(struct device *dev, u32 fmt)
        case DRM_FORMAT_YVU420:
        case DRM_FORMAT_NV12:
        case DRM_FORMAT_NV21:
-       case DRM_FORMAT_NV12MT:
                cfg |= EXYNOS_MSCTRL_INFORMAT_YCBCR420;
                break;
        default:
@@ -524,10 +522,7 @@ static int fimc_src_set_fmt(struct device *dev, u32 fmt)
        cfg = fimc_read(ctx, EXYNOS_CIDMAPARAM);
        cfg &= ~EXYNOS_CIDMAPARAM_R_MODE_MASK;
 
-       if (fmt == DRM_FORMAT_NV12MT)
-               cfg |= EXYNOS_CIDMAPARAM_R_MODE_64X32;
-       else
-               cfg |= EXYNOS_CIDMAPARAM_R_MODE_LINEAR;
+       cfg |= EXYNOS_CIDMAPARAM_R_MODE_LINEAR;
 
        fimc_write(ctx, cfg, EXYNOS_CIDMAPARAM);
 
@@ -812,7 +807,6 @@ static int fimc_dst_set_fmt_order(struct fimc_context *ctx, u32 fmt)
                cfg |= EXYNOS_CIOCTRL_YCBCR_3PLANE;
                break;
        case DRM_FORMAT_NV12:
-       case DRM_FORMAT_NV12MT:
        case DRM_FORMAT_NV16:
                cfg |= EXYNOS_CIOCTRL_ORDER2P_LSB_CBCR;
                cfg |= EXYNOS_CIOCTRL_YCBCR_2PLANE;
@@ -867,7 +861,6 @@ static int fimc_dst_set_fmt(struct device *dev, u32 fmt)
                case DRM_FORMAT_YUV420:
                case DRM_FORMAT_YVU420:
                case DRM_FORMAT_NV12:
-               case DRM_FORMAT_NV12MT:
                case DRM_FORMAT_NV21:
                        cfg |= EXYNOS_CITRGFMT_OUTFORMAT_YCBCR420;
                        break;
@@ -883,10 +876,7 @@ static int fimc_dst_set_fmt(struct device *dev, u32 fmt)
        cfg = fimc_read(ctx, EXYNOS_CIDMAPARAM);
        cfg &= ~EXYNOS_CIDMAPARAM_W_MODE_MASK;
 
-       if (fmt == DRM_FORMAT_NV12MT)
-               cfg |= EXYNOS_CIDMAPARAM_W_MODE_64X32;
-       else
-               cfg |= EXYNOS_CIDMAPARAM_W_MODE_LINEAR;
+       cfg |= EXYNOS_CIDMAPARAM_W_MODE_LINEAR;
 
        fimc_write(ctx, cfg, EXYNOS_CIDMAPARAM);