Extend BT2020 support in iCSC and fixes
Subsystems (3)
v4 cover Extend BT2020 support in iCSC and fixes
This series adds support for BT2020 YCbCr to RGB conversion using input CSC. This also fixes issues with BT601 and BT709 coefficients.
v2: Fixed Ville's review comments.
v3: Rebase.
v4: Rebase.
Uma Shankar (3):
drm/i915/icl: Handle YCbCr to RGB conversion for BT2020 case drm/i915/icl: Fix Y pre-offset for Full Range YCbCr drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709
drivers/gpu/drm/i915/display/intel_sprite.c | 55 +++++++++++++++------ 1 file changed, 41 insertions(+), 14 deletions(-)
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/3 drm/i915/icl: Handle YCbCr to RGB conversion for BT2020 case
Currently input csc for YCbCR to RGB conversion handles only BT601 and Bt709. Extending it to support BT2020 as well.
v2: Fixed the co-efficients for LR to FR conversion, as suggested by Ville.
v3: Fixed Y Pre-offset in case of Full Range YCbCr as suggested by Ville.
v4: Split the v2 and v3 changes.
v5: Rebase
--- drivers/gpu/drm/i915/display/intel_sprite.c | 24 +++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/gpu/drm/i915/display/intel_sprite.c +24 -0
@@ -444,6 +444,18 @@ icl_program_input_csc(struct intel_plane *plane, 0x9EF8, 0x7800, 0xABF8, 0x0, 0x7800, 0x7ED8, }, + /* + * BT.2020 full range YCbCr -> full range RGB + * The matrix required is : + * [1.000, 0.000, 1.474, + * 1.000, -0.1645, -0.5713, + * 1.000, 1.8814, 0.0000] + */ + [DRM_COLOR_YCBCR_BT2020] = { +0x7BC8 ,0x7800 ,0x0 , +0x8928 ,0x7800 ,0xAA88 , + 0x0, 0x7800, 0x7F10, + }, };/* Matrix for Limited Range to Full Range Conversion */
@@ -472,6 +484,18 @@ icl_program_input_csc(struct intel_plane *plane,0x8888 ,0x7918 ,0xADA8 , 0x0, 0x7918, 0x6870, }, +/* +* BT.2020 Limited range YCbCr -> full range RGB +* The matrix required is : +* [1.164, 0.000, 1.678, +* 1.164, -0.1873, -0.6504, +* 1.164, 2.1417, 0.0000] +*/ + [DRM_COLOR_YCBCR_BT2020] = { +0x7D70 ,0x7950 ,0x0 , +0x8A68 ,0x7950 ,0xAC00 , + 0x0, 0x7950, 0x6890, + }; };const u16 *csc;
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/3 drm/i915/icl: Fix Y pre-offset for Full Range YCbCr
In reply to Uma ShankarFixed Y Pre-offset in case of Full Range YCbCr.
v2: Rebase
--- drivers/gpu/drm/i915/display/intel_sprite.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_sprite.c +5 -2
@@ -516,8 +516,11 @@ icl_program_input_csc(struct intel_plane *plane,I915_WRITE_FW (PLANE_INPUT_CSC_PREOFF (pipe, plane_id,0 ),PREOFF_YUV_TO_RGB_HI ); -I915_WRITE_FW (PLANE_INPUT_CSC_PREOFF (pipe, plane_id,1 ), -PREOFF_YUV_TO_RGB_ME ); +if (plane_state->base.color_range ==DRM_COLOR_YCBCR_FULL_RANGE ) +I915_WRITE_FW (PLANE_INPUT_CSC_PREOFF (pipe, plane_id,1 ),0 ); +else +I915_WRITE_FW (PLANE_INPUT_CSC_PREOFF (pipe, plane_id,1 ), +PREOFF_YUV_TO_RGB_ME );I915_WRITE_FW (PLANE_INPUT_CSC_PREOFF (pipe, plane_id,2 ),PREOFF_YUV_TO_RGB_LO );I915_WRITE_FW (PLANE_INPUT_CSC_POSTOFF (pipe, plane_id,0 ),0x0 );
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 3/3 drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709
In reply to Uma ShankarInput CSC Co-efficients for BT601 and BT709 YCbCR to RGB conversion were slightly off. Fixed the same.
v2: Fixed the co-eficients as there was issue with reference matrix, spotted by Ville.
v3: Rebase
--- drivers/gpu/drm/i915/display/intel_sprite.c | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_sprite.c +12 -12
@@ -441,7 +441,7 @@ icl_program_input_csc(struct intel_plane *plane, */ [DRM_COLOR_YCBCR_BT709] = {0x7C98 ,0x7800 ,0x0 , -0x9EF8 ,0x7800 ,0xABF8 , +0x9EF8 ,0x7800 ,0xAC00 , 0x0, 0x7800, 0x7ED8, },/*
@@ -463,26 +463,26 @@ icl_program_input_csc(struct intel_plane *plane,/* * BT.601 Limted range YCbCr -> full range RGB * The matrix required is : -* [1.164384, 0.000, 1.596370, -* 1.138393, -0.382500, -0.794598, -* 1.138393, 1.971696, 0.0000] +* [1.164384, 0.000, 1.596027, +* 1.164384, -0.39175, -0.812813, +* 1.164384, 2.017232, 0.0000] */ [DRM_COLOR_YCBCR_BT601] = {0x7CC8 ,0x7950 ,0x0 , -0x8CB8 ,0x7918 ,0x9C40 , - 0x0, 0x7918, 0x7FC8, +0x8D00 ,0x7950 ,0x9C88 , + 0x0, 0x7950, 0x6810, },/* * BT.709 Limited range YCbCr -> full range RGB * The matrix required is : -* [1.164, 0.000, 1.833671, -* 1.138393, -0.213249, -0.532909, -* 1.138393, 2.112402, 0.0000] +* [1.164384, 0.000, 1.792741, +* 1.164384, -0.213249, -0.532909, +* 1.164384, 2.112402, 0.0000] */ [DRM_COLOR_YCBCR_BT709] = { -0x7EA8 ,0x7950 ,0x0 , -0x8888 ,0x7918 ,0xADA8 , - 0x0, 0x7918, 0x6870, +0x7E58 ,0x7950 ,0x0 , +0x8888 ,0x7950 ,0xADA8 , + 0x0, 0x7950, 0x6870, },/* * BT.2020 Limited range YCbCr -> full range RGB
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Extend BT2020 support in iCSC and fixes (rev4)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Extend BT2020 support in iCSC and fixes (rev4)
URL : https://patchwork.freedesktop.org/series/60480/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
AR drivers/gpu/drm/i915/built-in.a
CC [M] drivers/gpu/drm/i915/header_test_i915_active_types.o
CC [M] drivers/gpu/drm/i915/header_test_i915_debugfs.o
CC [M] drivers/gpu/drm/i915/header_test_i915_drv.o
CC [M] drivers/gpu/drm/i915/header_test_i915_fixed.o
CC [M] drivers/gpu/drm/i915/header_test_i915_gem_gtt.o
CC [M] drivers/gpu/drm/i915/header_test_i915_globals.o
CC [M] drivers/gpu/drm/i915/header_test_i915_irq.o
CC [M] drivers/gpu/drm/i915/header_test_i915_params.o
CC [M] drivers/gpu/drm/i915/header_test_i915_priolist_types.o
CC [M] drivers/gpu/drm/i915/header_test_i915_pvinfo.o
CC [M] drivers/gpu/drm/i915/header_test_i915_reg.o
CC [M] drivers/gpu/drm/i915/header_test_i915_scheduler_types.o
CC [M] drivers/gpu/drm/i915/header_test_i915_utils.o
CC [M] drivers/gpu/drm/i915/header_test_i915_vgpu.o
CC [M] drivers/gpu/drm/i915/header_test_intel_csr.o
CC [M] drivers/gpu/drm/i915/header_test_intel_drv.o
CC [M] drivers/gpu/drm/i915/header_test_intel_guc_ct.o
CC [M] drivers/gpu/drm/i915/header_test_intel_guc_fwif.o
CC [M] drivers/gpu/drm/i915/header_test_intel_guc_reg.o
CC [M] drivers/gpu/drm/i915/header_test_intel_gvt.o
CC [M] drivers/gpu/drm/i915/header_test_intel_pm.o
CC [M] drivers/gpu/drm/i915/header_test_intel_runtime_pm.o
CC [M] drivers/gpu/drm/i915/header_test_intel_sideband.o
CC [M] drivers/gpu/drm/i915/header_test_intel_uc_fw.o
CC [M] drivers/gpu/drm/i915/header_test_intel_uncore.o
CC [M] drivers/gpu/drm/i915/header_test_intel_wakeref.o
CC [M] drivers/gpu/drm/i915/display/intel_sprite.o
drivers/gpu/drm/i915/display/intel_sprite.c: In function ‘icl_program_input_csc’:
drivers/gpu/drm/i915/display/intel_sprite.c:498:4: error: expected ‘}’ before ‘;’ token
};
^scripts/Makefile.build:278: recipe for target 'drivers/gpu/drm/i915/display/intel_sprite.o' failed make[4]: *** [drivers/gpu/drm/i915/display/intel_sprite.o] Error 1 scripts/Makefile.build:489: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:489: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:489: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1071: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx