Merge tag 'topic/drm-misc-2015-02-06' of git://anongit.freedesktop.org/drm-intel into drm-next

Flushing out my drm-misc queue with a few oddball things all over.

* tag 'topic/drm-misc-2015-02-06' of git://anongit.freedesktop.org/drm-intel:
  drm: Use static attribute groups for managing connector sysfs entries
  drm: remove DRM_FORMAT_NV12MT
  drm/modes: Print the mode status in human readable form
  drm/irq: Don't disable vblank interrupts when already disabled

4 files changed, 2 insertions, 21 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
index 835b6af00970..842d6b8dc3c4 100644
--- 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);
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index 0261468c8019..8040ed2a831f 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -542,9 +542,6 @@ static int gsc_src_set_fmt(struct device *dev, u32 fmt)
                 cfg |= (GSC_IN_CHROMA_ORDER_CBCR |
                         GSC_IN_YUV420_2P);
                 break;
-        case DRM_FORMAT_NV12MT:
-                cfg |= (GSC_IN_TILE_C_16x8 | GSC_IN_TILE_MODE);
-                break;
         default:
                 dev_err(ippdrv->dev, "inavlid target yuv order 0x%x.\n", fmt);
                 return -EINVAL;
@@ -809,9 +806,6 @@ static int gsc_dst_set_fmt(struct device *dev, u32 fmt)
                 cfg |= (GSC_OUT_CHROMA_ORDER_CBCR |
                         GSC_OUT_YUV420_2P);
                 break;
-        case DRM_FORMAT_NV12MT:
-                cfg |= (GSC_OUT_TILE_C_16x8 | GSC_OUT_TILE_MODE);
-                break;
         default:
                 dev_err(ippdrv->dev, "inavlid target yuv order 0x%x.\n", fmt);
                 return -EINVAL;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index 358cff67e5ce..2f43a3c4f7b7 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -23,7 +23,6 @@ static const uint32_t formats[] = {
         DRM_FORMAT_XRGB8888,
         DRM_FORMAT_ARGB8888,
         DRM_FORMAT_NV12,
-        DRM_FORMAT_NV12MT,
 };
 
 /*
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index ed44cd4f01f7..2fd2e5d46142 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -412,8 +412,6 @@ static void vp_video_buffer(struct mixer_context *ctx, int win)
         win_data = &ctx->win_data[win];
 
         switch (win_data->pixel_format) {
-        case DRM_FORMAT_NV12MT:
-                tiled_mode = true;
         case DRM_FORMAT_NV12:
                 crcb_mode = false;
                 buf_num = 2;