summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_pm.c
diff options
context:
space:
mode:
authorPaulo Zanoni2014-07-04 16:27:38 +0200
committerDaniel Vetter2014-07-10 22:12:37 +0200
commitbd2bb1b9a1c8b8f7b673db22d628ffd491669deb (patch)
tree43ba68484caf27b4c34bc4e73470cce779cab73f /drivers/gpu/drm/i915/intel_pm.c
parentdrm/i915: Document that the pll->mode_set hook is optional (diff)
downloadkernel-qcow2-linux-bd2bb1b9a1c8b8f7b673db22d628ffd491669deb.tar.gz
kernel-qcow2-linux-bd2bb1b9a1c8b8f7b673db22d628ffd491669deb.tar.xz
kernel-qcow2-linux-bd2bb1b9a1c8b8f7b673db22d628ffd491669deb.zip
drm/i915: add POWER_DOMAIN_PLLS
And get/put it when needed. The special thing about this commit is that it will now return false in ibx_pch_dpll_get_hw_state() in case the power domain is not enabled. This will fix some WARNs we have 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_pm.c')
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 19c5c26badae..55228df5cf23 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -6346,6 +6346,7 @@ EXPORT_SYMBOL_GPL(i915_get_cdclk_freq);
BIT(POWER_DOMAIN_PORT_DDI_D_2_LANES) | \
BIT(POWER_DOMAIN_PORT_DDI_D_4_LANES) | \
BIT(POWER_DOMAIN_PORT_CRT) | \
+ BIT(POWER_DOMAIN_PLLS) | \
BIT(POWER_DOMAIN_INIT))
#define HSW_DISPLAY_POWER_DOMAINS ( \
(POWER_DOMAIN_MASK & ~HSW_ALWAYS_ON_POWER_DOMAINS) | \