This is a note to let you know that I've just added the patch titled
drm/i915: Fix sdvo connector get_hw_state function
to the 3.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-fix-sdvo-connector-get_hw_state-function.patch
and it can be found in the queue-3.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From bd6946e87a98fea11907b2a47368e13044458a35 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@xxxxxxxx>
Date: Tue, 2 Apr 2013 21:30:34 +0200
Subject: drm/i915: Fix sdvo connector get_hw_state function
From: Daniel Vetter <daniel.vetter@xxxxxxxx>
commit bd6946e87a98fea11907b2a47368e13044458a35 upstream.
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.
v2: Fix up Bugzilla links.
v3: Simplify logic a bit (Chris).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=60138
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=63031
Cc: Egbert Eich <eich@xxxxxxxxxxxxxxxxxxx>
Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Tested-by: Egbert Eich <eich@xxxxxxxxxxxxxxxxxxx> (v2)
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/intel_sdvo.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1219,8 +1219,12 @@ static bool intel_sdvo_connector_get_hw_
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;
+ if (!(I915_READ(intel_sdvo->sdvo_reg) & SDVO_ENABLE))
+ return false;
+
intel_sdvo_get_active_outputs(intel_sdvo, &active_outputs);
if (active_outputs & intel_sdvo_connector->output_flag)
Patches currently in stable-queue which might be from daniel.vetter@xxxxxxxx are
queue-3.9/drm-prime-keep-a-reference-from-the-handle-to-exported-dma-buf-v6.patch
queue-3.9/drm-i915-fix-sdvo-connector-and-encoder-get_hw_state-functions.patch
queue-3.9/drm-prime-fix-refcounting-on-the-dmabuf-import-error-path.patch
queue-3.9/drm-i915-add-no-lvds-quirk-for-fujitsu-esprimo-q900.patch
queue-3.9/drm-i915-fix-sdvo-connector-get_hw_state-function.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html