drm/i915/power: move enum skl_power_gate under display

When the display registers were split off from i915_reg.h, enum
skl_power_gate was left behind. Move it to intel_display_regs.h.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/495054983b74163ca7dcbf5a1b6a24099047bc64.1750855148.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_regs.h b/drivers/gpu/drm/i915/display/intel_display_regs.h
index e101105da4afc800ac9488e6536ae7c4042df5df..fdac72fcebeeb9866dbb8e2c32e6c94383ad9314 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_display_regs.h
@@ -2195,6 +2195,15 @@
 #define   HSW_PWR_WELL_FORCE_ON                        (1 << 19)
 #define HSW_PWR_WELL_CTL6                      _MMIO(0x45414)
 
+/* SKL Fuse Status */
+enum skl_power_gate {
+       SKL_PG0,
+       SKL_PG1,
+       SKL_PG2,
+       ICL_PG3,
+       ICL_PG4,
+};
+
 #define SKL_FUSE_STATUS                                _MMIO(0x42000)
 #define  SKL_FUSE_DOWNLOAD_STATUS              (1 << 31)
 /*

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 8d56b3c4545194214f770c28fbd41f0e72e72927..03b895897f60031c1e9efe16ab67531d2e565b4f 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1203,16 +1203,6 @@
  */
 #define GEN7_SO_WRITE_OFFSET(n)                _MMIO(0x5280 + (n) * 4)
 
-/* SKL Fuse Status */
-enum skl_power_gate {
-       SKL_PG0,
-       SKL_PG1,
-       SKL_PG2,
-       ICL_PG3,
-       ICL_PG4,
-};
-
-
 #define GEN9_TIMESTAMP_OVERRIDE                                _MMIO(0x44074)
 #define  GEN9_TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_SHIFT      0
 #define  GEN9_TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_MASK       0x3ff