summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-07-30 11:22:48 -0700
committerEric Anholt <eric@anholt.net>2008-07-30 11:25:34 -0700
commit33c8e03787308c2b86a4f724ba7ce4dc43918b6a (patch)
tree5541a392d477ac5dd9c2e4a7c9b4d59d1c9b9c8d /shared-core
parent8fc72aef70cdec71e3dbce548046974aecc15325 (diff)
Revert "Rename drm_mm.c and its fuctions to drm_memrange."
This reverts commit 3ad8db2071d30c198403e605f2726fc5c3e46bfd. We ended up not needing that namespace, and I'd rather not have the churn for producing diffs.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/i915_drv.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 3cd57c21..0ebdab0c 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -277,7 +277,7 @@ typedef struct drm_i915_private {
u8 saveCR[37];
struct {
- struct drm_memrange gtt_space;
+ struct drm_mm gtt_space;
/**
* List of objects currently involved in rendering from the
@@ -378,7 +378,7 @@ struct drm_i915_gem_object {
struct drm_gem_object *obj;
/** Current space allocated to this object in the GTT, if any. */
- struct drm_memrange_node *gtt_space;
+ struct drm_mm_node *gtt_space;
/** This object's place on the active/flushing/inactive lists */
struct list_head list;