On 2023-08-10 12:02, Melissa Wen wrote: > 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. > Thanks again for your amazing work on this. Patches 5, 6, 14, 16, and 24 are Reviewed-by: Harry Wentland <harry.wentland@xxxxxxx> I left comments on the remaining unreviewed patches. Harry > Best Regards, > > Melissa Wen > > [1] https://lore.kernel.org/dri-devel/20230423141051.702990-1-mwen@xxxxxxxxxx > [2] https://lore.kernel.org/dri-devel/20230523221520.3115570-1-mwen@xxxxxxxxxx > [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@xxxxxxx > [6] https://lore.kernel.org/dri-devel/20230721132431.692158-1-mwen@xxxxxxxxxx > > > 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(-) >
