> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Suraj
> Kandpal
> Sent: Monday, May 27, 2024 10:51 AM
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah@xxxxxxxxx>; Roper,
> Matthew D <matthew.d.roper@xxxxxxxxx>; Kandpal, Suraj
> <suraj.kandpal@xxxxxxxxx>
> Subject: [PATCH] drm/i915/hdcp: Fix IS_METEORLAKE usage for HDCP line
> rekeying
>
> Replace IS_METEORLAKE usage with a more appropriate macro. While we are
> at it also add the stepping restrictions for other platforms.
>
> Fixes: 6a3691ca4799 ("drm/i915/hdcp: Disable HDCP Line Rekeying for HDCP2.2
> on HDMI")
> Signed-off-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx>
> ---
LGTM,
Reviewed-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@xxxxxxxxx>
> drivers/gpu/drm/i915/display/intel_hdcp.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 02cbbbfd8e25..5767070248bb 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -42,10 +42,11 @@ intel_hdcp_disable_hdcp_line_rekeying(struct
> intel_encoder *encoder,
> return;
>
> if (DISPLAY_VER(dev_priv) >= 14) {
> - if (IS_METEORLAKE(dev_priv))
> + if (IS_DISPLAY_IP_STEP(dev_priv, IP_VER(14, 0), STEP_D0,
> +STEP_FOREVER))
> intel_de_rmw(dev_priv, MTL_CHICKEN_TRANS(hdcp-
> >cpu_transcoder),
> 0, HDCP_LINE_REKEY_DISABLE);
> - else
> + else if (IS_DISPLAY_IP_STEP(dev_priv, IP_VER(14, 1), STEP_B0,
> STEP_FOREVER) ||
> + IS_DISPLAY_IP_STEP(dev_priv, IP_VER(20, 0), STEP_B0,
> STEP_FOREVER))
> intel_de_rmw(dev_priv, TRANS_DDI_FUNC_CTL(hdcp-
> >cpu_transcoder),
> 0,
> TRANS_DDI_HDCP_LINE_REKEY_DISABLE);
> }
> --
> 2.43.2
