Re: [PATCH v6 00/10] YUV conversion colorop with amdgpu and VKMS

[Harry Wentland <harry.wentland@amd.com>]

This series has been merged to drm-misc-next.

Corresponding IGT tests have been merged to the upstream IGT repo.

Harry

On 2026-08-14 17:18, Harry Wentland wrote:
> When we merged the drm_plane color pipeline API the major gap
> that existed was the lack of a YUV to RGB conversion colorop.
> We deprecated any legacy drm_plane color properties, which
> means that the COLOR_RANGE and COLOR_ENCODING properties can't
> be used with the COLOR_PIPELINE property on a drm_plane. In
> practice this means that we can't use a COLOR_PIPELINE on
> YCbCr encoded framebuffers.
> 
> This patchset expands on the Fixed Matrix colorop proposed by Chaitanya
> and adds limited range variants of the YCbCr to RGB conversions.
> 
> His full patchset can be found at
> https://patchwork.freedesktop.org/patch/709860
> 
> This code has been tested with IGT and an experimental KWin branch.
> 
> All patches are now reviewed and tested. We have a Weston and
> KWin implementation. IGT patches are missing one review. I
> deem these patches ready to merge once the last IGT patch review
> comes in.
> 
> IGT branch:
> https://gitlab.freedesktop.org/hwentland/igt-gpu-tools/-/tree/yuv-fm-colorop
> 
> KWin branch used for testing:
> https://invent.kde.org/hwentlan/kwin/-/tree/yuv-fm-colorop
> 
> The kernel branch containing these changes, based on drm-misc-next
> can be found at:
> https://gitlab.freedesktop.org/hwentland/linux/-/tree/yuv-fm-colorop
> 
> Further background on this work can be found at:
> https://hwentland.github.io/2026/03/10/plane-color-pipeline-csc-3d-lut-kwin.html
> 
> v6:
>  - Fix fill_plane_color_attributes build failure in Patch 8 when
>    building with KUNIT (Robert)
> 
> v5:
>  - Drop new VKMS kunit tests for conversion matrices
>  - Added script to show how VKMS kunit test values are computed (Pekka)
>  - Removed fixed-matrix enums for "YCbCr limtied to full" and
>    "RGB709 to RGB2020" as they're currently unused by userspace (Robert)
> 
> v4:
>  - Specify matrix entries in docs (Pekka)
>  - Squash limited-range enums into "Add FM" patch (Robert)
>  - Don't reject RGB planes with fixed matrix in VKMS as
>    we don't want or need to make a colorop dependent on
>    the framebuffer's pixel format. (Robert)
>  - Fix conversion matrices in VKMS and implement kunit
>    tests (discovered while documenting the matrices)
> 
> v3:
> - base on Chaitanya's updated patch and rename code accordingly
>   to Fixed_Matrix instead of CSC Fixed-Function
> 
> v2:
> - use Chaitanya's CSC_FF block for named matrices
> 
> Cc: Alex Hung <alex.hung@amd.com>
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> Cc: Uma Shankar <uma.shankar@intel.com>
> Cc: Louis Chauvet <louis.chauvet@bootlin.com>
> Cc: Melissa Wen <mwen@igalia.com>
> Cc: Simon Ser <contact@emersion.fr>
> Cc: Robert Mader <robert.mader@collabora.com>
> 
> Chaitanya Kumar Borah (1):
>   drm/colorop: Add DRM_COLOROP_FIXED_MATRIX
> 
> Harry Wentland (9):
>   drm/vkms: Fix limited-range YCbCr to RGB conversion scaling
>   drm/vkms: Add fixed matrix colorop to color pipeline
>   drm/vkms: Add atomic check and matrix handling for fixed matrix
>     colorop
>   drm/amd/display: Add fixed matrix colorop to color pipeline
>   drm/amd/display: Implement fixed matrix colorop color space mapping
>   drm/amd/display: Use GAMCOR for first TF if YUV conversion is needed
>   drm/amd/display: Check actual state during commit_tail
>   drm/amd/display: Set color_space to plane_infos
>   drm/amd/display: Force GAMCOR for subsampled surfaces with
>     PQ/Gamma22/HLG
> 
>  .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |  14 +-
>  .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h |   7 +-
>  .../amd/display/amdgpu_dm/amdgpu_dm_color.c   |  85 +++++++++++-
>  .../amd/display/amdgpu_dm/amdgpu_dm_colorop.c |  27 +++-
>  .../amd/display/amdgpu_dm/amdgpu_dm_colorop.h |   1 +
>  .../display/amdgpu_dm/tests/amdgpu_dm_test.c  |  16 +--
>  .../amd/display/modules/color/color_gamma.c   |   3 +-
>  drivers/gpu/drm/drm_atomic.c                  |   4 +
>  drivers/gpu/drm/drm_atomic_uapi.c             |   7 +
>  drivers/gpu/drm/drm_colorop.c                 | 107 +++++++++++++++
>  .../gpu/drm/vkms/tests/gen_yuv_conversion.py  |  87 ++++++++++++
>  drivers/gpu/drm/vkms/tests/vkms_format_test.c |  40 +++---
>  drivers/gpu/drm/vkms/vkms_colorop.c           |  66 ++++++---
>  drivers/gpu/drm/vkms/vkms_composer.c          |   6 +
>  drivers/gpu/drm/vkms/vkms_formats.c           |  64 ++++++---
>  drivers/gpu/drm/vkms/vkms_formats.h           |   2 +-
>  drivers/gpu/drm/vkms/vkms_plane.c             |  55 +++++++-
>  include/drm/drm_colorop.h                     | 127 ++++++++++++++++++
>  include/uapi/drm/drm_mode.h                   |  12 ++
>  19 files changed, 651 insertions(+), 79 deletions(-)
>  create mode 100755 drivers/gpu/drm/vkms/tests/gen_yuv_conversion.py
> 
> --
> 2.55.0
>