Commit c315fbfa authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Enable 10bpc + CCS on TGL+ 



TGL+ support 10bpc compressed scanout. Enable it.

v2: Set .depth=30 for all variants to match drm_fourcc.c
    Set clear color block size to 0x0

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240918144445.5716-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
parent 0ddae025

drivers/gpu/drm/i915/display/intel_fb.c

+36 −0
Original line number Diff line number Diff line
@@ -67,6 +67,18 @@ static const struct drm_format_info gen12_ccs_formats[] = { 
	{ .format = DRM_FORMAT_ABGR8888, .depth = 32, .num_planes = 2,

	  .char_per_block = { 4, 1 }, .block_w = { 1, 2 }, .block_h = { 1, 1 },

	  .hsub = 1, .vsub = 1, .has_alpha = true },

	{ .format = DRM_FORMAT_XRGB2101010, .depth = 30, .num_planes = 2,

	  .char_per_block = { 4, 1 }, .block_w = { 1, 2 }, .block_h = { 1, 1 },

	  .hsub = 1, .vsub = 1, },

	{ .format = DRM_FORMAT_XBGR2101010, .depth = 30, .num_planes = 2,

	  .char_per_block = { 4, 1 }, .block_w = { 1, 2 }, .block_h = { 1, 1 },

	  .hsub = 1, .vsub = 1, },

	{ .format = DRM_FORMAT_ARGB2101010, .depth = 30, .num_planes = 2,

	  .char_per_block = { 4, 1 }, .block_w = { 1, 2 }, .block_h = { 1, 1 },

	  .hsub = 1, .vsub = 1, .has_alpha = true },

	{ .format = DRM_FORMAT_ABGR2101010, .depth = 30, .num_planes = 2,

	  .char_per_block = { 4, 1 }, .block_w = { 1, 2 }, .block_h = { 1, 1 },

	  .hsub = 1, .vsub = 1, .has_alpha = true },

	{ .format = DRM_FORMAT_YUYV, .num_planes = 2,

	  .char_per_block = { 2, 1 }, .block_w = { 1, 2 }, .block_h = { 1, 1 },

	  .hsub = 2, .vsub = 1, .is_yuv = true },
@@ -113,6 +125,18 @@ static const struct drm_format_info gen12_ccs_cc_formats[] = { 
	{ .format = DRM_FORMAT_ABGR8888, .depth = 32, .num_planes = 3,

	  .char_per_block = { 4, 1, 0 }, .block_w = { 1, 2, 0 }, .block_h = { 1, 1, 0 },

	  .hsub = 1, .vsub = 1, .has_alpha = true },

	{ .format = DRM_FORMAT_XRGB2101010, .depth = 30, .num_planes = 3,

	  .char_per_block = { 4, 1, 0 }, .block_w = { 1, 2, 0 }, .block_h = { 1, 1, 0 },

	  .hsub = 1, .vsub = 1, },

	{ .format = DRM_FORMAT_XBGR2101010, .depth = 30, .num_planes = 3,

	  .char_per_block = { 4, 1, 0 }, .block_w = { 1, 2, 0 }, .block_h = { 1, 1, 0 },

	  .hsub = 1, .vsub = 1, },

	{ .format = DRM_FORMAT_ARGB2101010, .depth = 30, .num_planes = 3,

	  .char_per_block = { 4, 1, 0 }, .block_w = { 1, 2, 0 }, .block_h = { 1, 1, 0 },

	  .hsub = 1, .vsub = 1, .has_alpha = true },

	{ .format = DRM_FORMAT_ABGR2101010, .depth = 30, .num_planes = 3,

	  .char_per_block = { 4, 1, 0 }, .block_w = { 1, 2, 0 }, .block_h = { 1, 1, 0 },

	  .hsub = 1, .vsub = 1, .has_alpha = true },

};



static const struct drm_format_info gen12_flat_ccs_cc_formats[] = {
@@ -128,6 +152,18 @@ static const struct drm_format_info gen12_flat_ccs_cc_formats[] = { 
	{ .format = DRM_FORMAT_ABGR8888, .depth = 32, .num_planes = 2,

	  .char_per_block = { 4, 0 }, .block_w = { 1, 0 }, .block_h = { 1, 0 },

	  .hsub = 1, .vsub = 1, .has_alpha = true },

	{ .format = DRM_FORMAT_XRGB2101010, .depth = 30, .num_planes = 2,

	  .char_per_block = { 4, 0 }, .block_w = { 1, 0 }, .block_h = { 1, 0 },

	  .hsub = 1, .vsub = 1, },

	{ .format = DRM_FORMAT_XBGR2101010, .depth = 30, .num_planes = 2,

	  .char_per_block = { 4, 0 }, .block_w = { 1, 0 }, .block_h = { 1, 0 },

	  .hsub = 1, .vsub = 1, },

	{ .format = DRM_FORMAT_ARGB2101010, .depth = 30, .num_planes = 2,

	  .char_per_block = { 4, 0 }, .block_w = { 1, 0 }, .block_h = { 1, 0 },

	  .hsub = 1, .vsub = 1, .has_alpha = true },

	{ .format = DRM_FORMAT_ABGR2101010, .depth = 30, .num_planes = 2,

	  .char_per_block = { 4, 0 }, .block_w = { 1, 0 }, .block_h = { 1, 0 },

	  .hsub = 1, .vsub = 1, .has_alpha = true },

};



struct intel_modifier_desc {

drivers/gpu/drm/i915/display/skl_universal_plane.c

+4 −4
Original line number Diff line number Diff line
@@ -2343,6 +2343,10 @@ static bool gen12_plane_format_mod_supported(struct drm_plane *_plane, 
	case DRM_FORMAT_XBGR8888:

	case DRM_FORMAT_ARGB8888:

	case DRM_FORMAT_ABGR8888:

	case DRM_FORMAT_XRGB2101010:

	case DRM_FORMAT_XBGR2101010:

	case DRM_FORMAT_ARGB2101010:

	case DRM_FORMAT_ABGR2101010:

		if (intel_fb_is_ccs_modifier(modifier))

			return true;

		fallthrough;
@@ -2359,10 +2363,6 @@ static bool gen12_plane_format_mod_supported(struct drm_plane *_plane, 
			return true;

		fallthrough;

	case DRM_FORMAT_RGB565:

	case DRM_FORMAT_XRGB2101010:

	case DRM_FORMAT_XBGR2101010:

	case DRM_FORMAT_ARGB2101010:

	case DRM_FORMAT_ABGR2101010:

	case DRM_FORMAT_XVYU2101010:

	case DRM_FORMAT_C8:

	case DRM_FORMAT_XBGR16161616F: