intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 2/5] drm/i915/crt: Explicitly return false if connected to a digital monitor
Date: Tue,  5 Apr 2011 10:24:15 +0100	[thread overview]
Message-ID: <1301995458-2699-3-git-send-email-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <1301995458-2699-1-git-send-email-chris@chris-wilson.co.uk>

Rather than proceed on and return false by default, return the result
from detecting a connection but to a digital panel and include some
debug output as to why.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>
---
 drivers/gpu/drm/i915/intel_crt.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 8342259..49ce713 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -308,6 +308,8 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)
 		 * This may be a DVI-I connector with a shared DDC
 		 * link between analog and digital outputs, so we
 		 * have to check the EDID input spec of the attached device.
+		 *
+		 * On the other hand, what should we do if it is a broken EDID?
 		 */
 		if (edid != NULL) {
 			is_digital = edid->input & DRM_EDID_INPUT_DIGITAL;
@@ -318,6 +320,8 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)
 		if (!is_digital) {
 			DRM_DEBUG_KMS("CRT detected via DDC:0x50 [EDID]\n");
 			return true;
+		} else {
+			DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [EDID reports a digital panel]\n");
 		}
 	}
 
-- 
1.7.4.1

  parent reply	other threads:[~2011-04-05  9:24 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-05  9:24 i915 fixes for review Chris Wilson
2011-04-05  9:24 ` [PATCH 1/5] drm/i915: Initialise g4x watermarks for disabled pipes Chris Wilson
2011-04-05 20:56   ` Keith Packard
2011-04-05 21:12     ` Chris Wilson
2011-04-06  1:02       ` Keith Packard
2011-04-06  6:59         ` Chris Wilson
2011-04-06  7:36           ` Keith Packard
2011-04-06  8:02             ` Chris Wilson
2011-04-06 15:12               ` Keith Packard
2011-04-05  9:24 ` Chris Wilson [this message]
2011-04-05 20:57   ` [PATCH 2/5] drm/i915/crt: Explicitly return false if connected to a digital monitor Keith Packard
2011-04-05  9:24 ` [PATCH 3/5] drm/i915/crt: Remove 0xa0 probe for VGA Chris Wilson
2011-04-05  9:24 ` [PATCH 4/5] drm/i915/lvds: Remove 0xA0 DDC probe for LVDS Chris Wilson
2011-04-05  9:24 ` [PATCH 5/5] drm/i915/gmbus: Reset the controller on initialisation Chris Wilson
2011-04-05 16:18   ` Ben Widawsky
2011-04-05 16:27     ` Ben Widawsky
2011-04-05 20:59   ` Keith Packard
2011-04-05 21:26     ` Chris Wilson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1301995458-2699-3-git-send-email-chris@chris-wilson.co.uk \
    --to=chris@chris-wilson.co.uk \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).