Hello, this is a follow-up to https://lore.kernel.org/all/[email protected]/ which in of itself is a follow-up to https://lore.kernel.org/dri-devel/[email protected]/ where a new DRM connector property has been added allowing users to force a particular color format.
That in turn was actually also a follow-up from Werner Sembach's posted at https://lore.kernel.org/dri-devel/[email protected]/ As the number of cooks have reached critical mass, I'm hoping I'll be the last person to touch this particular series. We have an implementation in Weston at https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1825 that adds support for this property. This patch series has been tested against that MR on i915 (HDMI, DP), amdgpu (HDMI, DP) and on rockchip (HDMI). You can also manually test this with modetest like so, but beware that this is a non-atomic invocation, so testing YUV420 like this will result in weird outcomes if only some of the modes support YUV420: $ modetest -s 115:1920x1080-60@NV12 -w 115:'color format':4 where 115 is the connector ID and '4' is the enum value for a particular color format. General notes on the approach taken by me: instead of silently switching to a different format than was explicitly requested, or even worse, outputting something to the sink the sink doesn't support, bubble up an error to userspace instead. "color format" is a "I want this" type property, not a "force this" type property, i.e. the kernel will respect the limits imposed by the hardware. I'm not sure if my drm_bridge change actually achieves what I want in a more complex bridge setup. I'd need to either come up with a virtual bridge to test these scenarios, or spend some time making a flat flex cable adapter for the DSI-HDMI bridge board I have here. Before I invest too much time into either of those, I'd like to get some feedback on this approach however. Things I've tested: - HDMI (YCbCr 4:4:4 + RGB + Auto) on RK3588 - HDMI + DP (YCbCr 4:4:4, YCbCr 4:2:0, RGB, Auto) on Intel N97 (i915) DP-MST is untested, but I expect it to work the same. - HDMI (YCbCr 4:4:4, YCbCr 4:2:2, YCbCr 4:2:0, RGB, Auto) + DP (YCbCr 4:4:4, RGB, Auto) on an AMD Radeon RX 550 (amdgpu). DP-MST is untested. Changes in v4: - Rebase onto next-20251117 - Get rid of HDMI_COLORSPACE_AUTO - Split hdmi_compute_config change into separate patch - Add missing symbol export for color_format_to_hdmi_colorspace to fix builds in certain configurations - Drop "drm: Pass supported color formats straight onto drm_bridge" - Make dw-hdmi-qp set the platform data's supported color formats as the bridge's supported HDMI color formats - drm_hdmi_state_helper: pass requested color format to hdmi_compute_format_bpc if set. - drm_bridge: limit the bus formats to those explicitly requested with the color format property during the atomic bridge check call, specifically in drm_atomic_bridge_chain_select_bus_fmts. - i915: Remove INTEL_OUTPUT_FORMAT_AUTO, as automatic format selection does not need to involve the hardware state - i915: Deduplicate ntel_output_format_to_drm_color_format code by moving it as a static inline __pure function into a shared header - i915: rework logic in HDMI, DP and DP-MST output config functions to remove redundant locals, simplify execution flow, and return an error to userspace if an explicit color_format request can't be satisfied. - i915: assign myself as the author and make the others Co-developers, so that they don't get the blame for any of my bugs. - amdgpu: refactor fill_stream_properties_from_drm_display_mode to improve readability and ensure that impossible color format requests get bubbled up to userspace as errors - amdgpu: don't pick YUV444 over RGB. - amdgpu: assign authorship to myself, with others as Co-developers, as logic was modified and the blame should fall on me - dw_hdmi_qp-rockchip: set the supported color formats platform data member - rockchip: remove drm property registration for rk3066_hdmi and inno_hdmi. None of the platforms that use these use vop2 as the video output processor. - Link to v3: https://lore.kernel.org/all/[email protected]/ Changes in v3 by mvlad compared to Andri's v2 series: - renamed the property to just 'color format' - the property is added dynamically similar to the Colorspace property - a key point from previous comments was that drivers should advertise the color formats they support and userspace would query EDID and perform an intersection from those color formats which users can further use. With this patch set each driver that adds this property has such list of hard-coded color formats, but fundamentally the idea is that driver can query the HW and do that on its own. The infrastructure is now in place to allow to do that - by default the 'AUTO' color format is set. With this patch series that has been introduced as a fallback to RGB. Drivers could further customize this behavour and could perform additional checks on the sink to pick another suitable color format they'd like for AUTO - drm_bridge bridge code has been improved to allow initialization with the same color formats list as the DRM connector property. Similarly, bpc pick-up now takes the color format into consideration when deciding which bpc to choose from - The new DRM color format re-uses HDMI_COLORPSACE enum and provides an enum translations between the two to avoid touching all other drivers that use HDMI_COLORPSACE enum. I believe at this point that this allows the least amount of disruption and avoids a massive bike shedding around that part - a rockchip implementation has been by my colleague Derek Foreman - YUV444 color format has been added in i915 - address comment about "Remove unnecessary SIGNAL_TYPE_HDMI_TYPE_A check" where aconnector might be invalid - Link to v2: https://lore.kernel.org/dri-devel/[email protected]/ Signed-off-by: Nicolas Frattaroli <[email protected]> --- Andri Yngvason (1): drm: Add new general DRM property "color format" Derek Foreman (1): drm/rockchip: Implement "color format" DRM property Marius Vlad (1): drm: Add enum conversion from/to HDMI_COLORSPACE to DRM_COLOR_FORMAT Nicolas Frattaroli (6): drm/bridge: Act on the DRM color format property drm/bridge: dw-hdmi-qp: Set bridge supported_formats drm/rockchip: dw_hdmi_qp: Set supported_formats platdata drm/display: hdmi-state-helper: Act on color format DRM property drm/i915: Implement the "color format" DRM property drm/amdgpu: Implement "color format" DRM property Werner Sembach (1): drm/amd/display: Remove unnecessary SIGNAL_TYPE_HDMI_TYPE_A check drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 93 ++++++++-- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 14 ++ drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 5 + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 8 +- drivers/gpu/drm/drm_atomic_helper.c | 5 + drivers/gpu/drm/drm_atomic_uapi.c | 4 + drivers/gpu/drm/drm_bridge.c | 57 ++++++ drivers/gpu/drm/drm_connector.c | 198 +++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_connector.c | 19 ++ drivers/gpu/drm/i915/display/intel_connector.h | 2 + drivers/gpu/drm/i915/display/intel_display_types.h | 15 ++ drivers/gpu/drm/i915/display/intel_dp.c | 42 ++++- drivers/gpu/drm/i915/display/intel_dp.h | 4 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 37 +++- drivers/gpu/drm/i915/display/intel_hdmi.c | 40 ++++- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 27 +++ drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 46 +++++ drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 2 + include/drm/drm_connector.h | 57 +++++- 19 files changed, 637 insertions(+), 38 deletions(-) --- base-commit: d1d18879e01e4c9efcb85a96d188a8e4326136dd change-id: 20251028-color-format-49fd202b7183 Best regards, -- Nicolas Frattaroli <[email protected]>
