From: Melissa Wen <mwen@igalia.com>
To: amd-gfx@lists.freedesktop.org,
Harry Wentland <harry.wentland@amd.com>,
Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
sunpeng.li@amd.com, Alex Deucher <alexander.deucher@amd.com>,
dri-devel@lists.freedesktop.org, airlied@gmail.com,
brian.starkey@arm.com, christian.koenig@amd.com, daniel@ffwll.ch,
liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com,
mripard@kernel.org, tzimmermann@suse.de, Xinhui.Pan@amd.com
Cc: Sebastian Wick <sebastian.wick@redhat.com>,
Pekka Paalanen <pekka.paalanen@collabora.com>,
Shashank Sharma <Shashank.Sharma@amd.com>,
Alex Hung <alex.hung@amd.com>, Simon Ser <contact@emersion.fr>,
Xaver Hugl <xaver.hugl@gmail.com>,
kernel-dev@igalia.com,
Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>,
Joshua Ashton <joshua@froggi.es>,
sungjoon.kim@amd.com
Subject: [PATCH v4 00/32] drm/amd/display: add AMD driver-specific properties for color mgmt
Date: Thu, 5 Oct 2023 16:14:55 -0100 [thread overview]
Message-ID: <20231005171527.203657-1-mwen@igalia.com> (raw)
Hello,
Just another iteration for AMD driver-specific color properties.
Basically, addressing comments from the previous version.
Recap: this series extends the current KMS color management API with AMD
driver-specific properties to enhance the color management support on
AMD Steam Deck. The key additions to the color pipeline include:
- plane degamma LUT and pre-defined TF;
- plane HDR multiplier;
- plane CTM 3x4;
- plane shaper LUT and pre-defined TF;
- plane 3D LUT;
- plane blend LUT and pre-defined TF;
- CRTC gamma pre-defined TF;
You can find the AMD HW color capabilities documented here:
https://dri.freedesktop.org/docs/drm/gpu/amdgpu/display/display-manager.html#color-management-properties
The userspace case is Gamescope[1], the compositor for SteamOS.
Gamescope has already adopted AMD driver-specific properties to
implement comprehensive color management support, including gamut
mapping, HDR rendering, SDR on HDR, HDR on SDR. Using these features in
the SteamOS 3.5[2] users can expect a significantly enhanced visual
experience.
You can find a brief overview of the Steam Deck color pipeline here:
https://github.com/ValveSoftware/gamescope/blob/master/src/docs/Steam%20Deck%20Display%20Pipeline.png
Changes from:
[RFC] https://lore.kernel.org/dri-devel/20230423141051.702990-1-mwen@igalia.com
- Remove KConfig and guard properties with `AMD_PRIVATE_COLOR`;
- Remove properties for post-blending/CRTC shaper TF+LUT and 3D LUT;
- Use color caps to improve the support of pre-defined curve;
[v1] https://lore.kernel.org/dri-devel/20230523221520.3115570-1-mwen@igalia.com
- Replace DRM_ by AMDGPU_ prefix for transfer function (TF) enum;
- Explicitly define EOTFs and inverse EOTFs and set props accordingly;
- Document pre-defined transfer functions;
- Remove HLG transfer function from supported TFs;
- Remove misleading comments;
- Remove post-blending shaper TF+LUT and 3D LUT support;
- Move driver-specific property operations from amdgpu_display.c to
amdgpu_dm_color.c;
- Reset planes if any color props change;
- Add plane CTM 3x4 support;
- Removed two DC fixes already applied upstream;
[v2] https://lore.kernel.org/dri-devel/20230810160314.48225-1-mwen@igalia.com
- Many documentation fixes: BT.709 OETF, description of sRGB and pure
power functions, TF+1D LUT behavior;
- Rename CTM2 to CTM 3x4 and fix misleading comment about DC gamut remap;
- Squash `Linear` and `Unity` TF in `Identity`;
- Remove the `MPC gamut remap` patch already applied upstream[3];
- Remove outdated delta segmentation fix;
- Nits/small fixes;
[v3] https://lore.kernel.org/amd-gfx/20230925194932.1329483-1-mwen@igalia.com
- Add table to describe value range in linear and non-linear forms
- Comment the PQ TF need after HDR multiplier
- Advertise the 3D LUT size as the size of a single-dimension (read-only)
- remove function to check expected size from 3DLUT caps
- cleanup comments
It's worth noting that driver-specific properties are guarded by
`AMD_PRIVATE_COLOR`. So, finally, this is the color management API when
driver-specific properties are enabled:
+----------------------+
| PLANE |
| |
| +----------------+ |
| | AMD Degamma | |
| | | |
| | EOTF | 1D LUT | |
| +--------+-------+ |
| | |
| +--------v-------+ |
| | AMD HDR | |
| | Multiply | |
| +--------+-------+ |
| | |
| +--------v-------+ |
| | AMD CTM (3x4) | |
| +--------+-------+ |
| | |
| +--------v-------+ |
| | AMD Shaper | |
| | | |
| | inv_EOTF | | |
| | Custom 1D LUT | |
| +--------+-------+ |
| | |
| +--------v-------+ |
| | AMD 3D LUT | |
| | 17^3/12-bit | |
| +--------+-------+ |
| | |
| +--------v-------+ |
| | AMD Blend | |
| | | |
| | EOTF | 1D LUT | |
| +--------+-------+ |
| | |
++----------v---------++
|| Blending ||
++----------+---------++
| CRTC | |
| | |
| +-------v-------+ |
| | DRM Degamma | |
| | | |
| | Custom 1D LUT | |
| +-------+-------+ |
| | |
| +-------v-------+ |
| | DRM CTM (3x3) | |
| +-------+-------+ |
| | |
| +-------v-------+ |
| | DRM Gamma | |
| | | |
| | Custom 1D LUT | |
| +---------------+ |
| | *AMD Gamma | |
| | inv_EOTF | |
| +---------------+ |
| |
+----------------------+
Please, let us know your thoughts.
Best Regards,
Melissa Wen
[1] https://github.com/ValveSoftware/gamescope
[2] https://store.steampowered.com/news/app/1675200/view/3686804163591367815
[3] https://lore.kernel.org/dri-devel/20230721132431.692158-1-mwen@igalia.com
Joshua Ashton (14):
drm/amd/display: add plane degamma TF driver-specific property
drm/amd/display: add plane HDR multiplier driver-specific property
drm/amd/display: add plane blend LUT and TF driver-specific properties
drm/amd/display: add CRTC gamma TF support
drm/amd/display: set sdr_ref_white_level to 80 for out_transfer_func
drm/amd/display: mark plane as needing reset if color props change
drm/amd/display: add plane degamma TF and LUT support
drm/amd/display: add dc_fixpt_from_s3132 helper
drm/amd/display: add HDR multiplier support
drm/amd/display: handle empty LUTs in __set_input_tf
drm/amd/display: add plane blend LUT and TF support
drm/amd/display: allow newer DC hardware to use degamma ROM for PQ/HLG
drm/amd/display: copy 3D LUT settings from crtc state to stream_update
drm/amd/display: Add 3x4 CTM support for plane CTM
Melissa Wen (18):
drm/drm_mode_object: increase max objects to accommodate new color
props
drm/drm_property: make replace_property_blob_from_id a DRM helper
drm/drm_plane: track color mgmt changes per plane
drm/amd/display: add driver-specific property for plane degamma LUT
drm/amd/display: explicitly define EOTF and inverse EOTF
drm/amd/display: document AMDGPU pre-defined transfer functions
drm/amd/display: add plane 3D LUT driver-specific properties
drm/amd/display: add plane shaper LUT and TF driver-specific
properties
drm/amd/display: add CRTC gamma TF driver-specific property
drm/amd/display: add comments to describe DM crtc color mgmt behavior
drm/amd/display: encapsulate atomic regamma operation
drm/amd/display: decouple steps for mapping CRTC degamma to DC plane
drm/amd/display: reject atomic commit if setting both plane and CRTC
degamma
drm/amd/display: add plane shaper LUT support
drm/amd/display: add plane shaper TF support
drm/amd/display: add plane 3D LUT support
drm/amd/display: add plane CTM driver-specific property
drm/amd/display: add plane CTM support
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 90 ++
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 34 +-
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 108 +++
.../amd/display/amdgpu_dm/amdgpu_dm_color.c | 821 ++++++++++++++++--
.../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 72 ++
.../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 224 ++++-
.../gpu/drm/amd/display/include/fixed31_32.h | 12 +
drivers/gpu/drm/arm/malidp_crtc.c | 2 +-
drivers/gpu/drm/drm_atomic.c | 1 +
drivers/gpu/drm/drm_atomic_state_helper.c | 1 +
drivers/gpu/drm/drm_atomic_uapi.c | 43 +-
drivers/gpu/drm/drm_property.c | 49 ++
include/drm/drm_mode_object.h | 2 +-
include/drm/drm_plane.h | 7 +
include/drm/drm_property.h | 6 +
include/uapi/drm/drm_mode.h | 8 +
16 files changed, 1371 insertions(+), 109 deletions(-)
--
2.40.1
next reply other threads:[~2023-10-05 17:15 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-05 17:14 Melissa Wen [this message]
2023-10-05 17:14 ` [PATCH v4 01/32] drm/drm_mode_object: increase max objects to accommodate new color props Melissa Wen
2023-10-05 17:14 ` [PATCH v4 02/32] drm/drm_property: make replace_property_blob_from_id a DRM helper Melissa Wen
2023-10-05 17:14 ` [PATCH v4 03/32] drm/drm_plane: track color mgmt changes per plane Melissa Wen
2023-10-05 17:14 ` [PATCH v4 04/32] drm/amd/display: add driver-specific property for plane degamma LUT Melissa Wen
2023-10-05 17:15 ` [PATCH v4 05/32] drm/amd/display: add plane degamma TF driver-specific property Melissa Wen
2023-10-05 17:15 ` [PATCH v4 06/32] drm/amd/display: explicitly define EOTF and inverse EOTF Melissa Wen
2023-11-15 18:25 ` Harry Wentland
2023-10-05 17:15 ` [PATCH v4 07/32] drm/amd/display: document AMDGPU pre-defined transfer functions Melissa Wen
2023-11-15 18:26 ` Harry Wentland
2023-10-05 17:15 ` [PATCH v4 08/32] drm/amd/display: add plane HDR multiplier driver-specific property Melissa Wen
2023-11-15 18:26 ` Harry Wentland
2023-10-05 17:15 ` [PATCH v4 09/32] drm/amd/display: add plane 3D LUT driver-specific properties Melissa Wen
2023-10-06 9:09 ` Sebastian Wick
2023-11-06 18:46 ` Melissa Wen
2023-11-02 3:48 ` Joshua Ashton
2023-11-02 7:31 ` Joshua Ashton
2023-11-06 18:52 ` Melissa Wen
2023-11-06 18:49 ` Melissa Wen
2023-10-05 17:15 ` [PATCH v4 10/32] drm/amd/display: add plane shaper LUT and TF " Melissa Wen
2023-11-15 18:27 ` Harry Wentland
2023-10-05 17:15 ` [PATCH v4 11/32] drm/amd/display: add plane blend " Melissa Wen
2023-11-15 18:27 ` Harry Wentland
2023-10-05 17:15 ` [PATCH v4 12/32] drm/amd/display: add CRTC gamma TF driver-specific property Melissa Wen
2023-11-15 18:27 ` Harry Wentland
2023-10-05 17:15 ` [PATCH v4 13/32] drm/amd/display: add comments to describe DM crtc color mgmt behavior Melissa Wen
2023-10-05 17:15 ` [PATCH v4 14/32] drm/amd/display: encapsulate atomic regamma operation Melissa Wen
2023-10-05 17:15 ` [PATCH v4 15/32] drm/amd/display: add CRTC gamma TF support Melissa Wen
2023-10-05 17:15 ` [PATCH v4 16/32] drm/amd/display: set sdr_ref_white_level to 80 for out_transfer_func Melissa Wen
2023-10-05 17:15 ` [PATCH v4 17/32] drm/amd/display: mark plane as needing reset if color props change Melissa Wen
2023-10-05 17:15 ` [PATCH v4 18/32] drm/amd/display: decouple steps for mapping CRTC degamma to DC plane Melissa Wen
2023-10-05 17:15 ` [PATCH v4 19/32] drm/amd/display: add plane degamma TF and LUT support Melissa Wen
2023-10-05 17:15 ` [PATCH v4 20/32] drm/amd/display: reject atomic commit if setting both plane and CRTC degamma Melissa Wen
2023-10-05 17:15 ` [PATCH v4 21/32] drm/amd/display: add dc_fixpt_from_s3132 helper Melissa Wen
2023-10-05 17:15 ` [PATCH v4 22/32] drm/amd/display: add HDR multiplier support Melissa Wen
2023-10-05 17:15 ` [PATCH v4 23/32] drm/amd/display: add plane shaper LUT support Melissa Wen
2023-10-05 17:15 ` [PATCH v4 24/32] drm/amd/display: add plane shaper TF support Melissa Wen
2023-10-05 17:15 ` [PATCH v4 25/32] drm/amd/display: add plane 3D LUT support Melissa Wen
2023-10-05 17:15 ` [PATCH v4 26/32] drm/amd/display: handle empty LUTs in __set_input_tf Melissa Wen
2023-10-05 17:15 ` [PATCH v4 27/32] drm/amd/display: add plane blend LUT and TF support Melissa Wen
2023-10-05 17:15 ` [PATCH v4 28/32] drm/amd/display: allow newer DC hardware to use degamma ROM for PQ/HLG Melissa Wen
2023-10-05 17:15 ` [PATCH v4 29/32] drm/amd/display: copy 3D LUT settings from crtc state to stream_update Melissa Wen
2023-10-05 17:15 ` [PATCH v4 30/32] drm/amd/display: add plane CTM driver-specific property Melissa Wen
2023-10-05 17:15 ` [PATCH v4 31/32] drm/amd/display: add plane CTM support Melissa Wen
2023-10-05 17:15 ` [PATCH v4 32/32] drm/amd/display: Add 3x4 CTM support for plane CTM Melissa Wen
2023-10-06 9:28 ` [PATCH v4 00/32] drm/amd/display: add AMD driver-specific properties for color mgmt Sebastian Wick
2023-11-06 19:33 ` Melissa Wen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231005171527.203657-1-mwen@igalia.com \
--to=mwen@igalia.com \
--cc=Rodrigo.Siqueira@amd.com \
--cc=Shashank.Sharma@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@gmail.com \
--cc=alex.hung@amd.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=brian.starkey@arm.com \
--cc=christian.koenig@amd.com \
--cc=contact@emersion.fr \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=joshua@froggi.es \
--cc=kernel-dev@igalia.com \
--cc=liviu.dudau@arm.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=nicholas.kazlauskas@amd.com \
--cc=pekka.paalanen@collabora.com \
--cc=sebastian.wick@redhat.com \
--cc=sungjoon.kim@amd.com \
--cc=sunpeng.li@amd.com \
--cc=tzimmermann@suse.de \
--cc=xaver.hugl@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).