| From ae75c68006432d74c83d2f50d8cd4c9038a249b0 Mon Sep 17 00:00:00 2001 |
| From: Ben Widawsky <ben@bwidawsk.net> |
| Date: Sat, 25 May 2013 12:26:35 -0700 |
| Subject: drm/i915: pre-fixes for checkpatch |
| |
| Since I'll need to modify i915_gem_object_bind_to_gtt(), fix the errors |
| now to get checkpatch to not complain. |
| |
| Signed-off-by: Ben Widawsky <ben@bwidawsk.net> |
| [danvet: Resolve conflict with Chris' improved debug output, and |
| bikeshed the new variable with s/max/gtt_max/ a bit while at it.] |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| |
| (cherry picked from commit 0a9ae0d7f8249da5906c8cac7d56768975c38de4) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_gem.c | 19 ++++++++----------- |
| 1 file changed, 8 insertions(+), 11 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c |
| index 229089c83f25..03103eb57e32 100644 |
| --- a/drivers/gpu/drm/i915/i915_gem.c |
| +++ b/drivers/gpu/drm/i915/i915_gem.c |
| @@ -3000,6 +3000,8 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_object *obj, |
| struct drm_mm_node *node; |
| u32 size, fence_size, fence_alignment, unfenced_alignment; |
| bool mappable, fenceable; |
| + size_t gtt_max = map_and_fenceable ? |
| + dev_priv->gtt.mappable_end : dev_priv->gtt.total; |
| int ret; |
| |
| fence_size = i915_gem_get_gtt_size(dev, |
| @@ -3026,12 +3028,11 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_object *obj, |
| /* If the object is bigger than the entire aperture, reject it early |
| * before evicting everything in a vain attempt to find space. |
| */ |
| - if (obj->base.size > |
| - (map_and_fenceable ? dev_priv->gtt.mappable_end : dev_priv->gtt.total)) { |
| + if (obj->base.size > gtt_max) { |
| DRM_ERROR("Attempting to bind an object larger than the aperture: object=%zd > %s aperture=%ld\n", |
| obj->base.size, |
| map_and_fenceable ? "mappable" : "total", |
| - map_and_fenceable ? dev_priv->gtt.mappable_end : dev_priv->gtt.total); |
| + gtt_max); |
| return -E2BIG; |
| } |
| |
| @@ -3047,14 +3048,10 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_object *obj, |
| return -ENOMEM; |
| } |
| |
| - search_free: |
| - if (map_and_fenceable) |
| - ret = drm_mm_insert_node_in_range_generic(&dev_priv->mm.gtt_space, node, |
| - size, alignment, obj->cache_level, |
| - 0, dev_priv->gtt.mappable_end); |
| - else |
| - ret = drm_mm_insert_node_generic(&dev_priv->mm.gtt_space, node, |
| - size, alignment, obj->cache_level); |
| +search_free: |
| + ret = drm_mm_insert_node_in_range_generic(&dev_priv->mm.gtt_space, node, |
| + size, alignment, |
| + obj->cache_level, 0, gtt_max); |
| if (ret) { |
| ret = i915_gem_evict_something(dev, size, alignment, |
| obj->cache_level, |
| -- |
| 1.8.5.rc3 |
| |