Skip to content

Commit 08b8129

Browse files
nirmoyrodrigovivi
authored andcommitted
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: 420a07b ("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 (cherry picked from commit 04f7eb3) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent 0785691 commit 08b8129

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/gpu/drm/i915/i915_vma.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1882,12 +1882,13 @@ int _i915_vma_move_to_active(struct i915_vma *vma,
18821882
enum dma_resv_usage usage;
18831883
int idx;
18841884

1885-
obj->read_domains = 0;
18861885
if (flags & EXEC_OBJECT_WRITE) {
18871886
usage = DMA_RESV_USAGE_WRITE;
18881887
obj->write_domain = I915_GEM_DOMAIN_RENDER;
1888+
obj->read_domains = 0;
18891889
} else {
18901890
usage = DMA_RESV_USAGE_READ;
1891+
obj->write_domain = 0;
18911892
}
18921893

18931894
dma_fence_array_for_each(curr, idx, fence)

0 commit comments

Comments
 (0)