From: sashiko-bot@kernel.org
To: "Yitian Shao" <fighters390@qq.com>, intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915/dp: Attach HDR_OUTPUT_METADATA on eDP when TCON supports HDR
Date: Fri, 20 Nov 2026 06:15:06 +0000 [thread overview]
Message-ID: <sashiko-outbox-224547@kernel.org> (raw)
In-Reply-To: <tencent_083AD2514CBC235A9F55EE00BDF72D3B9209@qq.com>
Thank you for your contribution! Sashiko AI review found 3 potential
issues to consider:
- [High] drm/i915/dp: broken LSPCON HDR in
intel_dp_compute_hdr_metadata_infoframe_sdp()
- [Medium] drm/i915/dp: unchecked union read of intel_cap in
intel_dp_add_properties()
- [Medium] drm/i915/dp: fastset skips TCON HDR update when SDP
computation is bypassed
--
commit ee42402ceca82543288507d878602e90d81ac27f
Author: Yitian Shao <fighters390@qq.com>
drm/i915/dp: Attach HDR_OUTPUT_METADATA on eDP when TCON supports HDR
This commit attaches the HDR_OUTPUT_METADATA property on eDP connectors
whose TCON supports PQ (ST2084) decoding via the Intel AUX HDR interface,
and skips computing the HDR metadata infoframe SDP when the encoder does
not support gamut metadata DIP.
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 47741957935ae..3faa5ddb4c60b 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -3239,6 +3239,9 @@ intel_dp_compute_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp,
> int ret;
> struct hdmi_drm_infoframe *drm_infoframe = &crtc_state->infoframes.drm.drm;
>
> + if (!intel_dp_has_gamut_metadata_dip(&dp_to_dig_port(intel_dp)->base))
> + return;
> +
> if (!conn_state->hdr_output_metadata)
> return;
[Severity: High]
Does this break HDR metadata transmission on LSPCON outputs?
intel_dp_has_gamut_metadata_dip() unconditionally returns false when
intel_bios_encoder_is_lspcon(encoder->devdata) is true, because LSPCON
connectors defer attaching HDR_OUTPUT_METADATA until
intel_dp_connector_register() probes intel_lspcon_detect_hdr_capability().
LSPCON encoders still rely on intel_dp_compute_hdr_metadata_infoframe_sdp()
to populate crtc_state->infoframes.drm.drm and enable
HDMI_PACKET_TYPE_GAMUT_METADATA in crtc_state->infoframes.enable for
lspcon_write_infoframe(). With this check, HDR metadata is never computed
or sent on LSPCON ports, and the state checker will report an infoframe
mismatch if VIDEO_DIP_ENABLE_GMP_HSW was already active.
[Severity: Medium]
When intel_dp_compute_hdr_metadata_infoframe_sdp() returns early on pre-ICL
port A eDP panels, can a fastset skip programming the TCON HDR parameters?
When userspace toggles HDR_OUTPUT_METADATA,
intel_digital_connector_atomic_check() sets crtc_state->mode_changed = true,
and on platforms with gamut metadata DIP the resulting change in
crtc_state->infoframes.enable causes intel_pipe_config_compare() to reject
fastset and run a full modeset. Returning early here leaves
crtc_state->infoframes.enable unchanged, so commits without another pipe
config change are downgraded to a fastset (update_pipe). On the fastset
path, intel_ddi_update_pipe_dp() calls intel_backlight_update(), which only
calls __intel_backlight_enable() -> intel_dp_aux_hdr_enable_backlight()
when !panel->backlight.enabled:
drivers/gpu/drm/i915/display/intel_backlight.c:intel_backlight_update() {
...
mutex_lock(&display->backlight.lock);
if (!panel->backlight.enabled)
__intel_backlight_enable(crtc_state, conn_state);
mutex_unlock(&display->backlight.lock);
...
}
Because panel->backlight.enabled is already true on an active panel,
INTEL_EDP_HDR_GETSET_CTRL_PARAMS is never updated in the TCON.
> @@ -7018,7 +7021,9 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *_connec
> intel_attach_dp_colorspace_property(&connector->base);
> }
>
> - if (intel_dp_has_gamut_metadata_dip(&dp_to_dig_port(intel_dp)->base))
> + if (intel_dp_has_gamut_metadata_dip(&dp_to_dig_port(intel_dp)->base) ||
> + (intel_dp_is_edp(intel_dp) &&
> + connector->panel.backlight.edp.intel_cap.supports_2084_decode))
> drm_connector_attach_hdr_output_metadata_property(&connector->base);
>
> if (HAS_VRR(display))
[Severity: Medium]
Can reading connector->panel.backlight.edp.intel_cap.supports_2084_decode
here access the wrong union member when the VESA eDP AUX backlight
interface is selected?
In struct intel_panel, panel.backlight.edp is an untagged union between
vesa and intel_cap:
drivers/gpu/drm/i915/display/intel_display_types.h:struct intel_panel {
...
union {
struct {
struct drm_edp_backlight_info info;
bool luminance_control_support;
} vesa;
struct {
bool sdr_uses_aux;
bool supports_2084_decode;
...
}
supports_2084_decode sits at byte offset 1, overlapping
vesa.info.pwm_freq_pre_divider in struct drm_edp_backlight_info. If
intel_edp_backlight_setup() selected the VESA AUX backlight path instead of
the Intel HDR AUX path, drm_edp_backlight_init() populates vesa.info and a
non-zero pwm_freq_pre_divider will falsely attach HDR_OUTPUT_METADATA (and
trigger an out-of-range bool load under UBSan if the divider is >= 2).
--
Sashiko AI review · https://sashiko.dev/#/patchset/tencent_083AD2514CBC235A9F55EE00BDF72D3B9209@qq.com?part=1
prev parent reply other threads:[~2026-11-20 6:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 5:50 [PATCH] drm/i915/dp: Attach HDR_OUTPUT_METADATA on eDP when TCON supports HDR Yitian Shao
2026-11-20 6:15 ` sashiko-bot [this message]
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=sashiko-outbox-224547@kernel.org \
--to=sashiko-bot@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=fighters390@qq.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=sashiko-reviews@lists.linux.dev \
/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