Message ID | 20190620070319.27729-1-chris@chris-wilson.co.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/3] drm/i915: Rings are always flushed | expand |
Quoting Patchwork (2019-06-20 09:00:43) > == Series Details == > > Series: series starting with [1/3] drm/i915: Rings are always flushed > URL : https://patchwork.freedesktop.org/series/62430/ > State : failure > > == Summary == > > CI Bug Log - changes from CI_DRM_6312 -> Patchwork_13358 > ==================================================== > > Summary > ------- > > **FAILURE** > > Serious unknown changes coming with Patchwork_13358 absolutely need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_13358, please notify your bug team to allow them > to document this new failure mode, which will reduce false positives in CI. > > External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13358/ > > Possible new issues > ------------------- > > Here are the unknown changes that may have been introduced in Patchwork_13358: > > ### IGT changes ### > > #### Possible regressions #### > > * igt@i915_selftest@live_contexts: > - fi-kbl-x1275: [PASS][1] -> [INCOMPLETE][2] > [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6312/fi-kbl-x1275/igt@i915_selftest@live_contexts.html > [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13358/fi-kbl-x1275/igt@i915_selftest@live_contexts.html I fear this is fall out from not retiring during shrinking. We may need to insert a breather into the selftest so it doesn't exhaust memory. -Chris
diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c index 12010e798868..8b1da57c3764 100644 --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c @@ -1219,6 +1219,7 @@ void intel_ring_unpin(struct intel_ring *ring) intel_ring_reset(ring, ring->tail); GEM_BUG_ON(!ring->vma); + i915_vma_unset_ggtt_write(ring->vma); if (i915_vma_is_map_and_fenceable(ring->vma)) i915_vma_unpin_iomap(ring->vma); else
Our intel_rings are always flushed as they are continually used to submit commands to the GPU, and so do not need to be flushed on unpinning. This avoids pulling in the flush_ggtt_writes locking intou our context unpin, which we want to allow from atomic context (for simplicity). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 1 + 1 file changed, 1 insertion(+)