| Message ID | 1367933326-32729-1-git-send-email-luis.henriques@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index e75d794..78486c7 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -421,11 +421,6 @@ static int init_render_ring(struct intel_ring_buffer *ring) if (INTEL_INFO(dev)->gen >= 6) I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(ASYNC_FLIP_PERF_DISABLE)); - /* Required for the hardware to program scanline values for waiting */ - if (INTEL_INFO(dev)->gen == 6) - I915_WRITE(GFX_MODE, - _MASKED_BIT_ENABLE(GFX_TLB_INVALIDATE_ALWAYS)); - if (IS_GEN7(dev)) I915_WRITE(GFX_MODE_GEN7, _MASKED_BIT_DISABLE(GFX_TLB_INVALIDATE_ALWAYS) |
This is a note to let you know that I have just added a patch titled Revert "drm/i915: GFX_MODE Flush TLB Invalidate Mode must be to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Luis ------ From c80245866fcdaebbbe552f8ae03a754f3b878944 Mon Sep 17 00:00:00 2001 From: Luis Henriques <luis.henriques@canonical.com> Date: Tue, 7 May 2013 11:42:25 +0100 Subject: [PATCH] Revert "drm/i915: GFX_MODE Flush TLB Invalidate Mode must be '1' for scanline waits" This reverts commit 899b5509abbdfee2eab408e7178e559346091ad3, which is commit f05bb0c7b624252a5e768287e340e8e45df96e42 in Linus' tree. This commit has been shown to cause GPU hangs on Sandy Bridge GPUs BugLink: http://bugs.launchpad.net/bugs/1140716 Signed-off-by: Steve Conklin <sconklin@canonical.com> Acked-by: Brad Figg <brad.figg@canonical.com> Acked-by: Luis Henriques <luis.henriques@canonical.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Ben Widawsky <ben@bwidawsk.net> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Luis Henriques <luis.henriques@canonical.com> --- drivers/gpu/drm/i915/intel_ringbuffer.c | 5 ----- 1 file changed, 5 deletions(-) -- 1.8.1.2