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>, Xaver Hugl <xaver.hugl@gmail.com>,
linux-kernel@vger.kernel.org, kernel-dev@igalia.com,
Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>,
Joshua Ashton <joshua@froggi.es>,
sungjoon.kim@amd.com
Subject: [PATCH v2 00/34] drm/amd/display: add AMD driver-specific properties for color mgmt
Date: Thu, 10 Aug 2023 15:02:40 -0100 [thread overview]
Message-ID: <20230810160314.48225-1-mwen@igalia.com> (raw)
Hi all,
Here is the next version of our work to enable AMD driver-specific color
management properties [1][2]. This series is a collection of
contributions from Joshua, Harry, and me to enhance the AMD KMS color
pipeline for Steam Deck/SteamOS by exposing additional pre-blending and
post-blending color capabilities from those available in the current DRM
KMS API[3].
The userspace case here is Gamescope which is the compositor for
SteamOS. Gamescope is already using these features to implement its
color management pipeline [4].
In this version, I try to address all concerns shared in the previous
one, i.e.:
- Replace DRM_ by AMDGPU_ prefix for transfer function enumeration;
- Explicitly define EOTFs and inverse EOTFs and set props accordingly;
- Document pre-defined transfer functions;
- Remove misleading comments;
- Remove post-blending/MPC shaper 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;
- Nits/small fixes;
Bearing in mind the complexity of color concepts, I believe there is a
high chance of some misunderstanding from my side when defining EOTFs
and documenting pre-defined TFs. So, reviews are very important and
welcome (thanks in advance). FWIW, I added Harry as a co-developer of
this TF documentation since I based on his description of EOTF/inv_EOTF
and previous documentation work [5]. Let me know if there is a better
way for credits.
Two DC patches were already applied and, therefore, removed from the
series. I added r-b according to previous feedback. We also add plane
CTM to driver-specific properties. As a result, this is the updated list
of all driver-specific color properties exposed by this series:
- 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;
Remember 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
Worth mentioning that the pre-blending degamma block can use ROM curves
for some pre-defined TFs, but the other blocks use the AMD color module
to calculate this curve considering pre-defined coefficients.
We need changes on DC gamut remap matrix to support the plane and CRTC
CTM on drivers that support both. I've sent a previous patch to apply
these changes to all DCN3+ families [6]. Here I use the same changes but
limited to DCN301. Just let me know if you prefer the previous/expanded
version.
Finally, this is the Linux/AMD color management API before and after
blending with the driver-specific properties:
+----------------------+
| 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 | |
| +---------------+ |
| |
+----------------------+
Let me know your thoughts.
Best Regards,
Melissa Wen
[1] https://lore.kernel.org/dri-devel/20230423141051.702990-1-mwen@igalia.com
[2] https://lore.kernel.org/dri-devel/20230523221520.3115570-1-mwen@igalia.com
[3] https://github.com/ValveSoftware/gamescope/blob/master/src/docs/Steam%20Deck%20Display%20Pipeline.png
[4] https://github.com/ValveSoftware/gamescope
[5] https://lore.kernel.org/dri-devel/20210730204134.21769-1-harry.wentland@amd.com
[6] https://lore.kernel.org/dri-devel/20230721132431.692158-1-mwen@igalia.com
Harry Wentland (1):
drm/amd/display: fix segment distribution for linear LUTs
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: Use 3x4 CTM for plane CTM
Melissa Wen (19):
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: set stream gamut remap matrix to MPC for DCN301
drm/amd/display: add plane CTM driver-specific property
drm/amd/display: add plane CTM support
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 71 ++
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 34 +-
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 101 +++
.../amd/display/amdgpu_dm/amdgpu_dm_color.c | 805 ++++++++++++++++--
.../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 72 ++
.../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 224 ++++-
.../amd/display/dc/dcn10/dcn10_cm_common.c | 93 +-
.../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 37 +
.../drm/amd/display/dc/dcn30/dcn30_hwseq.h | 3 +
.../drm/amd/display/dc/dcn301/dcn301_init.c | 2 +-
.../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 +
20 files changed, 1446 insertions(+), 127 deletions(-)
--
2.40.1
next reply other threads:[~2023-08-10 16:03 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-10 16:02 Melissa Wen [this message]
2023-08-10 16:02 ` [PATCH v2 01/34] drm/amd/display: fix segment distribution for linear LUTs Melissa Wen
2023-09-06 19:15 ` Harry Wentland
2023-09-08 14:11 ` Melissa Wen
2023-09-08 14:40 ` Harry Wentland
2023-08-10 16:02 ` [PATCH v2 02/34] drm/drm_mode_object: increase max objects to accommodate new color props Melissa Wen
2023-08-10 16:02 ` [PATCH v2 03/34] drm/drm_property: make replace_property_blob_from_id a DRM helper Melissa Wen
2023-08-10 16:02 ` [PATCH v2 04/34] drm/drm_plane: track color mgmt changes per plane Melissa Wen
2023-08-10 16:02 ` [PATCH v2 05/34] drm/amd/display: add driver-specific property for plane degamma LUT Melissa Wen
2023-08-10 16:02 ` [PATCH v2 06/34] drm/amd/display: add plane degamma TF driver-specific property Melissa Wen
2023-08-10 16:02 ` [PATCH v2 07/34] drm/amd/display: explicitly define EOTF and inverse EOTF Melissa Wen
2023-08-22 11:02 ` Pekka Paalanen
2023-08-25 14:18 ` Melissa Wen
2023-09-06 20:15 ` Harry Wentland
2023-09-07 7:49 ` Pekka Paalanen
2023-09-07 14:10 ` Harry Wentland
2023-09-08 7:45 ` Pekka Paalanen
2023-09-08 14:14 ` Melissa Wen
2023-08-10 16:02 ` [PATCH v2 08/34] drm/amd/display: document AMDGPU pre-defined transfer functions Melissa Wen
2023-08-22 11:45 ` Pekka Paalanen
2023-08-10 16:02 ` [PATCH v2 09/34] drm/amd/display: add plane HDR multiplier driver-specific property Melissa Wen
2023-08-22 11:54 ` Pekka Paalanen
2023-08-10 16:02 ` [PATCH v2 10/34] drm/amd/display: add plane 3D LUT driver-specific properties Melissa Wen
2023-09-06 19:30 ` Harry Wentland
2023-09-07 7:57 ` Pekka Paalanen
2023-09-08 14:19 ` Melissa Wen
2023-08-10 16:02 ` [PATCH v2 11/34] drm/amd/display: add plane shaper LUT and TF " Melissa Wen
2023-09-06 19:33 ` Harry Wentland
2023-09-08 14:21 ` Melissa Wen
2023-08-10 16:02 ` [PATCH v2 12/34] drm/amd/display: add plane blend " Melissa Wen
2023-08-10 16:02 ` [PATCH v2 13/34] drm/amd/display: add CRTC gamma TF driver-specific property Melissa Wen
2023-08-10 16:02 ` [PATCH v2 14/34] drm/amd/display: add comments to describe DM crtc color mgmt behavior Melissa Wen
2023-08-10 16:02 ` [PATCH v2 15/34] drm/amd/display: encapsulate atomic regamma operation Melissa Wen
2023-08-10 16:02 ` [PATCH v2 16/34] drm/amd/display: add CRTC gamma TF support Melissa Wen
2023-08-10 16:02 ` [PATCH v2 17/34] drm/amd/display: set sdr_ref_white_level to 80 for out_transfer_func Melissa Wen
2023-08-10 16:02 ` [PATCH v2 18/34] drm/amd/display: mark plane as needing reset if color props change Melissa Wen
2023-08-10 16:02 ` [PATCH v2 19/34] drm/amd/display: decouple steps for mapping CRTC degamma to DC plane Melissa Wen
2023-08-22 12:11 ` Pekka Paalanen
2023-08-25 14:29 ` Melissa Wen
2023-08-28 8:17 ` Pekka Paalanen
2023-08-30 10:59 ` Michel Dänzer
2023-09-06 14:46 ` Harry Wentland
2023-08-28 8:45 ` Joshua Ashton
2023-08-28 10:23 ` Pekka Paalanen
2023-08-28 13:56 ` Melissa Wen
2023-08-29 8:51 ` Pekka Paalanen
2023-09-06 14:52 ` Harry Wentland
2023-08-10 16:03 ` [PATCH v2 20/34] drm/amd/display: add plane degamma TF and LUT support Melissa Wen
2023-08-10 16:03 ` [PATCH v2 21/34] drm/amd/display: reject atomic commit if setting both plane and CRTC degamma Melissa Wen
2023-08-10 16:03 ` [PATCH v2 22/34] drm/amd/display: add dc_fixpt_from_s3132 helper Melissa Wen
2023-08-10 16:03 ` [PATCH v2 23/34] drm/amd/display: add HDR multiplier support Melissa Wen
2023-08-10 16:03 ` [PATCH v2 24/34] drm/amd/display: add plane shaper LUT support Melissa Wen
2023-08-10 16:03 ` [PATCH v2 25/34] drm/amd/display: add plane shaper TF support Melissa Wen
2023-08-10 16:03 ` [PATCH v2 26/34] drm/amd/display: add plane 3D LUT support Melissa Wen
2023-08-10 16:03 ` [PATCH v2 27/34] drm/amd/display: handle empty LUTs in __set_input_tf Melissa Wen
2023-08-10 16:03 ` [PATCH v2 28/34] drm/amd/display: add plane blend LUT and TF support Melissa Wen
2023-08-10 16:03 ` [PATCH v2 29/34] drm/amd/display: allow newer DC hardware to use degamma ROM for PQ/HLG Melissa Wen
2023-09-06 18:01 ` Harry Wentland
2023-09-08 14:28 ` Melissa Wen
2023-08-10 16:03 ` [PATCH v2 30/34] drm/amd/display: copy 3D LUT settings from crtc state to stream_update Melissa Wen
2023-08-10 16:03 ` [PATCH v2 31/34] drm/amd/display: set stream gamut remap matrix to MPC for DCN301 Melissa Wen
2023-08-22 12:30 ` Pekka Paalanen
2023-08-25 14:37 ` Melissa Wen
2023-08-28 8:20 ` Pekka Paalanen
2023-09-06 18:10 ` Harry Wentland
2023-08-10 16:03 ` [PATCH v2 32/34] drm/amd/display: add plane CTM driver-specific property Melissa Wen
2023-09-06 18:14 ` Harry Wentland
2023-09-08 14:41 ` Melissa Wen
2023-09-08 14:42 ` Harry Wentland
2023-08-10 16:03 ` [PATCH v2 33/34] drm/amd/display: add plane CTM support Melissa Wen
2023-09-06 18:18 ` Harry Wentland
2023-09-08 14:49 ` Melissa Wen
2023-08-10 16:03 ` [PATCH v2 34/34] drm/amd/display: Use 3x4 CTM for plane CTM Melissa Wen
2023-09-06 18:28 ` Harry Wentland
2023-09-06 19:33 ` [PATCH v2 00/34] drm/amd/display: add AMD driver-specific properties for color mgmt Harry Wentland
2023-09-08 14:52 ` 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=20230810160314.48225-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=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=joshua@froggi.es \
--cc=kernel-dev@igalia.com \
--cc=linux-kernel@vger.kernel.org \
--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).