From: Jani Nikula Date: Thu, 22 Aug 2024 16:04:50 +0000 (+0300) Subject: drm/i915/vblank: fix context imbalance warnings X-Git-Tag: v6.12-rc1~126^2~14^2~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58cfea648ff3b3bd283c03f094f24d379fe6fa82;p=thirdparty%2Fkernel%2Flinux.git drm/i915/vblank: fix context imbalance warnings When building for xe, we get the context imbalance warning as the actual locking/unlocking is not compiled: ../drivers/gpu/drm/i915/display/intel_vblank.c:306:13: warning: context imbalance in 'intel_vblank_section_enter' - wrong count at exit ../drivers/gpu/drm/i915/display/intel_vblank.c:314:13: warning: context imbalance in 'intel_vblank_section_exit' - wrong count at exit Fix by adding separata stubs for xe without __acquires/__releases annotation. Reviewed-by: Rodrigo Vivi Link: https://patchwork.freedesktop.org/patch/msgid/111de5bee15f408de65b19ece4b68a7ac66b30cf.1724342644.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c index 551e9ca9bb99c..2073e8075af4d 100644 --- a/drivers/gpu/drm/i915/display/intel_vblank.c +++ b/drivers/gpu/drm/i915/display/intel_vblank.c @@ -303,21 +303,27 @@ int intel_crtc_scanline_to_hw(struct intel_crtc *crtc, int scanline) * all register accesses to the same cacheline to be serialized, * otherwise they may hang. */ +#ifdef I915 static void intel_vblank_section_enter(struct drm_i915_private *i915) __acquires(i915->uncore.lock) { -#ifdef I915 spin_lock(&i915->uncore.lock); -#endif } static void intel_vblank_section_exit(struct drm_i915_private *i915) __releases(i915->uncore.lock) { -#ifdef I915 spin_unlock(&i915->uncore.lock); -#endif } +#else +static void intel_vblank_section_enter(struct drm_i915_private *i915) +{ +} + +static void intel_vblank_section_exit(struct drm_i915_private *i915) +{ +} +#endif static bool i915_get_crtc_scanoutpos(struct drm_crtc *_crtc, bool in_vblank_irq,