diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2020-10-05 20:14:41 +0300 |
---|---|---|
committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2020-10-09 21:12:13 +0300 |
commit | 0f8d2a2b9fd52a554a3e00f415baf2f7eed9e9af (patch) | |
tree | 6b9834921931b109371570c930034e029697489e /drivers/gpu/drm/i915/i915_drv.c | |
parent | f13c2a0032f025fadb57443ed7c2e8eb8e9571df (diff) | |
download | linux-0f8d2a2b9fd52a554a3e00f415baf2f7eed9e9af.tar.gz linux-0f8d2a2b9fd52a554a3e00f415baf2f7eed9e9af.tar.bz2 linux-0f8d2a2b9fd52a554a3e00f415baf2f7eed9e9af.zip |
drm/i915: Rename i915_{save,restore}_state()
i915_{save,restore}_state() are actually all about the display.
Currently they are split into display part + SWF part. But since
the SWF part is also related to the display let's just move that
part into its own thing and flip the roles around so that the
current display part is the main function.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201005171441.26612-1-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 6a3af0db86d2..2641d7e16b5b 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1119,7 +1119,7 @@ static int i915_drm_suspend(struct drm_device *dev) i915_ggtt_suspend(&dev_priv->ggtt); - i915_save_state(dev_priv); + i915_save_display(dev_priv); opregion_target_state = suspend_to_idle(dev_priv) ? PCI_D1 : PCI_D3cold; intel_opregion_suspend(dev_priv, opregion_target_state); @@ -1232,7 +1232,7 @@ static int i915_drm_resume(struct drm_device *dev) intel_csr_ucode_resume(dev_priv); - i915_restore_state(dev_priv); + i915_restore_display(dev_priv); intel_pps_unlock_regs_wa(dev_priv); intel_init_pch_refclk(dev_priv); |