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

Commit ee76380c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

drm/amdgpu: remove unnecessary save/restore of pdev->d3_delay 



Remove unnecessary save/restore of pdev->d3_delay.

The only assignments to pdev->d3_delay are in radeon_switcheroo_set_state()
and some quirks, none of which should be relevant in the
amdgpu_switcheroo_set_state() path.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarAndreas Boll <andreas.boll.dev@gmail.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4d071c32

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -1152,16 +1152,12 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero 
		return;

		return;





	if (state == VGA_SWITCHEROO_ON) {

	if (state == VGA_SWITCHEROO_ON) {

		unsigned d3_delay = dev->pdev->d3_delay;



		pr_info("amdgpu: switched on\n");

		pr_info("amdgpu: switched on\n");

		/* don't suspend or resume card normally */

		/* don't suspend or resume card normally */

		dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;

		dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;





		amdgpu_device_resume(dev, true, true);

		amdgpu_device_resume(dev, true, true);





		dev->pdev->d3_delay = d3_delay;



		dev->switch_power_state = DRM_SWITCH_POWER_ON;

		dev->switch_power_state = DRM_SWITCH_POWER_ON;

		drm_kms_helper_poll_enable(dev);

		drm_kms_helper_poll_enable(dev);

	} else {

	} else {