Attachment 75200 Details for Bug 60138 – fix sdvo connector get_hw_state function

[patch] fix sdvo connector get_hw_state function

0001-drm-i915-Fix-sdvo-connector-get_hw_state-function.patch (text/plain), 1.52 KB, created by Daniel Vetter on 2013-02-20 20:05:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2013-02-20 20:05:41 UTC

Size: 1.52 KB

patch

obsolete

>From cfb57245a5f63f7ec1a0063f6ff464dda85182bf Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Wed, 20 Feb 2013 21:03:22 +0100
>Subject: [PATCH] drm/i915: Fix sdvo connector get_hw_state function
>
>The active output is only the currently selected one, which does not
>imply that it's actually enabled. Since we don't use the sdvo encoder
>side dpms support, we need to check whether the chip-side sdvo port is
>enabled instead.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=60138
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/intel_sdvo.c |    6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
>index 33b46d9..0e55bee 100644
>--- a/drivers/gpu/drm/i915/intel_sdvo.c
>+++ b/drivers/gpu/drm/i915/intel_sdvo.c
>@@ -1219,11 +1219,15 @@ static bool intel_sdvo_connector_get_hw_state(struct intel_connector *connector)
> 	struct intel_sdvo_connector *intel_sdvo_connector =
> 		to_intel_sdvo_connector(&connector->base);
> 	struct intel_sdvo *intel_sdvo = intel_attached_sdvo(&connector->base);
>+	struct drm_i915_private *dev_priv = intel_sdvo->base.base.dev->dev_private;
> 	u16 active_outputs;
>+	u32 tmp;
> 
>+	tmp = I915_READ(intel_sdvo->sdvo_reg);
> 	intel_sdvo_get_active_outputs(intel_sdvo, &active_outputs);
> 
>-	if (active_outputs & intel_sdvo_connector->output_flag)
>+	if ((active_outputs & intel_sdvo_connector->output_flag) &&
>+	    (tmp & SDVO_ENABLE))
> 		return true;
> 	else
> 		return false;
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 60138: 74019 | 74020 | 75200

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.