Commit 04f7eb3d authored by Nirmoy Das's avatar Nirmoy Das Committed by Matthew Auld
Browse files

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: 420a07b8 ("drm/i915: Individualize fences before adding to dma_resv obj")
Signed-off-by: default avatarNirmoy 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: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220907172641.12555-1-nirmoy.das@intel.com
parent 3bb6a442

drivers/gpu/drm/i915/i915_vma.c

+2 −1
Original line number Diff line number Diff line
@@ -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)