---

yaml --- r: 189987 b: refs/heads/master c: 23010e4 h: refs/heads/master i: 189985: d8344f6 189983: 341f8f2 v: v3
git-mirror · Mar 25, 2010 · 96ad6c1 · 96ad6c1
1 parent b13b204
commit 96ad6c1
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 95 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d06a1e1e9c69244f08beb7d17146483f9dcd120
+refs/heads/master: 23010e43b353c2cdc9725cbedc7e364708039bf7
diff --git a/trunk/drivers/gpu/drm/i915/i915_debugfs.c b/trunk/drivers/gpu/drm/i915/i915_debugfs.c
@@ -225,7 +225,7 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data)
 		} else {
 			struct drm_i915_gem_object *obj_priv;
 
-			obj_priv = obj->driver_private;
+			obj_priv = to_intel_bo(obj);
 			seq_printf(m, "Fenced object[%2d] = %p: %s "
 				   "%08x %08zx %08x %s %08x %08x %d",
 				   i, obj, get_pin_flag(obj_priv),

diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -361,7 +361,7 @@ int i965_reset(struct drm_device *dev, u8 flags)
 	    !dev_priv->mm.suspended) {
 		drm_i915_ring_buffer_t *ring = &dev_priv->ring;
 		struct drm_gem_object *obj = ring->ring_obj;
-		struct drm_i915_gem_object *obj_priv = obj->driver_private;
+		struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);
 		dev_priv->mm.suspended = 0;
 
 		/* Stop the ring if it's running. */

diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h
@@ -731,6 +731,8 @@ struct drm_i915_gem_object {
 	atomic_t pending_flip;
 };
 
+#define to_intel_bo(x) ((struct drm_i915_gem_object *) (x)->driver_private)
+
 /**
  * Request queue structure.
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -731,6 +731,8 @@ struct drm_i915_gem_object { @@
     	atomic_t pending_flip;
     };
+    #define to_intel_bo(x) ((struct drm_i915_gem_object *) (x)->driver_private)
     /**
      * Request queue structure.
      *
@@ Expand Down @@