• Daniel Vetter's avatar
    drm/i915: Push i915_sw_fence_wait into the nonblocking atomic commit · 42b062b0
    Daniel Vetter authored
    Blocking in a worker is ok, that's what the unbound_wq is for. And it
    unifies the paths between the blocking and nonblocking commit, giving
    me just one path where I have to implement the deadlock avoidance
    trickery in the next patch.
    
    I first tried to implement the following patch without this rework, but
    force-completing i915_sw_fence creates some serious challenges around
    properly cleaning things up. So wasn't a feasible short-term approach.
    Another approach would be to simple keep track of all pending atomic
    commit work items and manually queue them from the reset code. With the
    caveat that double-queue in case we race with the i915_sw_fence must be
    avoided. Given all that, taking the cost of a double schedule in atomic
    for the short-term fix is the best approach, but can be changed in the future of course.
    
    v2: Amend commit message (Chris).
    
    v3: Add comment explaining why we do nothing in the sw_fence complete
    callback (Michel).
    Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
    Cc: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: Mika Kuoppala <mika.kuoppala@intel.com>
    Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
    Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (v2)
    Cc: Michel Thierry <michel.thierry@intel.com>
    Reviewed-by: default avatarMichel Thierry <michel.thierry@intel.com>
    Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20170808080828.23650-2-daniel.vetter@ffwll.ch
    42b062b0
intel_display.c 435 KB