diff options
| author | Paulo Zanoni | 2014-07-04 18:38:34 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-07-10 22:16:27 +0200 |
| commit | 930e8c9e79acc0e3f1702dcd2345f4584818c2e9 (patch) | |
| tree | 5b23303e4d95b37839abfae48e94bcbe28716b40 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: don't skip shared DPLL assertion on LPT (diff) | |
| download | kernel-qcow2-linux-930e8c9e79acc0e3f1702dcd2345f4584818c2e9.tar.gz kernel-qcow2-linux-930e8c9e79acc0e3f1702dcd2345f4584818c2e9.tar.xz kernel-qcow2-linux-930e8c9e79acc0e3f1702dcd2345f4584818c2e9.zip | |
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 <paulo.r.zanoni@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |