diff options
| author | Eric Anholt | 2012-01-19 19:50:05 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2012-01-25 09:32:21 +0100 |
| commit | 8d79c3490aecfe6e51f0ba6f9780746fb1434954 (patch) | |
| tree | 955ce685da5caefddd897f6f4c3eeab5e57f3da6 /drivers/gpu/drm/i915 | |
| parent | drm/i915: fixup assert_pipe to take the pipe A quirk into account (diff) | |
| download | kernel-qcow2-linux-8d79c3490aecfe6e51f0ba6f9780746fb1434954.tar.gz kernel-qcow2-linux-8d79c3490aecfe6e51f0ba6f9780746fb1434954.tar.xz kernel-qcow2-linux-8d79c3490aecfe6e51f0ba6f9780746fb1434954.zip | |
drm/i915: Remove the MI_FLUSH_ENABLE setting.
We have always been using the wrong bit -- it's bit 12. However, the
bit also doesn't do anything -- hardware has always accepted the
MI_FLUSH command even when it was specced not to.
Given that there is only one MI_FLUSH emitted in all of the driver
stack on gen6+ (in i965_video.c of the 2d driver, and it should be
using other code to do its flush instead), just remove the MI_FLUSH
enable instead of trying to fix it.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 77e729d4e4f0..b3da17af8997 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -399,8 +399,6 @@ static int init_render_ring(struct intel_ring_buffer *ring) if (INTEL_INFO(dev)->gen > 3) { int mode = VS_TIMER_DISPATCH << 16 | VS_TIMER_DISPATCH; - if (IS_GEN6(dev) || IS_GEN7(dev)) - mode |= MI_FLUSH_ENABLE << 16 | MI_FLUSH_ENABLE; I915_WRITE(MI_MODE, mode); if (IS_GEN7(dev)) I915_WRITE(GFX_MODE_GEN7, |