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

Commit 1ca17e97 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fix from Dave Airlie:
 "Just a single fix for amdgpu to just suspend the gpu on 'shutdown'
  instead of shutting it down fully, as for some reason the hw was
  getting upset in some situations"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/amdgpu: just suspend the hw on pci shutdown
parents 2b41226b 4e4f3e98

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -2472,6 +2472,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, 
				 struct drm_file *file_priv);

void amdgpu_driver_preclose_kms(struct drm_device *dev,

				struct drm_file *file_priv);

int amdgpu_suspend(struct amdgpu_device *adev);

int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon);

int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon);

u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe);

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

+1 −1
Original line number Diff line number Diff line
@@ -1493,7 +1493,7 @@ static int amdgpu_fini(struct amdgpu_device *adev) 
	return 0;

}



static int amdgpu_suspend(struct amdgpu_device *adev)

int amdgpu_suspend(struct amdgpu_device *adev)

{

	int i, r;

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

+4 −1
Original line number Diff line number Diff line
@@ -479,12 +479,15 @@ amdgpu_pci_remove(struct pci_dev *pdev) 
static void

amdgpu_pci_shutdown(struct pci_dev *pdev)

{

	struct drm_device *dev = pci_get_drvdata(pdev);

	struct amdgpu_device *adev = dev->dev_private;



	/* if we are running in a VM, make sure the device

	 * torn down properly on reboot/shutdown.

	 * unfortunately we can't detect certain

	 * hypervisors so just do this all the time.

	 */

	amdgpu_pci_remove(pdev);

	amdgpu_suspend(adev);

}



static int amdgpu_pmops_suspend(struct device *dev)