diff options
| author |   Dave Airlie <airlied@redhat.com> | 2020-12-24 10:31:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-12-24 10:31:16 +1000 |
| commit | 5b2fc08c455bbf749489254a81baeffdf4c0a693 (patch) | |
| tree | 1e231bff632a5ee7440c0cda01f14e4556f8ddd0 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | Merge tag 'drm-misc-next-fixes-2020-12-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
| parent | drm/amd/display: Fix memory leaks in S3 resume (diff) | |
| download | wireguard-linux-5b2fc08c455bbf749489254a81baeffdf4c0a693.tar.xz wireguard-linux-5b2fc08c455bbf749489254a81baeffdf4c0a693.zip | |
Merge tag 'amd-drm-fixes-5.11-2020-12-23' of git://people.freedesktop.org/~agd5f/linux into drm-next
amd-drm-fixes-5.11-2020-12-23:
amdgpu:
- Vangogh SMU fixes
- Arcturus gfx9 fixes
- Misc display fixes
- Sienna Cichlid SMU update
- Fix S3 display memory leak
- Fix regression caused by DP sub-connector support
amdkfd:
- Properly require pcie atomics for gfx10
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201223204752.4019-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 7d2f7a2240b8..1cb7d73f7317 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -5069,8 +5069,7 @@ out: * @pdev: pointer to PCI device * * Called when the error recovery driver tells us that its - * OK to resume normal operation. Use completion to allow - * halted scsi ops to resume. + * OK to resume normal operation. */ void amdgpu_pci_resume(struct pci_dev *pdev) { |