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 07/21] drm/i915: Check for eDP inside intel_edp_panel_vdd_on/off
Date: Thu, 29 Sep 2011 18:09:39 -0700 [thread overview]
Message-ID: <1317344993-24945-8-git-send-email-keithp@keithp.com> (raw)
In-Reply-To: <1317344993-24945-1-git-send-email-keithp@keithp.com>
Cleans up code dealing with eDP VDD a bit. Remove redundant checks in
callers
Signed-off-by: Keith Packard <keithp@keithp.com>
---
drivers/gpu/drm/i915/intel_dp.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a983d0f..da725d8 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -832,6 +832,8 @@ static void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
struct drm_i915_private *dev_priv = dev->dev_private;
u32 pp;
+ if (!is_edp(intel_dp))
+ return;
/*
* If the panel wasn't on, make sure there's not a currently
* active PP sequence before enabling AUX VDD.
@@ -853,6 +855,8 @@ static void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp)
struct drm_i915_private *dev_priv = dev->dev_private;
u32 pp;
+ if (!is_edp(intel_dp))
+ return;
pp = I915_READ(PCH_PP_CONTROL);
pp &= ~PANEL_UNLOCK_MASK;
pp |= PANEL_UNLOCK_REGS;
@@ -1034,15 +1038,13 @@ static void intel_dp_commit(struct drm_encoder *encoder)
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
struct drm_device *dev = encoder->dev;
- if (is_edp(intel_dp))
- ironlake_edp_panel_vdd_on(intel_dp);
+ ironlake_edp_panel_vdd_on(intel_dp);
intel_dp_start_link_train(intel_dp);
- if (is_edp(intel_dp)) {
+ if (is_edp(intel_dp))
ironlake_edp_panel_on(intel_dp);
- ironlake_edp_panel_vdd_off(intel_dp);
- }
+ ironlake_edp_panel_vdd_off(intel_dp);
intel_dp_complete_link_train(intel_dp);
@@ -1070,15 +1072,13 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode)
if (is_edp(intel_dp) && !is_pch_edp(intel_dp))
ironlake_edp_pll_off(encoder);
} else {
- if (is_edp(intel_dp))
- ironlake_edp_panel_vdd_on(intel_dp);
+ ironlake_edp_panel_vdd_on(intel_dp);
intel_dp_sink_dpms(intel_dp, mode);
if (!(dp_reg & DP_PORT_EN)) {
intel_dp_start_link_train(intel_dp);
- if (is_edp(intel_dp)) {
+ if (is_edp(intel_dp))
ironlake_edp_panel_on(intel_dp);
- ironlake_edp_panel_vdd_off(intel_dp);
- }
+ ironlake_edp_panel_vdd_off(intel_dp);
intel_dp_complete_link_train(intel_dp);
}
if (is_edp(intel_dp))
--
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 ` Keith Packard [this message]
2011-09-30 17:13 ` [Intel-gfx] [PATCH 07/21] drm/i915: Check for eDP inside intel_edp_panel_vdd_on/off 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 ` [PATCH 10/21] drm/i915: Wrap DP EDID fetch functions to enable eDP panel power Keith Packard
2011-09-30 17:32 ` 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-8-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).