drm/i915: add port power domains

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>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 46 insertions, 5 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ee786c585026..414da19499f9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3962,9 +3962,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;
 
@@ -3975,6 +4015,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;
 }
 
@@ -4008,9 +4051,7 @@ static void modeset_update_crtc_power_domains(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);