This series doesn't take into account the inactive color pipeline work
I've been doing for plane color pipeline. My plan is to apply a similar
approach post-blend when we agree that the plane series is correct.
- Patch 1-13 are essentially Ariel&Nicolas work for DRM post-blend
colorop support where I added patch 10 for tracking plane vs CRTC
colorop changes.
- Patch 14 completes deprecation of CRTC color mgmt properties if
post-blend color pipeline is enabled by hiding them;
- Patch 15 applies the same bug fix logic as Robert did to guard plane
client cap[4];
- Patch 16-20 add support to post-blend colorop API on AMD driver based
on plane colorop work.
This is one example of `drm_info` output on Steam Deck with
SteamOS/gamescope implementation and this kernel work:
├───CRTCs
│ ├───CRTC 0
│ │ ├───Object ID: 399
[...]
│ │ └───"COLOR_PIPELINE" (atomic): enum {Bypass, Color Pipeline 400} =
Color Pipeline 400
│ │ ├───Bypass
│ │ └───Color Pipeline 400
│ │ ├───Color Operation 400
│ │ │ └───Properties
│ │ │ ├───"TYPE" (immutable): enum {1D Curve, 1D LUT, 3x4
Matrix, Multiplier, 3D LUT, Fixed Matrix} = 3x4 Matrix
│ │ │ ├───"BYPASS" (atomic): range [0, 1] = 1
│ │ │ ├───"NEXT" (atomic, immutable): object colorop = 405
│ │ │ └───"DATA" (atomic): blob = 0
│ │ ├───Color Operation 405
│ │ │ └───Properties
│ │ │ ├───"TYPE" (immutable): enum {1D Curve, 1D LUT, 3x4
Matrix, Multiplier, 3D LUT, Fixed Matrix} = 1D Curve
│ │ │ ├───"BYPASS" (atomic): range [0, 1] = 0
│ │ │ ├───"NEXT" (atomic, immutable): object colorop = 410
│ │ │ └───"CURVE_1D_TYPE" (atomic): enum {sRGB Inverse
EOTF, PQ 125 Inverse EOTF, BT.2020 OETF, Gamma 2.2 Inverse, Gamma 2.4 Inverse, Gamma 2.6
Inverse} = PQ 125 Inverse EOTF
│ │ └───Color Operation 410
│ │ └───Properties
│ │ ├───"TYPE" (immutable): enum {1D Curve, 1D LUT, 3x4
Matrix, Multiplier, 3D LUT, Fixed Matrix} = 1D LUT
│ │ ├───"BYPASS" (atomic): range [0, 1] = 1
│ │ ├───"NEXT" (atomic, immutable): object colorop = 0
│ │ ├───"SIZE" (atomic, immutable): range [0,
UINT32_MAX] = 4096
│ │ ├───"LUT1D_INTERPOLATION": enum {Linear} = Linear
│ │ └───"DATA" (atomic): blob = 0
[...]
├───Plane 3
│ ├───Object ID: 218
[...]
│ └───Properties
│ ├───"type" (immutable): enum {Overlay, Primary, Cursor} = Primary
│ ├───"FB_ID" (atomic): object framebuffer = 513
│ │ ├───Object ID: 513
[...]
│ └───"COLOR_PIPELINE" (atomic): enum {Bypass, Color Pipeline 224} =
Color Pipeline 224
│ ├───Bypass
│ └───Color Pipeline 224
│ ├───Color Operation 224
│ │ └───Properties
│ │ ├───"TYPE" (immutable): enum {1D Curve, 1D LUT,
3x4 Matrix, Multiplier, 3D LUT, Fixed Matrix} = Fixed Matrix
│ │ ├───"BYPASS" (atomic): range [0, 1] = 1
│ │ ├───"NEXT" (atomic, immutable): object colorop =
229
│ │ └───"FIXED_MATRIX_TYPE" (atomic): enum {YCbCr 601
Full to RGB, YCbCr 601 Limited to RGB, YCbCr 709 Full to RGB, YCbCr 709 Limited to RGB,
YCbCr 2020 NC Full to RGB, YCbCr 2020 NC Limited to RGB} = YCbCr 601 Full to RGB
│ ├───Color Operation 229
│ │ └───Properties
│ │ ├───"TYPE" (immutable): enum {1D Curve, 1D LUT,
3x4 Matrix, Multiplier, 3D LUT, Fixed Matrix} = 1D Curve
│ │ ├───"BYPASS" (atomic): range [0, 1] = 0
│ │ ├───"NEXT" (atomic, immutable): object colorop =
234
│ │ └───"CURVE_1D_TYPE" (atomic): enum {sRGB EOTF, PQ
125 EOTF, BT.2020 Inverse OETF, Gamma 2.2, Gamma 2.4, Gamma 2.6} = sRGB EOTF
│ ├───Color Operation 234
│ │ └───Properties
│ │ ├───"TYPE" (immutable): enum {1D Curve, 1D LUT,
3x4 Matrix, Multiplier, 3D LUT, Fixed Matrix} = Multiplier
│ │ ├───"BYPASS" (atomic): range [0, 1] = 0
│ │ ├───"NEXT" (atomic, immutable): object colorop =
239
│ │ └───"MULTIPLIER" (atomic): range [0, UINT64_MAX] =
4294967296
│ ├───Color Operation 239
│ │ └───Properties
│ │ ├───"TYPE" (immutable): enum {1D Curve, 1D LUT,
3x4 Matrix, Multiplier, 3D LUT, Fixed Matrix} = 3x4 Matrix
│ │ ├───"BYPASS" (atomic): range [0, 1] = 1
│ │ ├───"NEXT" (atomic, immutable): object colorop =
244
│ │ └───"DATA" (atomic): blob = 0
│ ├───Color Operation 244
│ │ └───Properties
│ │ ├───"TYPE" (immutable): enum {1D Curve, 1D LUT,
3x4 Matrix, Multiplier, 3D LUT, Fixed Matrix} = 1D Curve
│ │ ├───"BYPASS" (atomic): range [0, 1] = 0
│ │ ├───"NEXT" (atomic, immutable): object colorop =
249
│ │ └───"CURVE_1D_TYPE" (atomic): enum {sRGB Inverse
EOTF, PQ 125 Inverse EOTF, BT.2020 OETF, Gamma 2.2 Inverse, Gamma 2.4 Inverse, Gamma 2.6
Inverse} = sRGB Inverse EOTF
│ ├───Color Operation 249
│ │ └───Properties
│ │ ├───"TYPE" (immutable): enum {1D Curve, 1D LUT,
3x4 Matrix, Multiplier, 3D LUT, Fixed Matrix} = 1D LUT
│ │ ├───"BYPASS" (atomic): range [0, 1] = 0
│ │ ├───"NEXT" (atomic, immutable): object colorop =
256
│ │ ├───"SIZE" (atomic, immutable): range [0,
UINT32_MAX] = 4096
│ │ ├───"LUT1D_INTERPOLATION": enum {Linear} = Linear
│ │ └───"DATA" (atomic): blob = 528
│ ├───Color Operation 256
│ │ └───Properties
│ │ ├───"TYPE" (immutable): enum {1D Curve, 1D LUT,
3x4 Matrix, Multiplier, 3D LUT, Fixed Matrix} = 3D LUT
│ │ ├───"BYPASS" (atomic): range [0, 1] = 0
│ │ ├───"NEXT" (atomic, immutable): object colorop =
263
│ │ ├───"SIZE" (atomic, immutable): range [0,
UINT32_MAX] = 17
│ │ ├───"LUT3D_INTERPOLATION": enum {Tetrahedral} =
Tetrahedral
│ │ └───"DATA" (atomic): blob = 529
│ ├───Color Operation 263
│ │ └───Properties
│ │ ├───"TYPE" (immutable): enum {1D Curve, 1D LUT,
3x4 Matrix, Multiplier, 3D LUT, Fixed Matrix} = 1D Curve
│ │ ├───"BYPASS" (atomic): range [0, 1] = 0
│ │ ├───"NEXT" (atomic, immutable): object colorop =
268
│ │ └───"CURVE_1D_TYPE" (atomic): enum {sRGB EOTF, PQ
125 EOTF, BT.2020 Inverse OETF, Gamma 2.2, Gamma 2.4, Gamma 2.6} = PQ 125 EOTF
│ └───Color Operation 268
│ └───Properties
│ ├───"TYPE" (immutable): enum {1D Curve, 1D LUT,
3x4 Matrix, Multiplier, 3D LUT, Fixed Matrix} = 1D LUT
│ ├───"BYPASS" (atomic): range [0, 1] = 1
│ ├───"NEXT" (atomic, immutable): object colorop = 0
│ ├───"SIZE" (atomic, immutable): range [0,
UINT32_MAX] = 4096
│ ├───"LUT1D_INTERPOLATION": enum {Linear} = Linear
│ └───"DATA" (atomic): blob = 0
FWIW, here is the `drm_info` diff:
diff --git a/drm_info.h b/drm_info.h
index e61fda7..f7f2017 100644
--- a/drm_info.h
+++ b/drm_info.h
@@ -21,5 +21,6 @@ enum {
/* Remove after updating libdrm */
#define DRM_MODE_OBJECT_COLOROP 0xfafafafa
#define DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE 7
+#define DRM_CLIENT_CAP_CRTC_COLOR_PIPELINE 8
#endif
diff --git a/json.c b/json.c
index c9f8c72..b2c306b 100644
--- a/json.c
+++ b/json.c
@@ -29,6 +29,7 @@ static const struct {
{ "WRITEBACK_CONNECTORS", DRM_CLIENT_CAP_WRITEBACK_CONNECTORS },
{ "CURSOR_PLANE_HOTSPOT", DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT },
{ "PLANE_COLOR_PIPELINE", DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE },
+ { "CRTC_COLOR_PIPELINE", DRM_CLIENT_CAP_CRTC_COLOR_PIPELINE },
};
[1] https://github.com/ValveSoftware/gamescope/pull/2113
[2]
https://lore.kernel.org/dri-devel/[email protected]/
[3]
https://lore.kernel.org/dri-devel/20251223-mtk-post-blend-color-pipeline-v3-0-7d969f9a3...@collabora.com/
[4]
https://lore.kernel.org/dri-devel/[email protected]/
Let me know your thoughts!
Melissa
Ariel D'Alessandro (2):
drm: Add helper to extract a 3x4 matrix from any CTM matrix dimensions
drm: Add helper to extract a LUT entry from either 16-bit or 32-bit
LUT
Melissa Wen (8):
drm/colorop: distinguish whether a colorop belongs to a plane or a
CRTC
drm/drm_mode_object: hide deprecated CRTC color mgmt props if colorop
is set
drm/drm_ioctl: guard DRM_CLIENT_CAP_CRTC_COLOR_PIPELINE
drm/amd/display: add support to post-blend CTM colorop
drm/amd/display: add support to post-blend 1D-Curve colorop
drm/amd/display: add support to post-blend 1D-LUT colorop
drm/amd/display: move CRTC CTM color mgmt prop to check helper
drm/amd/display: enable post-blend colorop properties
Nícolas F. R. A. Prado (10):
drm/crtc: Add color pipeline to CRTC state
drm/colorop: Allow parenting colorop to CRTC
drm: Factor out common color_pipeline property initialization code
drm/crtc: Add COLOR_PIPELINE property
drm: Introduce DRM_CLIENT_CAP_CRTC_COLOR_PIPELINE
drm/atomic: Pass crtc_color_pipeline client cap to atomic check
drm/atomic: Print the color pipeline as part of the CRTC state print
drm/colorop: Factor out common paths from colorops helpers
drm/colorop: Introduce colorop helpers for crtc
drm/crtc: Track crtc color pipeline client cap in drm_crtc_state
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 3 +
.../amd/display/amdgpu_dm/amdgpu_dm_color.c | 250 +++++++++++++---
.../amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 76 +++++
.../amd/display/amdgpu_dm/amdgpu_dm_colorop.h | 2 +
.../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 42 +++
drivers/gpu/drm/drm_atomic.c | 9 +-
drivers/gpu/drm/drm_atomic_uapi.c | 97 +++++-
drivers/gpu/drm/drm_colorop.c | 282 ++++++++++++++----
drivers/gpu/drm/drm_connector.c | 1 +
drivers/gpu/drm/drm_crtc.c | 31 ++
drivers/gpu/drm/drm_crtc_internal.h | 1 +
drivers/gpu/drm/drm_ioctl.c | 20 ++
drivers/gpu/drm/drm_mode_object.c | 18 ++
drivers/gpu/drm/drm_plane.c | 34 +--
drivers/gpu/drm/drm_property.c | 44 +++
include/drm/drm_atomic.h | 20 ++
include/drm/drm_atomic_uapi.h | 2 +
include/drm/drm_color_mgmt.h | 61 ++++
include/drm/drm_colorop.h | 32 +-
include/drm/drm_crtc.h | 27 ++
include/drm/drm_file.h | 7 +
include/drm/drm_property.h | 5 +
include/uapi/drm/drm.h | 19 ++
23 files changed, 939 insertions(+), 144 deletions(-)
