Skip to content

[Deepin-Kernel-SIG] [linux 6.6.y] [Upstream] i915 fixes backport #2246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opsiff merged 7 commits into from
Nov 4, 2026
Merged

[Deepin-Kernel-SIG] [linux 6.6.y] [Upstream] i915 fixes backport #2246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
97bb94f
drm/i915/guc: Flush ct receive tasklet during reset preparation
zhanjun Nov 4, 2024
90722a9
Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link"
surajk8 Jan 3, 2025
9dab522
drm/i915/hdcp: Fix Repeater authentication during topology change
surajk8 Dec 17, 2024
ed342a3
drm/i915/sdvo: Initialize the encoder earlier
vsyrjala Aug 25, 2023
549c0ba
drm/i915/sdvo: Rework DDC bus handling
vsyrjala Aug 25, 2023
ce6cad0
drm/i915/sdvo: Print out the i2c pin and slave address
vsyrjala Aug 25, 2023
670a257
drm/i915/sdvo: Constify mapping structs
vsyrjala Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions drivers/gpu/drm/i915/display/intel_hdcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,9 +1087,15 @@ static int intel_hdcp_check_link(struct intel_connector *connector)
goto out;
}

intel_hdcp_update_value(connector,
DRM_MODE_CONTENT_PROTECTION_DESIRED,
true);
ret = intel_hdcp1_enable(connector);
if (ret) {
drm_err(&i915->drm, "Failed to enable hdcp (%d)\n", ret);
intel_hdcp_update_value(connector,
DRM_MODE_CONTENT_PROTECTION_DESIRED,
true);
goto out;
}

out:
mutex_unlock(&dig_port->hdcp_mutex);
mutex_unlock(&hdcp->mutex);
Expand Down Expand Up @@ -2056,6 +2062,19 @@ static int intel_hdcp2_check_link(struct intel_connector *connector)

drm_dbg_kms(&i915->drm,
"HDCP2.2 Downstream topology change\n");

ret = hdcp2_authenticate_repeater_topology(connector);
if (!ret) {
Comment on lines +2066 to +2067
intel_hdcp_update_value(connector,
DRM_MODE_CONTENT_PROTECTION_ENABLED,
true);
goto out;
}

drm_dbg_kms(&i915->drm,
"[%s:%d] Repeater topology auth failed.(%d)\n",
connector->base.name, connector->base.base.id,
ret);
} else {
drm_dbg_kms(&i915->drm,
"[%s:%d] HDCP2.2 link failed, retrying auth\n",
Expand Down
Loading
Loading