[Intel-gfx] [PATCH 0/5] drm/i915: Fix pre-g4x GPU reset, again

ville.syrjala at linux.intel.com ville.syrjala at linux.intel.com
Thu Jun 29 13:49:43 UTC 2017


From: Ville Syrjälä <ville.syrjala at linux.intel.com>

I set out to fix the pre-g4x GPU reset by protecting display commits with
an rw_semaphore. I originally went all out and added infrastructure to track
the committed state (as opposed the latest swapped state), but Daniel suggested 
that we want to backport the thing so I simplified it to just use obj->state
instead. I will be posting the committed state handling as a followup as it
will also DTRT if/when we will start allowing queueing multiple commits per-crtc.

Not sure if we want to put the "committed" state stuf into the atomic helper or
I should just pull it all into i915. Suggestions welcome.

Series available here:
git://github.com/vsyrjala/linux.git reset_commit_rwsem_norefactor_2,

Ville Syrjälä (5):
  drm/atomic: Refactor drm_atomic_state_realloc_connectors()
  drm/atomic: Introduce drm_atomic_helper_duplicate_committed_state()
  drm/i915% Store vma gtt offset in plane state
  drm/i915: Refactor __intel_atomic_commit_tail()
  drm/i915: Solve the GPU reset vs. modeset deadlocks with an
    rw_semaphore

 drivers/gpu/drm/drm_atomic.c         |  43 ++++--
 drivers/gpu/drm/drm_atomic_helper.c  | 123 +++++++++++++++++
 drivers/gpu/drm/i915/i915_drv.h      |   2 +
 drivers/gpu/drm/i915/i915_irq.c      |  44 +-----
 drivers/gpu/drm/i915/intel_display.c | 251 +++++++++++++++++++++++------------
 drivers/gpu/drm/i915/intel_drv.h     |   6 +-
 drivers/gpu/drm/i915/intel_sprite.c  |   8 +-
 include/drm/drm_atomic.h             |   5 +
 include/drm/drm_atomic_helper.h      |   4 +
 9 files changed, 338 insertions(+), 148 deletions(-)

-- 
2.13.0



More information about the Intel-gfx mailing list