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_gsc.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index 0261468c8019aaff655906b3a61ff52bc8ed5835..8040ed2a831f9a6f226baf8aee3ce00b213be8e6 100644 (file)
--- 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;