[PATCH 2/2] yuv422 - rough patch for 10/12/16 bit packed support
Vidya Srinivas
vidya.srinivas at intel.com
Mon Jan 15 09:28:25 UTC 2018
Signed-off-by: Vidya Srinivas <vidya.srinivas at intel.com>
---
drivers/gpu/drm/drm_fourcc.c | 3 +++
drivers/gpu/drm/i915/i915_reg.h | 3 +++
drivers/gpu/drm/i915/intel_display.c | 18 ++++++++++++++++++
drivers/gpu/drm/i915/intel_sprite.c | 11 ++++++++++-
include/uapi/drm/drm_fourcc.h | 3 +++
5 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
index cf70e79..0468203 100644
--- a/drivers/gpu/drm/drm_fourcc.c
+++ b/drivers/gpu/drm/drm_fourcc.c
@@ -176,6 +176,9 @@ const struct drm_format_info *__drm_format_info(u32 format)
{ .format = DRM_FORMAT_Y410, .depth = 0, .num_planes = 1, .cpp = { 4, 0, 0 }, .hsub = 1, .vsub = 1 },
{ .format = DRM_FORMAT_Y412, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 1, .vsub = 1 },
{ .format = DRM_FORMAT_Y416, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 1, .vsub = 1 },
+ { .format = DRM_FORMAT_V210, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 },
+ { .format = DRM_FORMAT_V212, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 },
+ { .format = DRM_FORMAT_V216, .depth = 0, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 2, .vsub = 1 },
};
unsigned int i;
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 4e11f00..08c9da5 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -6382,6 +6382,9 @@ enum {
#define PLANE_CTL_FORMAT_Y410 (7 << 23)
#define PLANE_CTL_FORMAT_Y412 (9 << 23)
#define PLANE_CTL_FORMAT_Y416 (0xB << 23)
+#define PLANE_CTL_FORMAT_V210 (1 << 23)
+#define PLANE_CTL_FORMAT_V212 (3 << 23)
+#define PLANE_CTL_FORMAT_V216 (5 << 23)
#define _PLANE_CTL_1_B 0x71180
#define _PLANE_CTL_2_B 0x71280
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5fdeb5e..8a522b7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -122,6 +122,9 @@ static const uint32_t gen11_primary_formats[] = {
DRM_FORMAT_Y410,
DRM_FORMAT_Y412,
DRM_FORMAT_Y416,
+ DRM_FORMAT_V210,
+ DRM_FORMAT_V212,
+ DRM_FORMAT_V216,
};
/* Cursor formats */
@@ -3427,6 +3430,12 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)
return PLANE_CTL_FORMAT_Y410;
case DRM_FORMAT_Y416:
return PLANE_CTL_FORMAT_Y410;
+ case DRM_FORMAT_V210:
+ return PLANE_CTL_FORMAT_V210 | PLANE_CTL_YUV422_YUYV;
+ case DRM_FORMAT_V212:
+ return PLANE_CTL_FORMAT_V212 | PLANE_CTL_YUV422_YUYV;
+ case DRM_FORMAT_V216:
+ return PLANE_CTL_FORMAT_V216 | PLANE_CTL_YUV422_YUYV;
default:
MISSING_CASE(pixel_format);
}
@@ -4804,6 +4813,9 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
case DRM_FORMAT_Y410:
case DRM_FORMAT_Y412:
case DRM_FORMAT_Y416:
+ case DRM_FORMAT_V210:
+ case DRM_FORMAT_V212:
+ case DRM_FORMAT_V216:
break;
default:
DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",
@@ -13045,6 +13057,9 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)
case DRM_FORMAT_YVYU:
case DRM_FORMAT_UYVY:
case DRM_FORMAT_VYUY:
+ case DRM_FORMAT_V210:
+ case DRM_FORMAT_V212:
+ case DRM_FORMAT_V216:
if (modifier == I915_FORMAT_MOD_Yf_TILED)
return true;
/* fall through */
@@ -14098,6 +14113,9 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
case DRM_FORMAT_UYVY:
case DRM_FORMAT_YVYU:
case DRM_FORMAT_VYUY:
+ case DRM_FORMAT_V210:
+ case DRM_FORMAT_V212:
+ case DRM_FORMAT_V216:
if (INTEL_GEN(dev_priv) < 5 && !IS_G4X(dev_priv)) {
DRM_DEBUG_KMS("unsupported pixel format: %s\n",
drm_get_format_name(mode_cmd->pixel_format, &format_name));
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 9ac79c0..1521794 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -49,6 +49,9 @@ format_is_yuv(uint32_t format)
case DRM_FORMAT_UYVY:
case DRM_FORMAT_VYUY:
case DRM_FORMAT_YVYU:
+ case DRM_FORMAT_V210:
+ case DRM_FORMAT_V212:
+ case DRM_FORMAT_V216:
return true;
default:
return false;
@@ -1180,6 +1183,9 @@ static uint32_t gen11_plane_formats[] = {
DRM_FORMAT_Y410,
DRM_FORMAT_Y412,
DRM_FORMAT_Y416,
+ DRM_FORMAT_V210,
+ DRM_FORMAT_V212,
+ DRM_FORMAT_V216,
};
static bool g4x_sprite_plane_format_mod_supported(struct drm_plane *plane,
@@ -1193,7 +1199,7 @@ static bool g4x_sprite_plane_format_mod_supported(struct drm_plane *plane,
case DRM_FORMAT_YVYU:
case DRM_FORMAT_UYVY:
case DRM_FORMAT_VYUY:
- if (modifier == DRM_FORMAT_MOD_LINEAR ||
+ if (modifier == DRM_FORMAT_MOD_LINEAR ||
modifier == I915_FORMAT_MOD_X_TILED)
return true;
/* fall through */
@@ -1244,6 +1250,9 @@ static bool skl_sprite_plane_format_mod_supported(struct drm_plane *plane,
case DRM_FORMAT_YVYU:
case DRM_FORMAT_UYVY:
case DRM_FORMAT_VYUY:
+ case DRM_FORMAT_V210:
+ case DRM_FORMAT_V212:
+ case DRM_FORMAT_V216:
if (modifier == I915_FORMAT_MOD_Yf_TILED)
return true;
/* fall through */
diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
index 5009c77..ad2be237 100644
--- a/include/uapi/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
@@ -117,6 +117,9 @@ extern "C" {
#define DRM_FORMAT_Y412 fourcc_code('Y', '4', '1', '2') /* [64:0] A:V:Y:U 12:12:12:12 little endian */
#define DRM_FORMAT_Y416 fourcc_code('Y', '4', '1', '6') /* [64:0] A:V:Y:U 16:16:16:16 little endian */
+#define DRM_FORMAT_Y210 fourcc_code('V', '2', '1', '0') /* [31:0] A:V:Y:U 2:10:10:10 little endian */
+#define DRM_FORMAT_Y212 fourcc_code('V', '2', '1', '2') /* [64:0] A:V:Y:U 12:12:12:12 little endian */
+#define DRM_FORMAT_Y216 fourcc_code('V', '2', '1', '6') /* [64:0] A:V:Y:U 16:16:16:16 little endian */
/*
* 2 plane RGB + A
--
2.7.4
More information about the Intel-gfx-trybot
mailing list