diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-04-17 06:02:25 -0400 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2018-04-20 05:11:32 -0400 |
| commit | c4c252590951704947d216a2565ee9dec21f704d (patch) | |
| tree | 5a71e2d633c7b3b0ec3c5c2cd5c1e64b35585860 /drivers | |
| parent | b49be6622f08187129561cff0409f7b06b33de57 (diff) | |
drm/i915: Remove skl dc6 enable/disable functions
One is outright unused, other can be made static.
Drive-by cleanup while accidentally reading dc code.
Cc: Imre Deak <imre.deak@intel.com>
Acked-by: Imre Deak <imre.deak@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180417100225.12286-1-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_runtime_pm.c | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 5bd2263407b2..8b20824e806e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
| @@ -1580,8 +1580,6 @@ void bxt_enable_dc9(struct drm_i915_private *dev_priv); | |||
| 1580 | void bxt_disable_dc9(struct drm_i915_private *dev_priv); | 1580 | void bxt_disable_dc9(struct drm_i915_private *dev_priv); |
| 1581 | void gen9_enable_dc5(struct drm_i915_private *dev_priv); | 1581 | void gen9_enable_dc5(struct drm_i915_private *dev_priv); |
| 1582 | unsigned int skl_cdclk_get_vco(unsigned int freq); | 1582 | unsigned int skl_cdclk_get_vco(unsigned int freq); |
| 1583 | void skl_enable_dc6(struct drm_i915_private *dev_priv); | ||
| 1584 | void skl_disable_dc6(struct drm_i915_private *dev_priv); | ||
| 1585 | void intel_dp_get_m_n(struct intel_crtc *crtc, | 1583 | void intel_dp_get_m_n(struct intel_crtc *crtc, |
| 1586 | struct intel_crtc_state *pipe_config); | 1584 | struct intel_crtc_state *pipe_config); |
| 1587 | void intel_dp_set_m_n(struct intel_crtc *crtc, enum link_m_n_set m_n); | 1585 | void intel_dp_set_m_n(struct intel_crtc *crtc, enum link_m_n_set m_n); |
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index 66de4b2dc8b7..ec59992cf87a 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c | |||
| @@ -635,7 +635,7 @@ static void assert_can_enable_dc6(struct drm_i915_private *dev_priv) | |||
| 635 | assert_csr_loaded(dev_priv); | 635 | assert_csr_loaded(dev_priv); |
| 636 | } | 636 | } |
| 637 | 637 | ||
| 638 | void skl_enable_dc6(struct drm_i915_private *dev_priv) | 638 | static void skl_enable_dc6(struct drm_i915_private *dev_priv) |
| 639 | { | 639 | { |
| 640 | assert_can_enable_dc6(dev_priv); | 640 | assert_can_enable_dc6(dev_priv); |
| 641 | 641 | ||
| @@ -649,13 +649,6 @@ void skl_enable_dc6(struct drm_i915_private *dev_priv) | |||
| 649 | gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6); | 649 | gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6); |
| 650 | } | 650 | } |
| 651 | 651 | ||
| 652 | void skl_disable_dc6(struct drm_i915_private *dev_priv) | ||
| 653 | { | ||
| 654 | DRM_DEBUG_KMS("Disabling DC6\n"); | ||
| 655 | |||
| 656 | gen9_set_dc_state(dev_priv, DC_STATE_DISABLE); | ||
| 657 | } | ||
| 658 | |||
| 659 | static void hsw_power_well_sync_hw(struct drm_i915_private *dev_priv, | 652 | static void hsw_power_well_sync_hw(struct drm_i915_private *dev_priv, |
| 660 | struct i915_power_well *power_well) | 653 | struct i915_power_well *power_well) |
| 661 | { | 654 | { |
