diff options
| author |   Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2021-06-02 10:38:08 +0200 |
|---|---|---|
| committer |   Matthew Auld <matthew.auld@intel.com> | 2021-06-02 13:21:24 +0100 |
| commit | d148738923fdb5077089e48ec15555e6008100d0 (patch) | |
| tree | 953dfd00a68894481fbb6784545632620ea2751d /drivers/gpu/drm/i915/gem/i915_gem_pages.c | |
| parent | Revert "i915: use io_mapping_map_user" (diff) | |
| download | linux-dev-d148738923fdb5077089e48ec15555e6008100d0.tar.xz linux-dev-d148738923fdb5077089e48ec15555e6008100d0.zip | |
drm/i915/ttm Initialize the ttm device and memory managers
Temporarily remove the buddy allocator and related selftests
and hook up the TTM range manager for i915 regions.
Also modify the mock region selftests somewhat to account for a
fragmenting manager.
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210602083818.241793-2-thomas.hellstrom@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gem/i915_gem_pages.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c index 7361971c177d..6444e097016d 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c @@ -475,7 +475,8 @@ __i915_gem_object_get_sg(struct drm_i915_gem_object *obj, might_sleep(); GEM_BUG_ON(n >= obj->base.size >> PAGE_SHIFT); - GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj)); + if (!i915_gem_object_has_pinned_pages(obj)) + assert_object_held(obj); /* As we iterate forward through the sg, we record each entry in a * radixtree for quick repeated (backwards) lookups. If we have seen |