[PATCH 0/9] gpu reset vs modeset fix, plus page_flip removal

Daniel Vetter daniel.vetter at ffwll.ch
Wed Jul 19 12:54:53 UTC 2017


Hi all,

This fixes the dreaded gpu reset vs. modeset deadlocks. And since the defunct
legacy page_flip code is the reason for a bunch of special cases I did remove
that too, on Maarten's request.

Please review, this is currently blocking extended CI runs on our haswell farm
rather badly. The critical patches are up to patch 5.

Compared to last time around I've dropped two patches of dubious benefit, they
broke gen3/4 reset a bit and aren't really needed.

Thanks,
Daniel

Daniel Vetter (9):
  drm/i915: Nuke legacy flip queueing code
  drm/i915: Unbreak gpu reset vs. modeset locking
  drm/i915: Avoid the gpu reset vs. modeset deadlock
  drm/i915: Push i915_sw_fence_wait into the nonblocking atomic commit
  drm/i915: More surgically unbreak the modeset vs reset deadlock
  drm/i915: Rip out legacy page_flip completion/irq handling
  drm/i915: adjust has_pending_fb_unpin to atomic
  drm/i915: Remove intel_flip_work infrastructure
  drm/i915: Drop unpin stall in atomic_prepare_commit

 drivers/gpu/drm/i915/i915_debugfs.c  |   70 ---
 drivers/gpu/drm/i915/i915_drv.c      |    1 -
 drivers/gpu/drm/i915/i915_drv.h      |   10 +-
 drivers/gpu/drm/i915/i915_gem.c      |    2 -
 drivers/gpu/drm/i915/i915_irq.c      |  151 +----
 drivers/gpu/drm/i915/intel_display.c | 1129 +++-------------------------------
 drivers/gpu/drm/i915/intel_drv.h     |   26 +-
 drivers/gpu/drm/i915/intel_sprite.c  |    8 +-
 8 files changed, 94 insertions(+), 1303 deletions(-)

-- 
2.13.2



More information about the dri-devel mailing list