diff options
| author | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:45 -0800 |
|---|---|---|
| committer | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:45 -0800 |
| commit | 443c053f51f9173042a2b45d0db7271cebe78198 (patch) | |
| tree | 15828d5741b6704b21dbce435d09d283310e2ad4 /drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | |
| parent | ae00c6637cfe613a17953beb99c181360ff379d6 (diff) | |
| parent | cdeea858d8df9891ed75415f377b3564f899a659 (diff) | |
Merge remote-tracking branch 'drm-intel/drm-intel-gt-next' into drm-tip
# Conflicts:
# drivers/gpu/drm/i915/display/intel_fbc.c
# drivers/gpu/drm/i915/gt/intel_gt.c
# drivers/gpu/drm/i915/i915_driver.c
Diffstat (limited to 'drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c index ee9612a3ee5e..8653855d808b 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c @@ -525,7 +525,7 @@ int i915_ttm_move(struct ttm_buffer_object *bo, bool evict, return ret; } - migration_fence = __i915_ttm_move(bo, ctx, clear, dst_mem, bo->ttm, + migration_fence = __i915_ttm_move(bo, ctx, clear, dst_mem, ttm, dst_rsgt, true, &deps); i915_deps_fini(&deps); } |