[Intel-gfx] [PATCH v4 4/4] drm/i915/hdcp: Fill hdcp2_streamid_type and k in appropriate places

[Nautiyal, Ankit K]

On 5/15/2023 4:02 PM, Suraj Kandpal wrote:
> stream_id and k(no of streams) should be set in
> intel_hdcp_set_content_streams. stream_type should be set in
> intel_hdcp_required_content_stream.
>
> Cc: Ankit Nautiyal <ankit.k.nautiyal at intel.com>
> Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>
> Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_hdcp.c | 9 +++------
>   1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 6c3cd3b7db69..350ca3ba5fc8 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -97,7 +97,6 @@ static void intel_hdcp_prepare_streams(struct intel_connector *connector)
>   	struct intel_hdcp *hdcp = &connector->hdcp;
>   
>   	if (!intel_encoder_is_mst(intel_attached_encoder(connector))) {
> -		data->k = 1;
>   		data->streams[0].stream_type = hdcp->content_type;
>   	} else {
>   		intel_hdcp_required_content_stream(dig_port);
> @@ -2159,7 +2158,6 @@ static int initialize_hdcp_port_data(struct intel_connector *connector,
>   {
>   	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>   	struct hdcp_port_data *data = &dig_port->hdcp_port_data;
> -	struct intel_hdcp *hdcp = &connector->hdcp;
>   	enum port port = dig_port->base.port;
>   
>   	if (DISPLAY_VER(dev_priv) < 12)
> @@ -2189,9 +2187,6 @@ static int initialize_hdcp_port_data(struct intel_connector *connector,
>   		drm_err(&dev_priv->drm, "Out of Memory\n");
>   		return -ENOMEM;
>   	}
> -	/* For SST */
> -	data->streams[0].stream_id = 0;
> -	data->streams[0].stream_type = hdcp->content_type;
>   
>   	return 0;
>   }
> @@ -2297,8 +2292,10 @@ intel_hdcp_set_streams(struct intel_digital_port *dig_port,
>   	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
>   	struct hdcp_port_data *data = &dig_port->hdcp_port_data;
>   
> -	if (!intel_encoder_is_mst(&dig_port->base))
> +	if (!intel_encoder_is_mst(&dig_port->base)) {
> +		data->k = 1;

setting data->streams[0].stream_id = 0; is missing from the last patch.

Regards,

Ankit

>   		return 0;
> +	}
>   
>   	data->k = 0;
>