drm/i915: fix up ring cleanup for the i830/i845 CS tlb w/a
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 5 Jul 2013 21:39:50 +0000 (23:39 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Aug 2013 08:51:09 +0000 (16:51 +0800)
commit5ac4dd137c34860870e0c0438180c2836053eadf
treed1380c27ec2af89ffd384d518fe69d0e0d13fe59
parentd54b22e585edd4401786e7c02cd85bc97fff5ffb
drm/i915: fix up ring cleanup for the i830/i845 CS tlb w/a

commit aaf8a5167291b65e9116cb8736d862965b57c13a upstream.

It's not a good idea to also run the pipe_control cleanup.

This regression has been introduced whith the original cs tlb w/a in

commit b45305fce5bb1abec263fcff9d81ebecd6306ede
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Mon Dec 17 16:21:27 2012 +0100

    drm/i915: Implement workaround for broken CS tlb on i830/845

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64610
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/i915/intel_ringbuffer.c