Attachment 59709 Details for Bug 48491 – There is no spoon.

[patch] There is no spoon.

0001-drm-i915-crt-Only-support-DPMS-On-Off-with-the-PCH-r.patch (text/plain), 1.99 KB, created by Chris Wilson on 2012-04-10 01:37:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2012-04-10 01:37:05 UTC

Size: 1.99 KB

patch

obsolete

>From 08df0796b4029d068278cbc22c4e0227c50f3cbe Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Tue, 10 Apr 2012 09:32:48 +0100
>Subject: [PATCH] drm/i915/crt: Only support DPMS On/Off with the PCH
> registers
>
>As part of the PCH split, the ability to control CRT standby/suspend
>states was defeatured; the bits are now marked reserved and apparently
>have no effect.
>
>Reported-by: Ouping Zhang <ouping.zhang@intel.com>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48491
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/intel_crt.c |   24 ++++++++++++++++++------
> 1 file changed, 18 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
>index 70b0f1a..039f101 100644
>--- a/drivers/gpu/drm/i915/intel_crt.c
>+++ b/drivers/gpu/drm/i915/intel_crt.c
>@@ -55,18 +55,30 @@ static struct intel_crt *intel_attached_crt(struct drm_connector *connector)
> 			    struct intel_crt, base);
> }
> 
>+static void intel_pch_crt_dpms(struct drm_encoder *encoder, int mode)
>+{
>+	struct drm_device *dev = encoder->dev;
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+	u32 val;
>+
>+	val = I915_READ(PCH_ADPA);
>+	if (mode == DRM_MODE_DPMS_ON)
>+		val |= ADPA_DAC_ENABLE;
>+	else
>+		val &= ~ADPA_DAC_ENABLE;
>+	I915_WRITE(PCH_ADPA, val);
>+}
>+
> static void intel_crt_dpms(struct drm_encoder *encoder, int mode)
> {
> 	struct drm_device *dev = encoder->dev;
> 	struct drm_i915_private *dev_priv = dev->dev_private;
>-	u32 temp, reg;
>+	u32 temp;
> 
> 	if (HAS_PCH_SPLIT(dev))
>-		reg = PCH_ADPA;
>-	else
>-		reg = ADPA;
>+		return intel_pch_crt_dpms(encoder, mode);
> 
>-	temp = I915_READ(reg);
>+	temp = I915_READ(ADPA);
> 	temp &= ~(ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE);
> 	temp &= ~ADPA_DAC_ENABLE;
> 
>@@ -85,7 +97,7 @@ static void intel_crt_dpms(struct drm_encoder *encoder, int mode)
> 		break;
> 	}
> 
>-	I915_WRITE(reg, temp);
>+	I915_WRITE(ADPA, temp);
> }
> 
> static int intel_crt_mode_valid(struct drm_connector *connector,
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 48491: 59707 | 59709

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.