Attachment 397890 Details for Bug 633044

[patch] page flipping offset fix

i915-fix-page-flipping.patch (text/plain), 1.31 KB, created by William Witt on 2010-10-30 15:21:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Witt

Created: 2010-10-30 15:21:12 UTC

Size: 1.31 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 66eb458..5487081 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -4303,28 +4303,27 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
> 	}
> 
> 	/* Offset into the new buffer for cases of shared fbs between CRTCs */
>-	offset = obj_priv->gtt_offset;
>-	offset += (crtc->y * fb->pitch) + (crtc->x * (fb->bits_per_pixel) / 8);
>+	offset = crtc->y * fb->pitch + crtc->x * fb->bits_per_pixel/8;
> 
> 	BEGIN_LP_RING(4);
> 	if (IS_I965G(dev)) {
> 		OUT_RING(MI_DISPLAY_FLIP |
> 			 MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
> 		OUT_RING(fb->pitch);
>-		OUT_RING(offset | obj_priv->tiling_mode);
>+		OUT_RING(obj_priv->gtt_offset | obj_priv->tiling_mode);
> 		pipesrc = I915_READ(pipesrc_reg); 
> 		OUT_RING(pipesrc & 0x0fff0fff);
>-	} else if (IS_GEN3(dev)) {
>+	} else if (IS_GEN3(dev) || IS_GEN2(dev)) {
> 		OUT_RING(MI_DISPLAY_FLIP_I915 |
> 			 MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
> 		OUT_RING(fb->pitch);
>-		OUT_RING(offset);
>+		OUT_RING(obj_priv->gtt_offset + offset);
> 		OUT_RING(MI_NOOP);
> 	} else {
> 		OUT_RING(MI_DISPLAY_FLIP |
> 			 MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
> 		OUT_RING(fb->pitch);
>-		OUT_RING(offset);
>+		OUT_RING(obj_priv->gtt_offset);
> 		OUT_RING(MI_NOOP);
> 	}
> 	ADVANCE_LP_RING();

Actions: View | Diff

Attachments on bug 633044: 384321 | 384323 | 384324 | 396673 | 397890