[PATCH 04/10] drm/i915/hdcp: Pass drm_dp_aux to read_bcaps function

[Nautiyal, Ankit K]

LGTM.

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

On 2/1/2024 1:09 AM, Suraj Kandpal wrote:
> Pass drm_dp_aux to intel_dp_hdcp_read_bcaps function
> so as to aid in reading the bcaps for the remote monitor
> later on.
>
> Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 12 +++++-------
>   1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> index 9aeee6b49b3d..261de01aa5d8 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> @@ -122,13 +122,13 @@ static int intel_dp_hdcp_read_bstatus(struct intel_digital_port *dig_port,
>   }
>   
>   static
> -int intel_dp_hdcp_read_bcaps(struct intel_digital_port *dig_port,
> +int intel_dp_hdcp_read_bcaps(struct drm_dp_aux *aux,
>   			     u8 *bcaps)
>   {
> -	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> +	struct drm_i915_private *i915 = to_i915(aux->crtc->dev);
>   	ssize_t ret;
>   
> -	ret = drm_dp_dpcd_read(&dig_port->dp.aux, DP_AUX_HDCP_BCAPS,
> +	ret = drm_dp_dpcd_read(aux, DP_AUX_HDCP_BCAPS,
>   			       bcaps, 1);
>   	if (ret != 1) {
>   		drm_dbg_kms(&i915->drm,
> @@ -146,7 +146,7 @@ int intel_dp_hdcp_repeater_present(struct intel_digital_port *dig_port,
>   	ssize_t ret;
>   	u8 bcaps;
>   
> -	ret = intel_dp_hdcp_read_bcaps(dig_port, &bcaps);
> +	ret = intel_dp_hdcp_read_bcaps(&dig_port->dp.aux, &bcaps);
>   	if (ret)
>   		return ret;
>   
> @@ -271,7 +271,7 @@ int intel_dp_hdcp_capable(struct intel_digital_port *dig_port,
>   	ssize_t ret;
>   	u8 bcaps;
>   
> -	ret = intel_dp_hdcp_read_bcaps(dig_port, &bcaps);
> +	ret = intel_dp_hdcp_read_bcaps(&dig_port->dp.aux, &bcaps);
>   	if (ret)
>   		return ret;
>   
> @@ -639,8 +639,6 @@ static
>   int _intel_dp_hdcp2_capable(struct drm_dp_aux *aux,
>   			    bool *capable)
>   {
> -	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> -	struct drm_dp_aux *aux = &dig_port->dp.aux;
>   	u8 rx_caps[3];
>   	int ret;
>