From: Imre Deak <imre.deak@intel.com>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 07/19] drm/i915: add port power domains
Date: Mon, 24 Feb 2014 13:52:25 +0200 [thread overview]
Message-ID: <1393242745.13131.43.camel@intelbox> (raw)
In-Reply-To: <20140220113101.6341489e@jbarnes-desktop>
[-- Attachment #1.1: Type: text/plain, Size: 8865 bytes --]
On Thu, 2014-02-20 at 11:31 -0800, Jesse Barnes wrote:
> On Tue, 18 Feb 2014 00:02:08 +0200
> Imre Deak <imre.deak@intel.com> wrote:
>
> > Parts that poke port specific HW blocks like the encoder HW state
> > readout or connector hotplug detect code need a way to check whether
> > required power domains are on or enable/disable these. For this purpose
> > add a set of power domains that refer to the port HW blocks. Get the
> > proper port power domains during modeset.
> >
> > For now when requesting the power domain for a DDI port get it for a 4
> > lane configuration. This can be optimized later to request only the 2
> > lane power domain, when proper support is added on the VLV PHY side for
> > this. Atm, the PHY setup code assumes a 4 lane config in all cases.
> >
> > Signed-off-by: Imre Deak <imre.deak@intel.com>
> > ---
> > drivers/gpu/drm/i915/i915_debugfs.c | 22 ++++++++++++++++
> > drivers/gpu/drm/i915/i915_drv.h | 11 ++++++++
> > drivers/gpu/drm/i915/intel_display.c | 51 ++++++++++++++++++++++++++++++++----
> > drivers/gpu/drm/i915/intel_drv.h | 2 ++
> > drivers/gpu/drm/i915/intel_pm.c | 9 +++++++
> > 5 files changed, 90 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > index d90a707..14c7730 100644
> > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > @@ -2030,6 +2030,28 @@ static const char *power_domain_str(enum intel_display_power_domain domain)
> > return "TRANSCODER_C";
> > case POWER_DOMAIN_TRANSCODER_EDP:
> > return "TRANSCODER_EDP";
> > + case POWER_DOMAIN_PORT_DDI_A_2_LANES:
> > + return "PORT_DDI_A_2_LANES";
> > + case POWER_DOMAIN_PORT_DDI_A_4_LANES:
> > + return "PORT_DDI_A_4_LANES";
> > + case POWER_DOMAIN_PORT_DDI_B_2_LANES:
> > + return "PORT_DDI_B_2_LANES";
> > + case POWER_DOMAIN_PORT_DDI_B_4_LANES:
> > + return "PORT_DDI_B_4_LANES";
> > + case POWER_DOMAIN_PORT_DDI_C_2_LANES:
> > + return "PORT_DDI_C_2_LANES";
> > + case POWER_DOMAIN_PORT_DDI_C_4_LANES:
> > + return "PORT_DDI_C_4_LANES";
> > + case POWER_DOMAIN_PORT_DDI_D_2_LANES:
> > + return "PORT_DDI_D_2_LANES";
> > + case POWER_DOMAIN_PORT_DDI_D_4_LANES:
> > + return "PORT_DDI_D_4_LANES";
> > + case POWER_DOMAIN_PORT_DSI:
> > + return "PORT_DSI";
> > + case POWER_DOMAIN_PORT_CRT:
> > + return "PORT_CRT";
> > + case POWER_DOMAIN_PORT_OTHER:
> > + return "PORT_OTHER";
> > case POWER_DOMAIN_VGA:
> > return "VGA";
> > case POWER_DOMAIN_AUDIO:
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index eaa9210..76bd03a 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -114,6 +114,17 @@ enum intel_display_power_domain {
> > POWER_DOMAIN_TRANSCODER_B,
> > POWER_DOMAIN_TRANSCODER_C,
> > POWER_DOMAIN_TRANSCODER_EDP,
> > + POWER_DOMAIN_PORT_DDI_A_2_LANES,
> > + POWER_DOMAIN_PORT_DDI_A_4_LANES,
> > + POWER_DOMAIN_PORT_DDI_B_2_LANES,
> > + POWER_DOMAIN_PORT_DDI_B_4_LANES,
> > + POWER_DOMAIN_PORT_DDI_C_2_LANES,
> > + POWER_DOMAIN_PORT_DDI_C_4_LANES,
> > + POWER_DOMAIN_PORT_DDI_D_2_LANES,
> > + POWER_DOMAIN_PORT_DDI_D_4_LANES,
> > + POWER_DOMAIN_PORT_DSI,
> > + POWER_DOMAIN_PORT_CRT,
> > + POWER_DOMAIN_PORT_OTHER,
> > POWER_DOMAIN_VGA,
> > POWER_DOMAIN_AUDIO,
> > POWER_DOMAIN_INIT,
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index fa50f6e..7ef06fa 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -3957,9 +3957,49 @@ static void i9xx_pfit_enable(struct intel_crtc *crtc)
> > for ((domain) = 0; (domain) < POWER_DOMAIN_NUM; (domain)++) \
> > if ((1 << (domain)) & (mask))
> >
> > -static unsigned long get_pipe_power_domains(struct drm_device *dev,
> > - enum pipe pipe, bool pfit_enabled)
> > +enum intel_display_power_domain
> > +intel_display_port_power_domain(struct intel_encoder *intel_encoder)
> > {
> > + struct drm_device *dev = intel_encoder->base.dev;
> > + struct intel_digital_port *intel_dig_port;
> > +
> > + switch (intel_encoder->type) {
> > + case INTEL_OUTPUT_UNKNOWN:
> > + /* Only DDI platforms should ever use this output type */
> > + WARN_ON_ONCE(!HAS_DDI(dev));
> > + case INTEL_OUTPUT_DISPLAYPORT:
> > + case INTEL_OUTPUT_HDMI:
> > + case INTEL_OUTPUT_EDP:
> > + intel_dig_port = enc_to_dig_port(&intel_encoder->base);
> > + switch (intel_dig_port->port) {
> > + case PORT_A:
> > + return POWER_DOMAIN_PORT_DDI_A_4_LANES;
> > + case PORT_B:
> > + return POWER_DOMAIN_PORT_DDI_B_4_LANES;
> > + case PORT_C:
> > + return POWER_DOMAIN_PORT_DDI_C_4_LANES;
> > + case PORT_D:
> > + return POWER_DOMAIN_PORT_DDI_D_4_LANES;
> > + default:
> > + WARN_ON_ONCE(1);
> > + return POWER_DOMAIN_PORT_OTHER;
> > + }
> > + case INTEL_OUTPUT_ANALOG:
> > + return POWER_DOMAIN_PORT_CRT;
> > + case INTEL_OUTPUT_DSI:
> > + return POWER_DOMAIN_PORT_DSI;
> > + default:
> > + return POWER_DOMAIN_PORT_OTHER;
> > + }
> > +}
> > +
> > +static unsigned long get_crtc_power_domains(struct drm_crtc *crtc)
> > +{
> > + struct drm_device *dev = crtc->dev;
> > + struct intel_encoder *intel_encoder;
> > + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> > + enum pipe pipe = intel_crtc->pipe;
> > + bool pfit_enabled = intel_crtc->config.pch_pfit.enabled;
> > unsigned long mask;
> > enum transcoder transcoder;
> >
> > @@ -3970,6 +4010,9 @@ static unsigned long get_pipe_power_domains(struct drm_device *dev,
> > if (pfit_enabled)
> > mask |= BIT(POWER_DOMAIN_PIPE_PANEL_FITTER(pipe));
> >
> > + for_each_encoder_on_crtc(dev, crtc, intel_encoder)
> > + mask |= BIT(intel_display_port_power_domain(intel_encoder));
> > +
> > return mask;
> > }
> >
> > @@ -4003,9 +4046,7 @@ static void modeset_update_power_wells(struct drm_device *dev)
> > if (!crtc->base.enabled)
> > continue;
> >
> > - pipe_domains[crtc->pipe] = get_pipe_power_domains(dev,
> > - crtc->pipe,
> > - crtc->config.pch_pfit.enabled);
> > + pipe_domains[crtc->pipe] = get_crtc_power_domains(&crtc->base);
> >
> > for_each_power_domain(domain, pipe_domains[crtc->pipe])
> > intel_display_power_get(dev_priv, domain);
> > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> > index 6042797..e31eb1e 100644
> > --- a/drivers/gpu/drm/i915/intel_drv.h
> > +++ b/drivers/gpu/drm/i915/intel_drv.h
> > @@ -733,6 +733,8 @@ bool intel_crtc_active(struct drm_crtc *crtc);
> > void hsw_enable_ips(struct intel_crtc *crtc);
> > void hsw_disable_ips(struct intel_crtc *crtc);
> > void intel_display_set_init_power(struct drm_i915_private *dev, bool enable);
> > +enum intel_display_power_domain
> > +intel_display_port_power_domain(struct intel_encoder *intel_encoder);
> > int valleyview_get_vco(struct drm_i915_private *dev_priv);
> > void intel_mode_from_pipe_config(struct drm_display_mode *mode,
> > struct intel_crtc_config *pipe_config);
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index faaa4ec..9cb7ed6 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -5412,6 +5412,15 @@ EXPORT_SYMBOL_GPL(i915_release_power_well);
> > #define HSW_ALWAYS_ON_POWER_DOMAINS ( \
> > BIT(POWER_DOMAIN_PIPE_A) | \
> > BIT(POWER_DOMAIN_TRANSCODER_EDP) | \
> > + BIT(POWER_DOMAIN_PORT_DDI_A_2_LANES) | \
> > + BIT(POWER_DOMAIN_PORT_DDI_A_4_LANES) | \
> > + BIT(POWER_DOMAIN_PORT_DDI_B_2_LANES) | \
> > + BIT(POWER_DOMAIN_PORT_DDI_B_4_LANES) | \
> > + BIT(POWER_DOMAIN_PORT_DDI_C_2_LANES) | \
> > + BIT(POWER_DOMAIN_PORT_DDI_C_4_LANES) | \
> > + BIT(POWER_DOMAIN_PORT_DDI_D_2_LANES) | \
> > + BIT(POWER_DOMAIN_PORT_DDI_D_4_LANES) | \
> > + BIT(POWER_DOMAIN_PORT_CRT) | \
> > BIT(POWER_DOMAIN_INIT))
> > #define HSW_DISPLAY_POWER_DOMAINS ( \
> > (POWER_DOMAIN_MASK & ~HSW_ALWAYS_ON_POWER_DOMAINS) | \
>
> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>
> I wonder if we want a way to parameterize the lane count instead, in
> case we end up doing 1 lane for example in the future, or have some
> other power domain that can provide multiple levels of power.
On the requesting side I added a helper that maps an encoder to its
power domain (except for the lane count for now), so that kind of does
what you say. As for the actual macros, I guess we could add ones taking
parameters when - as you point out - the possible configurations grow
and the above definitions become too messy.
--Imre
> But I suppose we can deal with that if/when we come to it.
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2014-02-24 11:52 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-17 22:02 [PATCH 00/19] drm/i915: vlv power domains support Imre Deak
2014-02-17 22:02 ` [PATCH 01/19] drm/i915: use drm_i915_private everywhere in the power domain api Imre Deak
2014-02-20 19:16 ` Jesse Barnes
2014-02-17 22:02 ` [PATCH 02/19] drm/i915: fold in __intel_power_well_get/put functions Imre Deak
2014-02-20 19:17 ` Jesse Barnes
2014-02-20 19:44 ` Chris Wilson
2014-02-24 13:23 ` Paulo Zanoni
2014-02-24 14:07 ` Imre Deak
2014-02-17 22:02 ` [PATCH 03/19] drm/i915: move modeset_update_power_wells earlier Imre Deak
2014-02-20 19:18 ` Jesse Barnes
2014-02-17 22:02 ` [PATCH 04/19] drm/i915: move power domain macros to intel_pm.c Imre Deak
2014-02-20 19:21 ` Jesse Barnes
2014-02-24 13:38 ` Paulo Zanoni
2014-02-24 13:54 ` Imre Deak
2014-02-17 22:02 ` [PATCH 05/19] drm/i915: power domains: add power well ops Imre Deak
2014-02-20 19:26 ` Jesse Barnes
2014-02-24 11:42 ` Imre Deak
2014-02-17 22:02 ` [PATCH 06/19] drm/i915: remove power_well->always_on flag Imre Deak
2014-02-20 19:27 ` Jesse Barnes
2014-02-17 22:02 ` [PATCH 07/19] drm/i915: add port power domains Imre Deak
2014-02-20 19:31 ` Jesse Barnes
2014-02-24 11:52 ` Imre Deak [this message]
2014-03-05 10:11 ` Daniel Vetter
2014-02-17 22:02 ` [PATCH 08/19] drm/i915: get port power domain in connector detect Imre Deak
2014-02-19 12:35 ` Ville Syrjälä
2014-02-19 12:39 ` Imre Deak
2014-02-20 19:33 ` Jesse Barnes
2014-02-24 11:56 ` Imre Deak
2014-03-05 10:15 ` Daniel Vetter
2014-02-17 22:02 ` [PATCH 09/19] drm/i915: check port power domain when reading the encoder hw state Imre Deak
2014-02-20 19:36 ` Jesse Barnes
2014-02-24 12:53 ` Imre Deak
2014-03-05 10:21 ` Daniel Vetter
2014-02-17 22:02 ` [PATCH 10/19] drm/i915: check pipe power domain when reading its " Imre Deak
2014-02-20 19:37 ` Jesse Barnes
2014-03-05 10:24 ` Daniel Vetter
2014-02-17 22:02 ` [PATCH 11/19] drm/i915: vlv: keep first level vblank IRQs masked Imre Deak
2014-02-18 16:54 ` Ville Syrjälä
2014-02-17 22:02 ` [PATCH 12/19] drm/i915: sanitize PUNIT register macro definitions Imre Deak
2014-02-20 19:46 ` Jesse Barnes
2014-02-24 13:12 ` Imre Deak
2014-02-17 22:02 ` [PATCH 13/19] drm/i915: factor out reset_vblank_counter Imre Deak
2014-02-18 16:55 ` Ville Syrjälä
2014-02-17 22:02 ` [PATCH 14/19] drm/i915: switch order of power domain init wrt. irq install Imre Deak
2014-02-20 19:48 ` Jesse Barnes
2014-02-24 13:23 ` Imre Deak
2014-03-05 10:29 ` Daniel Vetter
2014-02-17 22:02 ` [PATCH 15/19] drm/i915: use power domain api to check vga power state Imre Deak
2014-02-20 19:51 ` Jesse Barnes
2014-03-05 10:31 ` Daniel Vetter
2014-02-17 22:02 ` [PATCH 16/19] drm/i915: sanity check power well sw state against hw state Imre Deak
2014-02-18 16:55 ` Ville Syrjälä
2014-02-18 17:37 ` Imre Deak
2014-02-18 17:59 ` Ville Syrjälä
2014-03-05 10:32 ` Daniel Vetter
2014-02-17 22:02 ` [PATCH 17/19] drm/i915: vlv: factor out valleyview_display_irq_install Imre Deak
2014-02-20 19:56 ` Jesse Barnes
2014-02-24 13:34 ` Imre Deak
2014-02-17 22:02 ` [PATCH 18/19] drm/i915: move hsw power domain comment to its right place Imre Deak
2014-02-20 19:53 ` Jesse Barnes
2014-03-05 10:34 ` Daniel Vetter
2014-02-17 22:02 ` [PATCH 19/19] drm/i915: power domains: add vlv power wells Imre Deak
2014-02-19 12:29 ` Ville Syrjälä
2014-02-20 19:58 ` Jesse Barnes
2014-02-26 18:02 ` Imre Deak
2014-02-26 19:52 ` Jesse Barnes
2014-02-27 10:03 ` Imre Deak
2014-03-05 10:38 ` Daniel Vetter
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=1393242745.13131.43.camel@intelbox \
--to=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jbarnes@virtuousgeek.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