---

yaml --- r: 205123 b: refs/heads/master c: 43b27f4 h: refs/heads/master i: 205121: 5e69593 205119: 0329420 v: v3
git-mirror · Aug 2, 2010 · 6fa0221 · 6fa0221
1 parent 0851f83
commit 6fa0221
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0544edfdc3b8f172944c26b9961ca120feb04798
+refs/heads/master: 43b27f40ebc40758a4acad03ea9fa717ba65d76e
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3645,6 +3645,7 @@ i915_gem_wait_for_pending_flip(struct drm_device *dev,
 	return ret;
 }
 
+
 int
 i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv,
@@ -3792,7 +3793,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 				unsigned long long total_size = 0;
 				int num_fences = 0;
 				for (i = 0; i < args->buffer_count; i++) {
-					obj_priv = object_list[i]->driver_private;
+					obj_priv = to_intel_bo(object_list[i]);
 
 					total_size += object_list[i]->size;
 					num_fences +=