diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2021-06-14 06:56:22 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2021-06-14 06:56:22 +0200 |
| commit | bfd616ff9a2602ec66414438c3f9871a49fa1e16 (patch) | |
| tree | 3532c79ea9e2b611b613608cb6082b3bb182ecb5 /drivers/gpu/drm/i915/gem/i915_gem_create.c | |
| parent | 00f4471e42c871524c68ef1413d2fe53ce1d0a1b (diff) | |
| parent | cf3e3e86d77970211e0983130e896ae242601003 (diff) | |
| download | linux-bfd616ff9a2602ec66414438c3f9871a49fa1e16.tar.bz2 | |
Merge tag 'tags/topic/i915-ttm-2021-06-11' into drm-misc-next
drm-misc and drm-intel pull request for topic/i915-ttm:
- Convert i915 lmem handling to ttm.
- Add a patch to temporarily add a driver_private member to vma_node.
- Use this to allow mixed object mmap handling for i915.
Diffstat (limited to 'drivers/gpu/drm/i915/gem/i915_gem_create.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_create.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_create.c b/drivers/gpu/drm/i915/gem/i915_gem_create.c index 548ddf39d853..93bf63bbaff1 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_create.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_create.c @@ -85,13 +85,10 @@ i915_gem_setup(struct drm_i915_gem_object *obj, u64 size) return -E2BIG; /* - * For now resort to CPU based clearing for device local-memory, in the - * near future this will use the blitter engine for accelerated, GPU - * based clearing. + * I915_BO_ALLOC_USER will make sure the object is cleared before + * any user access. */ - flags = 0; - if (mr->type == INTEL_MEMORY_LOCAL) - flags = I915_BO_ALLOC_CPU_CLEAR; + flags = I915_BO_ALLOC_USER; ret = mr->ops->init_object(mr, obj, size, flags); if (ret) |