---

yaml --- r: 228724 b: refs/heads/master c: 3685092 h: refs/heads/master v: v3
git-mirror · Nov 23, 2010 · ce57a1d · ce57a1d
1 parent 78d3a13
commit ce57a1d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f75377db4d8d81ca4465b54d3c339c70c6a0fa2
+refs/heads/master: 3685092b717882bb9b6801bf3e4b02a106e3b129
diff --git a/trunk/drivers/gpu/drm/i915/i915_debugfs.c b/trunk/drivers/gpu/drm/i915/i915_debugfs.c
@@ -572,9 +572,9 @@ static int i915_ringbuffer_info(struct seq_file *m, void *data)
 static const char *ring_str(int ring)
 {
 	switch (ring) {
-	case RING_RENDER: return "render";
-	case RING_BSD: return "bsd";
-	case RING_BLT: return "blt";
+	case RING_RENDER: return " render";
+	case RING_BSD: return " bsd";
+	case RING_BLT: return " blt";
 	default: return "";
 	}
 }

diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c
@@ -575,7 +575,7 @@ static u32 capture_bo_list(struct drm_i915_error_buffer *err,
 		err->tiling = obj->tiling_mode;
 		err->dirty = obj->dirty;
 		err->purgeable = obj->madv != I915_MADV_WILLNEED;
-		err->ring = obj->ring->id;
+		err->ring = obj->ring ? obj->ring->id : 0;
 
 		if (++i == count)
 			break;