[Intel-gfx] [PATCH 0/2] Prevent (sleeping) wm updates under vblank evasion

Matt Roper matthew.d.roper at intel.com
Mon Jun 22 18:30:31 PDT 2015


Our low-level plane update functions, which get called while we're under vblank
evasion with IRQ's disabled, currently call intel_update_sprite_watermarks
which is a potentially sleeping operation.  This fumble has been present in the
code ever since we added atomic vblank evasion.  We actually do have a
mechanism to flag the need for wm updates and then perform them once evasion is
finished, but our handling of that flag is a bit busted at the moment (i.e.,
currently only being used when a plane gets disabled).  Let's fix that...

Matt Roper (2):
  drm/i915: Drop parameters to intel_update_sprite_watermarks()
  drm/i915: Update sprite watermarks outside vblank evasion

 drivers/gpu/drm/i915/intel_display.c | 26 +++++++++++++++++---------
 drivers/gpu/drm/i915/intel_drv.h     |  6 +-----
 drivers/gpu/drm/i915/intel_pm.c      | 21 +++++++++++++++------
 drivers/gpu/drm/i915/intel_sprite.c  | 21 ---------------------
 4 files changed, 33 insertions(+), 41 deletions(-)

-- 
2.1.4



More information about the Intel-gfx mailing list