]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/i915/hdcp: Use correct function to check if encoder is HDMI
authorSuraj Kandpal <suraj.kandpal@intel.com>
Fri, 17 Jan 2025 04:12:48 +0000 (09:42 +0530)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 3 Feb 2025 14:26:38 +0000 (09:26 -0500)
Use intel_encoder_is_hdmi function which was recently introduced to
see if encoder is HDMI or not.

--v2
-Add Fixes tag [Jani]

Fixes: 6a3691ca4799 ("drm/i915/hdcp: Disable HDCP Line Rekeying for HDCP2.2 on HDMI")
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250117041247.1084381-1-suraj.kandpal@intel.com
(cherry picked from commit 2499212e21601740ed7d5563563f39cf7e7d833a)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/display/intel_hdcp.c

index c60b22aaa819ea471cec5832acccd6a4bb73cdb4..1bab7c34a79427fe81186311dff66054ad023743 100644 (file)
@@ -41,7 +41,7 @@ intel_hdcp_adjust_hdcp_line_rekeying(struct intel_encoder *encoder,
        u32 rekey_bit = 0;
 
        /* Here we assume HDMI is in TMDS mode of operation */
-       if (encoder->type != INTEL_OUTPUT_HDMI)
+       if (!intel_encoder_is_hdmi(encoder))
                return;
 
        if (DISPLAY_VER(display) >= 30) {