Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a9ae0d7 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

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: default avatarBen 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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7ed73da0

drivers/gpu/drm/i915/i915_gem.c

+8 −11
Original line number Diff line number Diff line
@@ -2968,6 +2968,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,
@@ -2994,12 +2996,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;

	}
@@ -3016,13 +3017,9 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_object *obj, 
	}



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);

						  size, alignment,

						  obj->cache_level, 0, gtt_max);

	if (ret) {

		ret = i915_gem_evict_something(dev, size, alignment,

					       obj->cache_level,