[3/9] Revert "drm/i915: Use gtt_space->start for stolen reservation"

Commit Message

Ben Widawsky July 5, 2013, 9:41 p.m. UTC

This reverts commit 7dedae28b41000539b6c18bcf72107c97e4937e4.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.h
---
 drivers/gpu/drm/i915/i915_drv.h        | 2 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c    | 2 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index bd676df..c2d2f90 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1201,7 +1201,7 @@  enum hdmi_force_audio {
 	HDMI_AUDIO_ON,			/* force turn on HDMI audio */
 };
 
-#define I915_GTT_RESERVED (ULONG_MAX)
+#define I915_GTT_RESERVED ((struct drm_mm_node *)0x1)
 #define I915_GTT_OFFSET_NONE ((u32)-1)
 
 struct drm_i915_gem_object_ops {
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 7f85d6f..66929ea 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -632,7 +632,7 @@  void i915_gem_setup_global_gtt(struct drm_device *dev,
 		DRM_DEBUG_KMS("reserving preallocated space: %x + %zx\n",
 			      obj->gtt_offset, obj->base.size);
 
-		BUG_ON(obj->gtt_space->start != I915_GTT_RESERVED);
+		BUG_ON(obj->gtt_space != I915_GTT_RESERVED);
 		obj->gtt_space = drm_mm_create_block(&dev_priv->mm.gtt_space,
 						     obj->gtt_offset,
 						     obj->base.size,
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index 4bb2ccd..aea6221 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -398,7 +398,7 @@  i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
 			return NULL;
 		}
 	} else
-		obj->gtt_space->start = I915_GTT_RESERVED;
+		obj->gtt_space = I915_GTT_RESERVED;
 
 	obj->gtt_offset = gtt_offset;
 	obj->has_global_gtt_mapping = 1;