Corruption in glxgears with Compiz

Commit Message

Peter Clifton Oct. 23, 2010, 3:35 a.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index cf27655..a9d528e 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1901,7 +1901,9 @@  i915_gem_flush(struct drm_device *dev,
                drm_agp_chipset_flush(dev);
 
        if ((flush_domains | invalidate_domains) & I915_GEM_GPU_DOMAINS) {
-               if (flush_rings & RING_RENDER)
+//        if (1) {
+//             if (flush_rings & RING_RENDER)
+               if (1)
                        i915_gem_flush_ring(dev,
                                            &dev_priv->render_ring,
                                            invalidate_domains, flush_domains);
@@ -4197,6 +4199,7 @@  i915_gem_busy_ioctl(struct drm_device *dev, void *data,
                 * flush earlier is beneficial.
                 */
                if (obj->write_domain & I915_GEM_GPU_DOMAINS) {
+//             if (obj->write_domain) {
                        i915_gem_flush_ring(dev,
                                            obj_priv->ring,
                                            0, obj->write_domain);