Attachment 75897 Details for Bug 61457 – Simper workaround.

[patch] Simper workaround.

0001-DRM-i915-On-G45-enable-cursor-plane-briefly-after-en.patch (text/plain), 2.91 KB, created by Egbert Eich on 2013-03-04 14:12:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2013-03-04 14:12:41 UTC

Size: 2.91 KB

patch

obsolete

>From 2f691c83b5488c21326a3513f73c1b973c8bbdae Mon Sep 17 00:00:00 2001
>From: Egbert Eich <eich@suse.com>
>Date: Mon, 25 Feb 2013 12:45:10 -0500
>Subject: [PATCH] DRM/i915: On G45 enable cursor plane briefly after enabling
> the display plane.
>
>On G45 some low res modes (800x600 and 1024x768) produce a blank screen
>when the display plane is enabled with with cursor plane off.
>Experiments showed that this issue occurred when the following conditions
>were met:
>a. when a previous mode had the cursor plane enabled (Xserver).
>b. when this or the previous mode was using self refresh. (Due to this
>   the problem is only seen for lew res modes).
>The screens lights up though when the cursor plane gets enabled.
>Therefore the blank screen is only seen in console mode, not when an
>Xserver was active.
>It also seems to be necessary to disable self refresh while briefly
>enabling the cursor plane.
>
>Signed-off-by: Egbert Eich <eich@suse.com>
>Bugzilla: https://bugs.freedesktop.org/attachment.cgi?bugid=61457
>---
> drivers/gpu/drm/i915/intel_display.c |   29 ++++++++++++++++++++++++++++-
> 1 files changed, 28 insertions(+), 1 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 6eb3882..0632bd3 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -1914,6 +1914,31 @@ static void intel_enable_plane(struct drm_i915_private *dev_priv,
> }
> 
> /**
>+ * i9xx_fixup_plane - ugly workaround for G45 to fire up the hardware
>+ * cursor plane briefly if not already running after enabling the display
>+ * plane.
>+ * This workaround avoids occasional blank screens when self refresh is
>+ * enabled.
>+ */
>+void
>+g4x_fixup_plane(struct drm_i915_private *dev_priv, enum pipe pipe)
>+{
>+	u32 cntl = I915_READ(CURCNTR(pipe));
>+
>+	if ((cntl & CURSOR_MODE) == 0) {
>+		u32  base = I915_READ(CURBASE(pipe));
>+		u32 fw_bcl_self = I915_READ(FW_BLC_SELF);
>+
>+		I915_WRITE(FW_BLC_SELF, fw_bcl_self & ~FW_BLC_SELF_EN);
>+		I915_WRITE(CURCNTR(pipe), CURSOR_MODE_64_ARGB_AX);
>+		intel_wait_for_vblank(dev_priv->dev, pipe);
>+		I915_WRITE(CURCNTR(pipe), cntl);
>+		I915_WRITE(CURBASE(pipe), base);
>+		I915_WRITE(FW_BLC_SELF, fw_bcl_self);
>+	}
>+}
>+
>+/**
>  * intel_disable_plane - disable a display plane
>  * @dev_priv: i915 private structure
>  * @plane: plane to disable
>@@ -3618,6 +3643,8 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
> 
> 	intel_enable_pipe(dev_priv, pipe, false);
> 	intel_enable_plane(dev_priv, plane, pipe);
>+	if (IS_G4X(dev))
>+		g4x_fixup_plane(dev_priv, pipe);
> 
> 	intel_crtc_load_lut(crtc);
> 	intel_update_fbc(dev);
>@@ -6337,7 +6364,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
> 				i915_gem_detach_phys_object(dev, intel_crtc->cursor_bo);
> 		} else
> 			i915_gem_object_unpin(intel_crtc->cursor_bo);
>-		drm_gem_object_unreference(&intel_crtc->cursor_bo->base);
>+			drm_gem_object_unreference(&intel_crtc->cursor_bo->base);
> 	}
> 
> 	mutex_unlock(&dev->struct_mutex);
>-- 
>1.7.7
>

Actions: View | Splinter Review

Attachments on bug 61457: 75525 | 75526 | 75744 | 75897

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.