Attachment 81948 Details for Bug 64610 – fix up ring cleanup

[patch] fix up ring cleanup

0001-drm-i915-fix-up-ring-cleanup-for-the-i830-i845-CS-tl.patch (text/plain), 1.49 KB, created by Daniel Vetter on 2013-07-03 10:13:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2013-07-03 10:13:46 UTC

Size: 1.49 KB

patch

obsolete

>From 6d1fa8c3ddb3c52b082e561d3ef5f0c90a191e66 Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Wed, 3 Jul 2013 12:11:31 +0200
>Subject: [PATCH] drm/i915: fix up ring cleanup for the i830/i845 CS tlb w/a
>
>It's not a good idea to also run the pipe_control cleanup.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64610
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/intel_ringbuffer.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
>index e51ab55..7b4ece9 100644
>--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
>+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
>@@ -518,9 +518,6 @@ cleanup_pipe_control(struct intel_ring_buffer *ring)
> 	struct pipe_control *pc = ring->private;
> 	struct drm_i915_gem_object *obj;
> 
>-	if (!ring->private)
>-		return;
>-
> 	obj = pc->obj;
> 
> 	kunmap(sg_page(obj->pages->sgl));
>@@ -528,7 +525,6 @@ cleanup_pipe_control(struct intel_ring_buffer *ring)
> 	drm_gem_object_unreference(&obj->base);
> 
> 	kfree(pc);
>-	ring->private = NULL;
> }
> 
> static int init_render_ring(struct intel_ring_buffer *ring)
>@@ -601,7 +597,10 @@ static void render_ring_cleanup(struct intel_ring_buffer *ring)
> 	if (HAS_BROKEN_CS_TLB(dev))
> 		drm_gem_object_unreference(to_gem_object(ring->private));
> 
>-	cleanup_pipe_control(ring);
>+	if (INTEL_INFO(dev)->gen >= 5)
>+		cleanup_pipe_control(ring);
>+
>+	ring->private = NULL;
> }
> 
> static void
>-- 
>1.8.1.4
>

Actions: View | Splinter Review

Attachments on bug 64610: 79319 | 81001 | 81002 | 81948

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.