Skip to content

Commit 1aaea84

Browse files
icklerodrigovivi
authored andcommitted
drm/i915/gem: Flush all the reloc_gpu batch
__i915_gem_object_flush_map() takes a byte range, so feed it the written bytes and do not mistake the u32 index as bytes! Fixes: a679f58 ("drm/i915: Flush pages on acquisition") Signed-off-by: Chris Wilson <[email protected]> Cc: Matthew Auld <[email protected]> Cc: <[email protected]> # v5.2+ Reviewed-by: Matthew Auld <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 30c88a4) Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent 721017c commit 1aaea84

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -896,11 +896,13 @@ static inline struct i915_ggtt *cache_to_ggtt(struct reloc_cache *cache)
896896

897897
static void reloc_gpu_flush(struct reloc_cache *cache)
898898
{
899-
GEM_BUG_ON(cache->rq_size >= cache->rq->batch->obj->base.size / sizeof(u32));
899+
struct drm_i915_gem_object *obj = cache->rq->batch->obj;
900+
901+
GEM_BUG_ON(cache->rq_size >= obj->base.size / sizeof(u32));
900902
cache->rq_cmd[cache->rq_size] = MI_BATCH_BUFFER_END;
901903

902-
__i915_gem_object_flush_map(cache->rq->batch->obj, 0, cache->rq_size);
903-
i915_gem_object_unpin_map(cache->rq->batch->obj);
904+
__i915_gem_object_flush_map(obj, 0, sizeof(u32) * (cache->rq_size + 1));
905+
i915_gem_object_unpin_map(obj);
904906

905907
intel_gt_chipset_flush(cache->rq->engine->gt);
906908

0 commit comments

Comments
 (0)