From: Keith Packard <keithp@keithp.com>
To: Dave Airlie <airlied@redhat.com>
Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
intel-gfx@lists.freedesktop.org,
Keith Packard <keithp@keithp.com>
Subject: [PATCH 10/21] drm/i915: Wrap DP EDID fetch functions to enable eDP panel power
Date: Thu, 29 Sep 2011 18:09:42 -0700 [thread overview]
Message-ID: <1317344993-24945-11-git-send-email-keithp@keithp.com> (raw)
In-Reply-To: <1317344993-24945-1-git-send-email-keithp@keithp.com>
Talking to the eDP DDC channel requires that the panel be powered
up. Wrap both the EDID and modes fetch code with calls to turn the vdd
power on and back off.
Signed-off-by: Keith Packard <keithp@keithp.com>
---
drivers/gpu/drm/i915/intel_dp.c | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 0b462f9..9829581 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1711,6 +1711,31 @@ g4x_dp_detect(struct intel_dp *intel_dp)
return intel_dp_detect_dpcd(intel_dp);
}
+static struct edid *
+intel_dp_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
+{
+ struct intel_dp *intel_dp = intel_attached_dp(connector);
+ struct edid *edid;
+
+ ironlake_edp_panel_vdd_on(intel_dp);
+ edid = drm_get_edid(connector, adapter);
+ ironlake_edp_panel_vdd_off(intel_dp);
+ return edid;
+}
+
+static int
+intel_dp_get_edid_modes(struct drm_connector *connector, struct i2c_adapter *adapter)
+{
+ struct intel_dp *intel_dp = intel_attached_dp(connector);
+ int ret;
+
+ ironlake_edp_panel_vdd_on(intel_dp);
+ ret = intel_ddc_get_modes(connector, adapter);
+ ironlake_edp_panel_vdd_off(intel_dp);
+ return ret;
+}
+
+
/**
* Uses CRT_HOTPLUG_EN and CRT_HOTPLUG_STAT to detect DP connection.
*
@@ -1743,7 +1768,7 @@ intel_dp_detect(struct drm_connector *connector, bool force)
if (intel_dp->force_audio) {
intel_dp->has_audio = intel_dp->force_audio > 0;
} else {
- edid = drm_get_edid(connector, &intel_dp->adapter);
+ edid = intel_dp_get_edid(connector, &intel_dp->adapter);
if (edid) {
intel_dp->has_audio = drm_detect_monitor_audio(edid);
connector->display_info.raw_edid = NULL;
@@ -1764,7 +1789,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)
/* We should parse the EDID data and find out if it has an audio sink
*/
- ret = intel_ddc_get_modes(connector, &intel_dp->adapter);
+ ret = intel_dp_get_edid_modes(connector, &intel_dp->adapter);
if (ret) {
if (is_edp(intel_dp) && !dev_priv->panel_fixed_mode) {
struct drm_display_mode *newmode;
@@ -1809,7 +1834,7 @@ intel_dp_detect_audio(struct drm_connector *connector)
struct edid *edid;
bool has_audio = false;
- edid = drm_get_edid(connector, &intel_dp->adapter);
+ edid = intel_dp_get_edid(connector, &intel_dp->adapter);
if (edid) {
has_audio = drm_detect_monitor_audio(edid);
--
1.7.6.3
next prev parent reply other threads:[~2011-09-30 1:10 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-19 22:21 drm/i915: eDP cleanup patch series -- fixes SNB MacBook Air Keith Packard
2011-09-19 22:21 ` [PATCH 1/9] drm/i915: Enable digital port hotplug on PCH systems Keith Packard
2011-09-19 22:21 ` [PATCH 2/9] drm/i915: Remove extra 300ms delay during eDP mode setting Keith Packard
2011-09-19 22:21 ` [PATCH 3/9] drm/i915: Only use VBT panel mode on eDP if no EDID is found Keith Packard
2011-09-19 22:21 ` [PATCH 4/9] drm/i915: Check eDP power when doing aux channel communications Keith Packard
2011-09-19 22:21 ` [PATCH 5/9] drm/i915: Unlock PCH_PP_CONTROL always Keith Packard
2011-09-19 22:22 ` [PATCH 6/9] drm/i915: Make sure eDP power is on before using aux channel Keith Packard
2011-09-21 3:50 ` [Intel-gfx] " Jesse Barnes
2011-09-21 4:45 ` Keith Packard
2011-09-23 2:55 ` Jesse Barnes
2011-09-23 5:07 ` Keith Packard
2011-09-19 22:22 ` [PATCH 7/9] drm/i915: Correct eDP panel power sequencing delay computations Keith Packard
2011-09-19 22:22 ` [PATCH 8/9] drm/i915: Move eDP panel fixed mode from dev_priv to intel_dp Keith Packard
2011-09-19 22:22 ` [PATCH 9/9] drm/i915: Disable eDP VDD in a delayed work proc instead of synchronously Keith Packard
2011-09-21 4:17 ` [Intel-gfx] " Jesse Barnes
2011-09-21 4:51 ` Keith Packard
2011-09-23 3:22 ` Jesse Barnes
2011-09-30 1:09 ` [PATCH 00/24] MacBook Air patch sequence (v2) Keith Packard
2011-09-30 1:09 ` [PATCH 01/21] drm/i915: Enable digital port hotplug on PCH systems Keith Packard
2011-09-30 16:17 ` [Intel-gfx] " Daniel Vetter
2011-10-03 20:34 ` Jesse Barnes
2011-09-30 1:09 ` [PATCH 02/21] drm/i915: Shut down PCH interrupts during irq_uninstall Keith Packard
2011-09-30 16:20 ` Daniel Vetter
2011-09-30 17:44 ` Keith Packard
2011-09-30 17:56 ` Daniel Vetter
2011-09-30 1:09 ` [PATCH 03/21] drm/i915: Remove extra 300ms delay during eDP mode setting Keith Packard
2011-09-30 16:27 ` Daniel Vetter
2011-09-30 17:50 ` Keith Packard
2011-09-30 17:58 ` Daniel Vetter
2011-09-30 18:09 ` Daniel Vetter
2011-09-30 18:28 ` Keith Packard
2011-09-30 1:09 ` [PATCH 04/21] drm/i915: Only use VBT panel mode on eDP if no EDID is found Keith Packard
2011-09-30 16:32 ` Daniel Vetter
2011-09-30 17:58 ` Keith Packard
2011-10-03 20:42 ` [Intel-gfx] " Jesse Barnes
2011-09-30 1:09 ` [PATCH 05/21] drm/i915: Check eDP power when doing aux channel communications Keith Packard
2011-09-30 17:02 ` [Intel-gfx] " Daniel Vetter
2011-09-30 18:01 ` Keith Packard
2011-09-30 18:11 ` Daniel Vetter
2011-09-30 18:23 ` Chris Wilson
2011-10-03 20:48 ` Jesse Barnes
2011-09-30 1:09 ` [PATCH 06/21] drm/i915: Unlock PCH_PP_CONTROL always Keith Packard
2011-09-30 17:09 ` [Intel-gfx] " Daniel Vetter
2011-09-30 18:01 ` Keith Packard
2011-09-30 23:14 ` Keith Packard
2011-10-01 9:35 ` Daniel Vetter
2011-09-30 1:09 ` [PATCH 07/21] drm/i915: Check for eDP inside intel_edp_panel_vdd_on/off Keith Packard
2011-09-30 17:13 ` [Intel-gfx] " Daniel Vetter
2011-09-30 18:02 ` Keith Packard
2011-09-30 1:09 ` [PATCH 08/21] drm/i915: Turn force VDD back off when panel running in intel_dp_dpms Keith Packard
2011-09-30 17:15 ` [Intel-gfx] " Daniel Vetter
2011-09-30 1:09 ` [PATCH 09/21] drm/i915: Delay DP i2c initialization until panel power timings are computed Keith Packard
2011-09-30 17:25 ` [Intel-gfx] " Daniel Vetter
2011-09-30 1:09 ` Keith Packard [this message]
2011-09-30 17:32 ` [PATCH 10/21] drm/i915: Wrap DP EDID fetch functions to enable eDP panel power Daniel Vetter
2011-10-03 20:59 ` [Intel-gfx] " Jesse Barnes
2011-09-30 1:09 ` [PATCH 11/21] drm/i915: Enable eDP panel power during I2C initialization sequence Keith Packard
2011-09-30 17:26 ` Daniel Vetter
2011-09-30 1:09 ` [PATCH 12/21] drm/i915: Ensure eDP powered up during DP_SET_POWER operation in dp_prepare Keith Packard
2011-09-30 17:45 ` Daniel Vetter
2011-09-30 18:30 ` Keith Packard
2011-09-30 1:09 ` [PATCH 13/21] drm/i915: Place long delays after each eDP VDD operation Keith Packard
2011-09-30 18:01 ` [Intel-gfx] " Daniel Vetter
2011-09-30 18:31 ` Keith Packard
2011-09-30 1:09 ` [PATCH 14/21] drm/i915: Correct eDP panel power sequencing delay computations Keith Packard
2011-09-30 18:16 ` Daniel Vetter
2011-09-30 18:33 ` Keith Packard
2011-10-01 3:31 ` Keith Packard
2011-10-01 9:59 ` Daniel Vetter
2011-10-01 19:01 ` Keith Packard
2011-10-03 10:10 ` Daniel Vetter
2011-09-30 1:09 ` [PATCH 15/21] drm/i915: Move eDP panel fixed mode from dev_priv to intel_dp Keith Packard
2011-09-30 18:20 ` [Intel-gfx] " Daniel Vetter
2011-09-30 1:09 ` [PATCH 16/21] drm/i915: edp_panel_on does not need to return a bool Keith Packard
2011-09-30 18:21 ` Daniel Vetter
2011-10-03 21:03 ` [Intel-gfx] " Jesse Barnes
2011-09-30 1:09 ` [PATCH 17/21] drm/i915: Create helper functions to determine eDP power state Keith Packard
2011-09-30 18:26 ` [Intel-gfx] " Daniel Vetter
2011-09-30 1:09 ` [PATCH 18/21] drm/i915: Disable eDP VDD in a delayed work proc instead of synchronously Keith Packard
2011-09-30 10:31 ` Chris Wilson
2011-09-30 18:06 ` Keith Packard
2011-09-30 18:47 ` Daniel Vetter
2011-09-30 20:56 ` Keith Packard
2011-09-30 22:01 ` Daniel Vetter
2011-09-30 1:09 ` [PATCH 19/21] drm/i915: Asynchronous eDP panel power off Keith Packard
2011-09-30 18:55 ` Daniel Vetter
2011-09-30 20:57 ` Keith Packard
2011-10-12 14:41 ` Dave Airlie
2011-10-12 16:43 ` Keith Packard
2011-09-30 1:09 ` [PATCH 20/21] drm/i915: Restrict ILK-specific eDP power hack to ILK Keith Packard
2011-09-30 18:57 ` Daniel Vetter
2011-09-30 1:09 ` [PATCH 21/21] drm/i915: No need to wait for eDP power off delay if panel is on Keith Packard
2011-09-30 19:01 ` Daniel Vetter
2011-09-30 3:33 ` [PATCH 00/24] MacBook Air patch sequence (v2) Greg KH
2011-09-30 8:58 ` Keith Packard
2011-09-30 13:57 ` Greg KH
2011-09-30 18:10 ` Keith Packard
2011-09-30 13:20 ` Ted Ts'o
2011-09-30 18:17 ` Keith Packard
2011-10-03 21:06 ` [Intel-gfx] " Jesse Barnes
2011-10-11 8:04 ` 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=1317344993-24945-11-git-send-email-keithp@keithp.com \
--to=keithp@keithp.com \
--cc=airlied@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.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).