Skip to content

Commit 58cfea6

Browse files
committed
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 <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/111de5bee15f408de65b19ece4b68a7ac66b30cf.1724342644.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <[email protected]>
1 parent dd6ded6 commit 58cfea6

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

drivers/gpu/drm/i915/display/intel_vblank.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,21 +303,27 @@ int intel_crtc_scanline_to_hw(struct intel_crtc *crtc, int scanline)
303303
* all register accesses to the same cacheline to be serialized,
304304
* otherwise they may hang.
305305
*/
306+
#ifdef I915
306307
static void intel_vblank_section_enter(struct drm_i915_private *i915)
307308
__acquires(i915->uncore.lock)
308309
{
309-
#ifdef I915
310310
spin_lock(&i915->uncore.lock);
311-
#endif
312311
}
313312

314313
static void intel_vblank_section_exit(struct drm_i915_private *i915)
315314
__releases(i915->uncore.lock)
316315
{
317-
#ifdef I915
318316
spin_unlock(&i915->uncore.lock);
319-
#endif
320317
}
318+
#else
319+
static void intel_vblank_section_enter(struct drm_i915_private *i915)
320+
{
321+
}
322+
323+
static void intel_vblank_section_exit(struct drm_i915_private *i915)
324+
{
325+
}
326+
#endif
321327

322328
static bool i915_get_crtc_scanoutpos(struct drm_crtc *_crtc,
323329
bool in_vblank_irq,

0 commit comments

Comments
 (0)