[PATCH 08/10] drm/i915/hdcp: Extract hdcp structure from correct connector

[Nautiyal, Ankit K]

LGTM.

Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>

On 2/1/2024 1:09 AM, Suraj Kandpal wrote:
> Currently intel_hdcp is not being extracted from primary connector
> this patch fixes that.
>
> Fixes: 524240b231ea ("drm/i915/hdcp: Propagate aux info in DP HDCP functions")
> Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> index 6d28119f33fd..2cd987645776 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> @@ -389,7 +389,9 @@ intel_dp_hdcp2_wait_for_msg(struct intel_connector *connector,
>   			    const struct hdcp2_dp_msg_data *hdcp2_msg_data)
>   {
>   	struct drm_i915_private *i915 = to_i915(connector->base.dev);
> -	struct intel_hdcp *hdcp = &connector->hdcp;
> +	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> +	struct intel_dp *dp = &dig_port->dp;
> +	struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;
>   	u8 msg_id = hdcp2_msg_data->msg_id;
>   	int ret, timeout;
>   	bool msg_ready = false;
> @@ -505,8 +507,9 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector,
>   {
>   	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
>   	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> -	struct intel_hdcp *hdcp = &connector->hdcp;
>   	struct drm_dp_aux *aux = &dig_port->dp.aux;
> +	struct intel_dp *dp = &dig_port->dp;
> +	struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;
>   	unsigned int offset;
>   	u8 *byte = buf;
>   	ssize_t ret, bytes_to_recv, len;