diff options
| author | Tvrtko Ursulin | 2016-12-01 15:16:44 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin | 2016-12-01 19:01:23 +0100 |
| commit | af6dc7425b359519cdc9399b19029a037827dd21 (patch) | |
| tree | 330dc2d6836671cd7dde718cf0d9a76b0ee9c65d /drivers/gpu/drm/i915/i915_drv.c | |
| parent | drm/i915: Make i915_destroy_error_state take dev_priv (diff) | |
| download | kernel-qcow2-linux-af6dc7425b359519cdc9399b19029a037827dd21.tar.gz kernel-qcow2-linux-af6dc7425b359519cdc9399b19029a037827dd21.tar.xz kernel-qcow2-linux-af6dc7425b359519cdc9399b19029a037827dd21.zip | |
drm/i915: Make i915_save/restore_state and intel_i2c_reset take dev_priv
dev_priv is more appropriate since it is used much more in these.
v2: Commit message and keep the local pdev variable. (Joonas Lahtinen)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.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 809315cad316..bd8994d02813 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1439,7 +1439,7 @@ static int i915_drm_suspend(struct drm_device *dev) i915_gem_suspend_gtt_mappings(dev_priv); - i915_save_state(dev); + i915_save_state(dev_priv); opregion_target_state = suspend_to_idle(dev_priv) ? PCI_D1 : PCI_D3cold; intel_opregion_notify_adapter(dev_priv, opregion_target_state); @@ -1562,7 +1562,7 @@ static int i915_drm_resume(struct drm_device *dev) i915_gem_resume(dev_priv); - i915_restore_state(dev); + i915_restore_state(dev_priv); intel_pps_unlock_regs_wa(dev_priv); intel_opregion_setup(dev_priv); |