| Message ID | 20240215105919.1439549-12-suraj.kandpal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | HDCP MST Type1 fixes | expand |
On 2/15/2024 4:29 PM, Suraj Kandpal wrote: > Whenever LIC fails instead of moving from ENABLED to DESIRED > CP property we directly enable HDCP1.4 without informing the userspace > of this failure in link integrity check. > Now we will just update the value to DESIRED send the event to > userspace and then continue with the normal flow of HDCP enablement. > > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 3bd783b8deac..ad05ab899706 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -1088,15 +1088,9 @@ static int intel_hdcp_check_link(struct intel_connector *connector) > goto out; > } > > - 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; > - } > - > + intel_hdcp_update_value(connector, > + DRM_MODE_CONTENT_PROTECTION_DESIRED, > + true); > out: > mutex_unlock(&dig_port->hdcp_mutex); > mutex_unlock(&hdcp->mutex);
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 3bd783b8deac..ad05ab899706 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -1088,15 +1088,9 @@ static int intel_hdcp_check_link(struct intel_connector *connector) goto out; } - 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; - } - + intel_hdcp_update_value(connector, + DRM_MODE_CONTENT_PROTECTION_DESIRED, + true); out: mutex_unlock(&dig_port->hdcp_mutex); mutex_unlock(&hdcp->mutex);
Whenever LIC fails instead of moving from ENABLED to DESIRED CP property we directly enable HDCP1.4 without informing the userspace of this failure in link integrity check. Now we will just update the value to DESIRED send the event to userspace and then continue with the normal flow of HDCP enablement. Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> --- drivers/gpu/drm/i915/display/intel_hdcp.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)