From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org
Subject: [PATCH v2 3/4] drm/edid: respect connector force for drm_get_edid ddc probe
Date: Fri, 17 Feb 2017 17:20:53 +0200 [thread overview]
Message-ID: <1487344854-18777-4-git-send-email-jani.nikula@intel.com> (raw)
In-Reply-To: <1487344854-18777-1-git-send-email-jani.nikula@intel.com>
Skip DDC probe for forced connector status. Don't try to read the EDID
if the connector is forced off. Skipping probe for forced on connectors
will make more sense when drm_do_get_edid() will handle override and
firmware EDIDs.
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/drm_edid.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 4bb50e0e7110..e1743ab276dc 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1428,7 +1428,10 @@ struct edid *drm_get_edid(struct drm_connector *connector,
{
struct edid *edid;
- if (!drm_probe_ddc(adapter))
+ if (connector->force == DRM_FORCE_OFF)
+ return NULL;
+
+ if (connector->force == DRM_FORCE_UNSPECIFIED && !drm_probe_ddc(adapter))
return NULL;
edid = drm_do_get_edid(connector, drm_do_probe_ddc_edid, adapter);
--
2.1.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2017-02-17 15:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-17 15:20 [PATCH v2 0/4] drm: handle override/firmware edid at the lowest level Jani Nikula
2017-02-17 15:20 ` [PATCH v2 1/4] drm: move edid property update and add modes out of edid firmware loader Jani Nikula
2017-02-17 15:20 ` [PATCH v2 2/4] drm: do not debug log about missing CEA extensions on NULL edid Jani Nikula
2017-02-17 15:20 ` Jani Nikula [this message]
2017-02-17 15:20 ` [PATCH v2 4/4] drm: handle override edid and firmware EDID at drm_do_get_edid() level Jani Nikula
2017-02-26 21:22 ` Daniel Vetter
2017-02-27 15:09 ` Ville Syrjälä
2017-02-27 16:19 ` Daniel Vetter
2017-02-27 16:36 ` Ville Syrjälä
2017-02-17 15:34 ` [PATCH v2 0/4] drm: handle override/firmware edid at the lowest level Ville Syrjälä
2017-02-21 14:15 ` Jani Nikula
2017-02-17 19:22 ` ✓ Fi.CI.BAT: success for drm: handle override/firmware edid at the lowest level (rev2) Patchwork
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=1487344854-18777-4-git-send-email-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--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