mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 14:04:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'drm-intel-fixes-2026-07-30' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes

Browse Source 
One DP DSC fix and one HDMI 2.0 fix.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/amvIvqJehP7uaUgx@intel.com
This commit is contained in:
Dave Airlie
2026-07-31 14:44:11 +10:00
parent cbad2668c2 1afb8eaeec
commit 256325820a
4 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/intel_ddi.c
View File

@@ -3501,6 +3501,8 @@ static void intel_ddi_enable_hdmi(struct intel_atomic_state *state,
}
intel_ddi_buf_enable(encoder, buf_ctl);
intel_hdmi_poll_for_scrambling_enable(crtc_state, connector);
}
static void intel_ddi_enable(struct intel_atomic_state *state,

9
drivers/gpu/drm/i915/display/intel_dp.c
View File

@@ -4242,7 +4242,14 @@ static int intel_dp_hdmi_sink_max_frl(struct intel_dp *intel_dp)
rate_per_lane = info->hdmi.max_frl_rate_per_lane;
max_frl_rate = max_lanes * rate_per_lane;
if (info->hdmi.dsc_cap.v_1p2) {
/*
* The sink's DSC max FRL rate only applies to compressed video
* transport, which requires a DSC 1.2 encoder in the PCON. Without
* one the HDMI link always carries uncompressed video, for which
* the regular max FRL rate is the limit.
*/
if (drm_dp_pcon_enc_is_dsc_1_2(intel_dp->pcon_dsc_dpcd) &&
info->hdmi.dsc_cap.v_1p2) {
max_dsc_lanes = info->hdmi.dsc_cap.max_lanes;
dsc_rate_per_lane = info->hdmi.dsc_cap.max_frl_rate_per_lane;
if (max_dsc_lanes && dsc_rate_per_lane)

26
drivers/gpu/drm/i915/display/intel_hdmi.c
View File

@@ -2728,6 +2728,32 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *_
drm_connector_attach_max_bpc_property(&connector->base, 8, 12);
}
/*
* HDMI 2.0 spec, section 6.1.3.1 (Scrambling Control): after
* enabling Scrambling_Enable and starting scrambled video
* transmission, poll Scrambling_Status for up to 200 ms.
*/
void
intel_hdmi_poll_for_scrambling_enable(const struct intel_crtc_state *crtc_state,
struct drm_connector *_connector)
{
struct intel_connector *connector = to_intel_connector(_connector);
struct intel_display *display = to_intel_display(crtc_state);
bool scrambling_enabled = false;
int ret;
if (!crtc_state->hdmi_scrambling)
return;
/* Poll for a max of 200 msec as per HDMI spec */
ret = poll_timeout_us(scrambling_enabled = drm_scdc_get_scrambling_status(&connector->base),
scrambling_enabled, 1000, 200 * 1000, false);
if (ret)
drm_dbg_kms(display->drm,
"[CONNECTOR:%d:%s] Timed out waiting for scrambling enable\n",
connector->base.base.id, connector->base.name);
}
/*
* intel_hdmi_handle_sink_scrambling: handle sink scrambling/clock ratio setup
* @encoder: intel_encoder

2
drivers/gpu/drm/i915/display/intel_hdmi.h
View File

@@ -70,5 +70,7 @@ void hsw_read_infoframe(struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state,
unsigned int type,
void *frame, ssize_t len);
void intel_hdmi_poll_for_scrambling_enable(const struct intel_crtc_state *crtc_state,
struct drm_connector *_connector);
#endif /* __INTEL_HDMI_H__ */