Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc49b3da authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

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



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: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent da2bc1b9

drivers/gpu/drm/i915/i915_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

}

drivers/gpu/drm/i915/i915_drv.c

+3 −8
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/i915/i915_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -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);