From 3267e3f9877bcb29fc1b27457f0bd208d68fd4db Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 22 Oct 2010 10:48:12 +0100 Subject: [PATCH] --- yaml --- r: 218341 b: refs/heads/master c: 878a3c37d36142a192bdf5b6bfcf920832f431d7 h: refs/heads/master i: 218339: 8e41a79951089ee34aed6e3ceb49504a6d040096 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7e35e1739ed7..f1f42c99ed3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e27d8538695d1aee69eb4fdd6f98988e6ffc5c33 +refs/heads/master: 878a3c37d36142a192bdf5b6bfcf920832f431d7 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index c3398d396419..9290f02215cb 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -3349,7 +3349,7 @@ i915_gem_execbuffer_relocate(struct drm_i915_gem_object *obj, } target_obj->pending_read_domains |= reloc.read_domains; - target_obj->pending_write_domain = reloc.write_domain; + target_obj->pending_write_domain |= reloc.write_domain; /* If the relocation already has the right value in it, no * more work needs to be done.