diff options
| author | Imre Deak | 2017-07-11 22:42:31 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2017-07-27 09:38:50 +0200 |
| commit | 120b56a2a7a262c0940299615c7bcf97d3982711 (patch) | |
| tree | 19370a9b7e79f925f4da925c2d785caa84cc43dd /drivers | |
| parent | drm/i915: Assign everywhere the always-on power well ID (diff) | |
| download | kernel-qcow2-linux-120b56a2a7a262c0940299615c7bcf97d3982711.tar.gz kernel-qcow2-linux-120b56a2a7a262c0940299615c7bcf97d3982711.tar.xz kernel-qcow2-linux-120b56a2a7a262c0940299615c7bcf97d3982711.zip | |
drm/i915/gen2: Add an ID for the display pipes power well
Make the I830 power well ID assignment explicit for consistency.
v2:
- s/GEN2/I830/ in the comment, since other GEN2s don't have the power
well. (Ville)
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170711204236.5618-2-imre.deak@intel.com
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_runtime_pm.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index aee40eecf688..ef0c1a86a52f 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -1073,6 +1073,12 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) */ enum i915_power_well_id { /* + * I830 + * - custom power well + */ + I830_DISP_PW_PIPES = 0, + + /* * VLV/CHV * - PUNIT_REG_PWRGT_CTRL (bit: id*2), * PUNIT_REG_PWRGT_STATUS (bit: id*2) (PUNIT HAS v0.8) diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index bbade8a5918f..c36ec160b79f 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -2036,6 +2036,7 @@ static struct i915_power_well i830_power_wells[] = { .name = "pipes", .domains = I830_PIPES_POWER_DOMAINS, .ops = &i830_pipes_power_well_ops, + .id = I830_DISP_PW_PIPES, }, }; |