summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_reg.h
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2018-08-06 11:58:42 +0200
committerImre Deak <imre.deak@intel.com>2018-08-08 12:51:20 +0200
commitd9fcdc8d1f8e7b12111bb410abc4c27c411aa5d9 (patch)
tree740f45abcba9f83e779150f84f677b08fdcdfc73 /drivers/gpu/drm/i915/i915_reg.h
parentdrm/i915: Make power well ID names more uniform (diff)
downloadlinux-d9fcdc8d1f8e7b12111bb410abc4c27c411aa5d9.tar.xz
linux-d9fcdc8d1f8e7b12111bb410abc4c27c411aa5d9.zip
drm/i915: Use existing power well IDs where possible
There is no need for separate IDs for power wells on a new platform with the same functionality as an other power well on a previous platform, we can just reuse the ID from the previous platform. This is only possible after the previous patches where we removed dependence on the actual enum values. This also fixes a problem on ICL where in assert_can_enable_dc5/9() we would've failed to look up the PW#2 power well. v2: - Keep an ID assigned for the ICL PW#2 power well too. (Paulo) Cc: Ville Syrjala <ville.syrjala@linux.intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> [Added comment about the ICL PW#2 fix to the commit log] Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180806095843.13294-10-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
-rw-r--r--drivers/gpu/drm/i915/i915_reg.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index ef1fa5054e88..77b031874ee3 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1045,9 +1045,6 @@ enum i915_power_well_id {
SKL_DISP_PW_MISC_IO,
SKL_DISP_PW_1,
SKL_DISP_PW_2,
- BXT_DPIO_CMN_BC,
- ICL_DISP_PW_1,
- ICL_DISP_PW_2,
};
#define PUNIT_REG_PWRGT_CTRL 0x60