leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: unify switcheroo and legacy suspend/resume handlers

Browse Source 
By now we handle switcheroo and legacy suspend/resume the same way, so
no need to keep separate functions for them.

No functional change.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Imre Deak 2014-10-23 19:23:27 +03:00 committed by Daniel Vetter
parent da2bc1b9db
commit fc49b3da0e
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_dma.c
View File

@ -1275,12 +1275,12 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_
dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
/* i915 resume handler doesn't set to D0 */
pci_set_power_state(dev->pdev, PCI_D0);
i915_resume(dev);
i915_resume_legacy(dev);
dev->switch_power_state = DRM_SWITCH_POWER_ON;
} else {
pr_err("switched off\n");
dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
i915_suspend(dev, pmm);
i915_suspend_legacy(dev, pmm);
dev->switch_power_state = DRM_SWITCH_POWER_OFF;
}
}

11
drivers/gpu/drm/i915/i915_drv.c
View File

@ -649,7 +649,7 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev)
return 0;
}
int i915_suspend(struct drm_device *dev, pm_message_t state)
int i915_suspend_legacy(struct drm_device *dev, pm_message_t state)
{
int error;
@ -771,7 +771,7 @@ static int i915_drm_resume_early(struct drm_device *dev)
return ret;
}
static int i915_resume_legacy(struct drm_device *dev)
int i915_resume_legacy(struct drm_device *dev)
{
int ret;
@ -785,11 +785,6 @@ static int i915_resume_legacy(struct drm_device *dev)
return i915_drm_resume(dev);
}
int i915_resume(struct drm_device *dev)
{
return i915_resume_legacy(dev);
}
/**
* i915_reset - reset chip after a hang
* @dev: drm device to reset
@ -1592,7 +1587,7 @@ static struct drm_driver driver = {
.set_busid = drm_pci_set_busid,
/* Used in place of i915_pm_ops for non-DRIVER_MODESET */
.suspend = i915_suspend,
.suspend = i915_suspend_legacy,
.resume = i915_resume_legacy,
.device_is_agp = i915_driver_device_is_agp,

4
drivers/gpu/drm/i915/i915_drv.h
View File

@ -2221,8 +2221,8 @@ struct drm_i915_cmd_table {
extern const struct drm_ioctl_desc i915_ioctls[];
extern int i915_max_ioctl;
extern int i915_suspend(struct drm_device *dev, pm_message_t state);
extern int i915_resume(struct drm_device *dev);
extern int i915_suspend_legacy(struct drm_device *dev, pm_message_t state);
extern int i915_resume_legacy(struct drm_device *dev);
extern int i915_master_create(struct drm_device *dev, struct drm_master *master);
extern void i915_master_destroy(struct drm_device *dev, struct drm_master *master);