summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNanley Chery <nanley.g.chery@intel.com>2021-12-06 09:00:32 -0500
committerMarge Bot <emma+marge@anholt.net>2021-12-07 23:31:23 +0000
commit0e075227d8800a8c9fbedf49e4253146f751df4e (patch)
treeb42e41b2aca9df54ef4bbf2c652ad05c9b19e814
parent5439e3c4128283b3bc5cf9c660f7f4ad306d7bd3 (diff)
intel/isl: Restore CCS_E support for YUYV and UYVY
These formats are used when creating surfaces with the I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS modifier. Makes iris pass the out-of-tree piglit test, ext_image_dma_buf_import-intel-modifiers. Fixes: 1433fe7860a ("intel/isl: Unify fmt checks in isl_surf_supports_ccs") Reviewed-by: Tapani Pälli <tapani.palli@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14082>
-rw-r--r--src/intel/isl/isl_format.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c
index 9b4359fa24b..e69e0d6e9bd 100644
--- a/src/intel/isl/isl_format.c
+++ b/src/intel/isl/isl_format.c
@@ -261,7 +261,7 @@ static const struct surface_format_info format_info[] = {
SF( 90, x, x, x, x, x, x, x, x, x, x, x, I8_SINT)
SF( 45, 45, x, x, x, x, x, x, x, x, x, x, DXT1_RGB_SRGB)
SF( Y, Y, x, x, x, x, x, x, x, x, x, x, R1_UNORM)
- SF( Y, Y, x, Y, Y, x, x, x, 60, x, x, x, YCRCB_NORMAL)
+ SF( Y, Y, x, Y, Y, x, x, x, 60, x, x, 120, YCRCB_NORMAL)
SF( Y, Y, x, Y, Y, x, x, x, 60, x, x, x, YCRCB_SWAPUVY)
SF( 45, 45, x, x, x, x, x, x, x, x, x, x, P2_UNORM_PALETTE0)
SF( 45, 45, x, x, x, x, x, x, x, x, x, x, P2_UNORM_PALETTE1)
@@ -275,7 +275,7 @@ static const struct surface_format_info format_info[] = {
SF( Y, Y, x, x, x, x, x, x, x, x, x, x, BC3_UNORM_SRGB)
SF( Y, x, x, x, x, x, x, x, x, x, x, x, MONO8)
SF( Y, Y, x, x, Y, x, x, x, 60, x, x, x, YCRCB_SWAPUV)
- SF( Y, Y, x, x, Y, x, x, x, 60, x, x, x, YCRCB_SWAPY)
+ SF( Y, Y, x, x, Y, x, x, x, 60, x, x, 120, YCRCB_SWAPY)
SF( Y, Y, x, x, x, x, x, x, x, x, x, x, DXT1_RGB)
/* smpl filt shad CK RT AB VB SO color TW TR ccs_e */
SF( Y, Y, x, x, x, x, x, x, x, x, x, x, FXT1)