diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-10-20 04:22:18 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-10-20 04:22:18 +0000 |
| commit | 75c8c64891bd721901fa9422f425602df2b78ba4 (patch) | |
| tree | 008ae08176f47581db0d0abcad3e952988192cf5 /sys/dev/pci/drm/i915 | |
| parent | 0ba4da780f125dd69c7223e34e4bfb2b87b62549 (diff) | |
use drm_mm from linux 5.7.y
Without this boot time tests from setting amdgpu_testing = 1 fail.
For example on Vega 56:
drm: GART: 512M 0x0000000000000000 - 0x000000001FFFFFFF
...
[drm] Tested GTT->VRAM and VRAM->GTT copy for GTT offset 0xa00000
[drm] Tested GTT->VRAM and VRAM->GTT copy for GTT offset 0xb00000
...
[drm] Tested GTT->VRAM and VRAM->GTT copy for GTT offset 0x1fe00000
[drm] Tested GTT->VRAM and VRAM->GTT copy for GTT offset 0x1ff00000
[drm] *ERROR* 0xffff80000135f858 bind failed
Error while testing BO move
ok kettenis@
Diffstat (limited to 'sys/dev/pci/drm/i915')
| -rw-r--r-- | sys/dev/pci/drm/i915/gem/i915_gem_execbuffer.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_gem.c | 12 |
2 files changed, 0 insertions, 18 deletions
diff --git a/sys/dev/pci/drm/i915/gem/i915_gem_execbuffer.c b/sys/dev/pci/drm/i915/gem/i915_gem_execbuffer.c index b6bf81f647b..971ed84f371 100644 --- a/sys/dev/pci/drm/i915/gem/i915_gem_execbuffer.c +++ b/sys/dev/pci/drm/i915/gem/i915_gem_execbuffer.c @@ -877,13 +877,7 @@ static void reloc_cache_init(struct reloc_cache *cache, cache->use_64bit_reloc = HAS_64BIT_RELOC(i915); cache->has_fence = cache->gen < 4; cache->needs_unfenced = INTEL_INFO(i915)->unfenced_needs_alignment; -#ifdef notyet cache->node.flags = 0; -#else - cache->node.hole_follows = 0; - cache->node.allocated = 0; - cache->node.scanned_block = 0; -#endif cache->rq = NULL; cache->rq_size = 0; diff --git a/sys/dev/pci/drm/i915/i915_gem.c b/sys/dev/pci/drm/i915/i915_gem.c index 92ed27c93ea..5857612aa3c 100644 --- a/sys/dev/pci/drm/i915/i915_gem.c +++ b/sys/dev/pci/drm/i915/i915_gem.c @@ -438,13 +438,7 @@ i915_gem_gtt_pread(struct drm_i915_gem_object *obj, PIN_NOEVICT); if (!IS_ERR(vma)) { node.start = i915_ggtt_offset(vma); -#ifdef notyet node.flags = 0; -#else - node.hole_follows = 0; - node.allocated = 0; - node.scanned_block = 0; -#endif } else { ret = insert_mappable_node(ggtt, &node, PAGE_SIZE); if (ret) @@ -670,13 +664,7 @@ i915_gem_gtt_pwrite_fast(struct drm_i915_gem_object *obj, PIN_NOEVICT); if (!IS_ERR(vma)) { node.start = i915_ggtt_offset(vma); -#ifdef notyet node.flags = 0; -#else - node.hole_follows = 0; - node.allocated = 0; - node.scanned_block = 0; -#endif } else { ret = insert_mappable_node(ggtt, &node, PAGE_SIZE); if (ret) |