UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Allow i915_gem_setup_global_gtt to fail 

We already needs this just as a safety check in case the preallocation
reservation dance fails. But we definitely need this to be able to
move tha aliasing ppgtt setup back out of the context code to this
place, where it belongs.

Reviewed-by: Michel Thierry <michel.thierry@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-08-06 15:04:50 +02:00
parent 5dc383b05a
commit 6c5566a82c
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/i915/i915_gem.c
View File

@ -4754,7 +4754,12 @@ int i915_gem_init(struct drm_device *dev)
dev_priv->gt.stop_ring = intel_logical_ring_stop; dev_priv->gt.stop_ring = intel_logical_ring_stop;
} }
i915_gem_init_userptr(dev); ret = i915_gem_init_userptr(dev);
if (ret) {
mutex_unlock(&dev->struct_mutex);
return ret;
}
i915_gem_init_global_gtt(dev); i915_gem_init_global_gtt(dev);
ret = i915_gem_context_init(dev); ret = i915_gem_context_init(dev);

16
drivers/gpu/drm/i915/i915_gem_gtt.c
View File

@ -1698,10 +1698,10 @@ static void i915_gtt_color_adjust(struct drm_mm_node *node,
} }
} }
void i915_gem_setup_global_gtt(struct drm_device *dev, int i915_gem_setup_global_gtt(struct drm_device *dev,
unsigned long start, unsigned long start,
unsigned long mappable_end, unsigned long mappable_end,
unsigned long end) unsigned long end)
{ {
/* Let GEM Manage all of the aperture. /* Let GEM Manage all of the aperture.
* *
@ -1734,8 +1734,10 @@ void i915_gem_setup_global_gtt(struct drm_device *dev,
WARN_ON(i915_gem_obj_ggtt_bound(obj)); WARN_ON(i915_gem_obj_ggtt_bound(obj));
ret = drm_mm_reserve_node(&ggtt_vm->mm, &vma->node); ret = drm_mm_reserve_node(&ggtt_vm->mm, &vma->node);
if (ret) if (ret) {
DRM_DEBUG_KMS("Reservation failed\n"); DRM_DEBUG_KMS("Reservation failed: %i\n", ret);
return ret;
}
obj->has_global_gtt_mapping = 1; obj->has_global_gtt_mapping = 1;
} }
@ -1752,6 +1754,8 @@ void i915_gem_setup_global_gtt(struct drm_device *dev,
/* And finally clear the reserved guard page */ /* And finally clear the reserved guard page */
ggtt_vm->clear_range(ggtt_vm, end - PAGE_SIZE, PAGE_SIZE, true); ggtt_vm->clear_range(ggtt_vm, end - PAGE_SIZE, PAGE_SIZE, true);
return 0;
} }
void i915_gem_init_global_gtt(struct drm_device *dev) void i915_gem_init_global_gtt(struct drm_device *dev)

4
drivers/gpu/drm/i915/i915_gem_gtt.h
View File

@ -271,8 +271,8 @@ struct i915_hw_ppgtt {
int i915_gem_gtt_init(struct drm_device *dev); int i915_gem_gtt_init(struct drm_device *dev);
void i915_gem_init_global_gtt(struct drm_device *dev); void i915_gem_init_global_gtt(struct drm_device *dev);
void i915_gem_setup_global_gtt(struct drm_device *dev, unsigned long start, int i915_gem_setup_global_gtt(struct drm_device *dev, unsigned long start,
unsigned long mappable_end, unsigned long end); unsigned long mappable_end, unsigned long end);
int i915_ppgtt_init(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt); int i915_ppgtt_init(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt);