diff options
| author |   Nirmoy Das <nirmoy.das@intel.com> | 2022-09-07 19:26:41 +0200 |
|---|---|---|
| committer |   Matthew Auld <matthew.auld@intel.com> | 2022-09-08 11:06:35 +0100 |
| commit | 04f7eb3d4582a0a4da67c86e55fda7de2df86d91 (patch) | |
| tree | b5e0b6fd60a70fa5021a6123509919c4dace048c | |
| parent | drm/i915: Rename ggtt_view as gtt_view (diff) | |
| download | linux-dev-04f7eb3d4582a0a4da67c86e55fda7de2df86d91.tar.xz linux-dev-04f7eb3d4582a0a4da67c86e55fda7de2df86d91.zip | |
drm/i915: Set correct domains values at _i915_vma_move_to_active
Fix regression introduced by commit:
"drm/i915: Individualize fences before adding to dma_resv obj"
which sets obj->read_domains to 0 for both read and write paths.
Also set obj->write_domain to 0 on read path which was removed by
the commit.
References: https://gitlab.freedesktop.org/drm/intel/-/issues/6639
Fixes: 420a07b841d0 ("drm/i915: Individualize fences before adding to dma_resv obj")
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
Cc: <stable@vger.kernel.org> # v5.16+
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220907172641.12555-1-nirmoy.das@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/i915_vma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index e300f8070c1d..f17c09ead7d7 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -1882,12 +1882,13 @@ int _i915_vma_move_to_active(struct i915_vma *vma, enum dma_resv_usage usage; int idx; - obj->read_domains = 0; if (flags & EXEC_OBJECT_WRITE) { usage = DMA_RESV_USAGE_WRITE; obj->write_domain = I915_GEM_DOMAIN_RENDER; + obj->read_domains = 0; } else { usage = DMA_RESV_USAGE_READ; + obj->write_domain = 0; } dma_fence_array_for_each(curr, idx, fence) |