]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/i915/ddi: only call shutdown hooks for valid encoders
authorJani Nikula <jani.nikula@intel.com>
Mon, 30 Dec 2024 14:14:45 +0000 (16:14 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 3 Jan 2025 10:28:48 +0000 (12:28 +0200)
DDI might be HDMI or DP only, leaving the other encoder
uninitialized. Calling the shutdown hook on an uninitialized encoder may
lead to a NULL pointer dereference. Check the encoder types (and thus
validity via the DP output_reg or HDMI hdmi_reg checks) before calling
the hooks.

Reported-and-tested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Closes: https://lore.kernel.org/r/20241031105145.2140590-1-senozhatsky@chromium.org
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8b197c50e7f3be2bbc07e3935b21e919815015d5.1735568047.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_ddi.c

index 2c4308506435ec9df7638721e17aabd5fa7cfdb9..36aaa82f453692c1729f57a2a335dd6be95b0cfa 100644 (file)
@@ -4923,8 +4923,10 @@ static void intel_ddi_tc_encoder_suspend_complete(struct intel_encoder *encoder)
 
 static void intel_ddi_encoder_shutdown(struct intel_encoder *encoder)
 {
-       intel_dp_encoder_shutdown(encoder);
-       intel_hdmi_encoder_shutdown(encoder);
+       if (intel_encoder_is_dp(encoder))
+               intel_dp_encoder_shutdown(encoder);
+       if (intel_encoder_is_hdmi(encoder))
+               intel_hdmi_encoder_shutdown(encoder);
 }
 
 static void intel_ddi_tc_encoder_shutdown_complete(struct intel_encoder *encoder)