Skip to content

Commit c7cefe4

Browse files
committed
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 <[email protected]> Link: https://lore.kernel.org/r/495054983b74163ca7dcbf5a1b6a24099047bc64.1750855148.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <[email protected]>
1 parent 778fa8a commit c7cefe4

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

drivers/gpu/drm/i915/display/intel_display_regs.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2195,6 +2195,15 @@
21952195
#define HSW_PWR_WELL_FORCE_ON (1 << 19)
21962196
#define HSW_PWR_WELL_CTL6 _MMIO(0x45414)
21972197

2198+
/* SKL Fuse Status */
2199+
enum skl_power_gate {
2200+
SKL_PG0,
2201+
SKL_PG1,
2202+
SKL_PG2,
2203+
ICL_PG3,
2204+
ICL_PG4,
2205+
};
2206+
21982207
#define SKL_FUSE_STATUS _MMIO(0x42000)
21992208
#define SKL_FUSE_DOWNLOAD_STATUS (1 << 31)
22002209
/*

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,16 +1203,6 @@
12031203
*/
12041204
#define GEN7_SO_WRITE_OFFSET(n) _MMIO(0x5280 + (n) * 4)
12051205

1206-
/* SKL Fuse Status */
1207-
enum skl_power_gate {
1208-
SKL_PG0,
1209-
SKL_PG1,
1210-
SKL_PG2,
1211-
ICL_PG3,
1212-
ICL_PG4,
1213-
};
1214-
1215-
12161206
#define GEN9_TIMESTAMP_OVERRIDE _MMIO(0x44074)
12171207
#define GEN9_TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_SHIFT 0
12181208
#define GEN9_TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_MASK 0x3ff

0 commit comments

Comments
 (0)