From: Paulo Zanoni Date: Fri, 4 Jul 2014 16:38:34 +0000 (-0300) Subject: drm/i915: check the power domains in ironlake_get_pipe_config() X-Git-Tag: MMI-PSA29.97-13-9~11757^2~49^2~5 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=930e8c9e79acc0e3f1702dcd2345f4584818c2e9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915: check the power domains in ironlake_get_pipe_config() Just like we already do in haswell_get_pipe_config(). This should prevent some WARNs when we run pm_rpm on SNB. Testcase: igt/pm_rpm Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80463 Signed-off-by: Paulo Zanoni Reviewed-by: Damien Lespiau Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 15ade7ec4b74..54381d7a6b8a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7240,6 +7240,10 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc, struct drm_i915_private *dev_priv = dev->dev_private; uint32_t tmp; + if (!intel_display_power_enabled(dev_priv, + POWER_DOMAIN_PIPE(crtc->pipe))) + return false; + pipe_config->cpu_transcoder = (enum transcoder) crtc->pipe; pipe_config->shared_dpll = DPLL_ID_PRIVATE;