Attachment 25441 Details for Bug 21160 – fix front buffer tiling on 965

[patch] fix front buffer tiling on 965

i915-965-front-buffer-tiling-2.patch (text/plain), 1.66 KB, created by Jesse Barnes on 2009-05-04 15:34:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2009-05-04 15:34:30 UTC

Size: 1.66 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
>index e805b59..5211947 100644
>--- a/drivers/gpu/drm/i915/i915_reg.h
>+++ b/drivers/gpu/drm/i915/i915_reg.h
>@@ -1446,6 +1446,7 @@
> #define   DISPPLANE_NO_LINE_DOUBLE		0
> #define   DISPPLANE_STEREO_POLARITY_FIRST	0
> #define   DISPPLANE_STEREO_POLARITY_SECOND	(1<<18)
>+#define   DISPPLANE_TILED			(1<<10)
> #define DSPAADDR		0x70184
> #define DSPASTRIDE		0x70188
> #define DSPAPOS			0x7018C /* reserved */
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 325d43b..4674003 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -655,6 +655,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
> 	int dspbase = (pipe == 0 ? DSPAADDR : DSPBADDR);
> 	int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);
> 	int dspstride = (pipe == 0) ? DSPASTRIDE : DSPBSTRIDE;
>+	int dsptileoff = (pipe == 0 ? DSPATILEOFF : DSPBTILEOFF);
> 	int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;
> 	u32 dspcntr, alignment;
> 	int ret;
>@@ -731,6 +732,13 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
> 		mutex_unlock(&dev->struct_mutex);
> 		return -EINVAL;
> 	}
>+	if (IS_I965G(dev)) {
>+		if (obj_priv->tiling_mode != I915_TILING_NONE)
>+			dspcntr |= DISPPLANE_TILED;
>+		else
>+			dspcntr &= ~DISPPLANE_TILED;
>+	}
>+
> 	I915_WRITE(dspcntr_reg, dspcntr);
> 
> 	Start = obj_priv->gtt_offset;
>@@ -743,6 +751,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
> 		I915_READ(dspbase);
> 		I915_WRITE(dspsurf, Start);
> 		I915_READ(dspsurf);
>+		I915_WRITE(dsptileoff, (y << 16) | x);
> 	} else {
> 		I915_WRITE(dspbase, Start + Offset);
> 		I915_READ(dspbase);

Actions: View | Splinter Review

Attachments on bug 21160: 24770 | 24771 | 24772 | 25441

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.