Revert "drm/fourcc: Add packed 10bit YUV 4:2:0 format"

This reverts commit 5cdee934f5b921d11abd1ccf3595873b5d705dc0.

diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
index 8537a41..eda832f 100644 (file)
--- a/drivers/gpu/drm/drm_fourcc.c
+++ b/drivers/gpu/drm/drm_fourcc.c
@@ -266,9 +266,6 @@ const struct drm_format_info *__drm_format_info(u32 format)
                  .num_planes = 3, .char_per_block = { 2, 2, 2 },
                  .block_w = { 1, 1, 1 }, .block_h = { 1, 1, 1 }, .hsub = 0,
                  .vsub = 0, .is_yuv = true },
-               { .format = DRM_FORMAT_P030,            .depth = 0,  .num_planes = 2,
-                 .char_per_block = { 4, 4, 0 }, .block_w = { 3, 0, 0 }, .block_h = { 1, 0, 0 },
-                 .hsub = 2, .vsub = 2, .is_yuv = true},
        };
 
        unsigned int i;

diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
index 57094b5..808c73c 100644 (file)
--- a/include/uapi/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
@@ -325,13 +325,6 @@ extern "C" {
 #define DRM_FORMAT_Q401                fourcc_code('Q', '4', '0', '1')
 
 /*
- * 2 plane YCbCr MSB aligned, 3 pixels packed into 4 bytes.
- * index 0 = Y plane, [31:0] x:Y2:Y1:Y0 2:10:10:10 little endian
- * index 1 = Cr:Cb plane, [63:0] x:Cr2:Cb2:Cr1:x:Cb1:Cr0:Cb0 [2:10:10:10:2:10:10:10] little endian
- */
-#define DRM_FORMAT_P030                fourcc_code('P', '0', '3', '0') /* 2x2 subsampled Cr:Cb plane 10 bits per channel packed */
-
-/*
  * 3 plane YCbCr
  * index 0: Y plane, [7:0] Y
  * index 1: Cb plane, [7:0] Cb
@@ -849,10 +842,6 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier)
  * and UV.  Some SAND-using hardware stores UV in a separate tiled
  * image from Y to reduce the column height, which is not supported
  * with these modifiers.
- *
- * The DRM_FORMAT_MOD_BROADCOM_SAND128_COL_HEIGHT modifier is also
- * supported for DRM_FORMAT_P030 where the columns remain as 128 bytes
- * wide, but as this is a 10 bpp format that translates to 96 pixels.
  */
 
 #define DRM_FORMAT_MOD_BROADCOM_SAND32_COL_HEIGHT(v) \