mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
1af87d9126
3.2.16 is the final release in the 3.2-stable series by Greg KH. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
From 2bb2e47c60f77b768affa48bf847526054143d81 Mon Sep 17 00:00:00 2001
|
|
From: Chris Wilson <chris@chris-wilson.co.uk>
|
|
Date: Thu, 22 Mar 2012 15:00:50 +0000
|
|
Subject: [PATCH 28/60] drm/i915: Sanitize BIOS debugging bits from PIPECONF
|
|
|
|
commit f47166d2b0001fcb752b40c5a2d4db986dfbea68 upstream.
|
|
|
|
Quoting the BSpec from time immemorial:
|
|
|
|
PIPEACONF, bits 28:27: Frame Start Delay (Debug)
|
|
|
|
Used to delay the frame start signal that is sent to the display planes.
|
|
Care must be taken to insure that there are enough lines during VBLANK
|
|
to support this setting.
|
|
|
|
An instance of the BIOS leaving these bits set was found in the wild,
|
|
where it caused our modesetting to go all squiffy and skewiff.
|
|
|
|
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47271
|
|
Reported-and-tested-by: Eva Wang <evawang@linpus.com>
|
|
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43012
|
|
Reported-and-tested-by: Carl Richell <carl@system76.com>
|
|
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
|
|
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/gpu/drm/i915/i915_reg.h | 1 +
|
|
drivers/gpu/drm/i915/intel_display.c | 6 ++++++
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
|
|
index 1608d2a..2f99fd4 100644
|
|
--- a/drivers/gpu/drm/i915/i915_reg.h
|
|
+++ b/drivers/gpu/drm/i915/i915_reg.h
|
|
@@ -2312,6 +2312,7 @@
|
|
#define PIPECONF_DISABLE 0
|
|
#define PIPECONF_DOUBLE_WIDE (1<<30)
|
|
#define I965_PIPECONF_ACTIVE (1<<30)
|
|
+#define PIPECONF_FRAME_START_DELAY_MASK (3<<27)
|
|
#define PIPECONF_SINGLE_WIDE 0
|
|
#define PIPECONF_PIPE_UNLOCKED 0
|
|
#define PIPECONF_PIPE_LOCKED (1<<25)
|
|
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
|
|
index 9ec9755..9011f48 100644
|
|
--- a/drivers/gpu/drm/i915/intel_display.c
|
|
+++ b/drivers/gpu/drm/i915/intel_display.c
|
|
@@ -7278,6 +7278,12 @@ static void intel_sanitize_modesetting(struct drm_device *dev,
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
u32 reg, val;
|
|
|
|
+ /* Clear any frame start delays used for debugging left by the BIOS */
|
|
+ for_each_pipe(pipe) {
|
|
+ reg = PIPECONF(pipe);
|
|
+ I915_WRITE(reg, I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK);
|
|
+ }
|
|
+
|
|
if (HAS_PCH_SPLIT(dev))
|
|
return;
|
|
|
|
--
|
|
1.7.9.5
|
|
|