diff options
| author | Christian König <christian.koenig@amd.com> | 2022-11-24 13:30:18 +0100 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2022-12-13 09:46:02 +0100 |
| commit | 58377de46eee1e0066c93f659c91a809432d024c (patch) | |
| tree | 2a2e2919005eaa19e897d1ea52bf6577b9ff4ee2 | |
| parent | 38c8389011e06f16b365799f2cd958536befc2e9 (diff) | |
| download | linux-58377de46eee1e0066c93f659c91a809432d024c.tar.gz | |
drm/i915: stop using ttm_bo_wait
TTM is just wrapping core DMA functionality here, remove the mid-layer.
No functional change.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221125102137.1801-7-christian.koenig@amd.com
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c index 5247d88b3c13..d409a77449a3 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -599,13 +599,16 @@ i915_ttm_resource_get_st(struct drm_i915_gem_object *obj, static int i915_ttm_truncate(struct drm_i915_gem_object *obj) { struct ttm_buffer_object *bo = i915_gem_to_ttm(obj); - int err; + long err; WARN_ON_ONCE(obj->mm.madv == I915_MADV_WILLNEED); - err = ttm_bo_wait(bo, true, false); - if (err) + err = dma_resv_wait_timeout(bo->base.resv, DMA_RESV_USAGE_BOOKKEEP, + true, 15 * HZ); + if (err < 0) return err; + if (err == 0) + return -EBUSY; err = i915_ttm_move_notify(bo); if (err) |