]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915: remove HAS_PCH_NOP() dependency from clock gating
authorLuca Coelho <luciano.coelho@intel.com>
Tue, 28 Apr 2026 09:48:26 +0000 (12:48 +0300)
committerLuca Coelho <luciano.coelho@intel.com>
Tue, 5 May 2026 12:26:52 +0000 (15:26 +0300)
intel_pch_init_clock_gating() already handles unsupported PCH types,
including PCH_NOP, by doing nothing.

Drop the explicit HAS_PCH_NOP() check from the IVB clock gating
path and always call the display helper directly. This removes one
more direct dependency on display-side PCH macros from
intel_clock_gating.c.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20260428095104.818360-9-luciano.coelho@intel.com
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
drivers/gpu/drm/i915/intel_clock_gating.c

index c27b6f9266b10a4361c612007dde1bb941a403eb..86bdeb20f427d768bfb214b58e7f9766555c1ad6 100644 (file)
@@ -31,7 +31,7 @@
 #include <drm/intel/mchbar_regs.h>
 
 #include "display/intel_display_clock_gating.h"
-#include "display/intel_display_core.h"
+#include "display/intel_pch.h"
 #include "gt/intel_engine_regs.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_mcr.h"
@@ -290,8 +290,7 @@ static void ivb_init_clock_gating(struct drm_i915_private *i915)
        intel_uncore_rmw(&i915->uncore, GEN6_MBCUNIT_SNPCR, GEN6_MBC_SNPCR_MASK,
                         GEN6_MBC_SNPCR_MED);
 
-       if (!HAS_PCH_NOP(display))
-               intel_pch_init_clock_gating(display);
+       intel_pch_init_clock_gating(display);
 
        gen6_check_mch_setup(i915);
 }