projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7b6cbae
)
drm/amdgpu: only flush hotplug work without DC
author
Monk Liu
<Monk.Liu@amd.com>
Fri, 19 Jan 2018 11:02:16 +0000
(19:02 +0800)
committer
Alex Deucher
<alexander.deucher@amd.com>
Wed, 28 Feb 2018 19:18:03 +0000
(14:18 -0500)
since hotplug_work is initialized under the case of
no dc support
Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index f6f2a662bb8f2b86de5c9afe23bb4380c0fab4ce..11dfe57bd8bbb32eed0152c4055b5f4488bdab7a 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@
-208,7
+208,8
@@
int amdgpu_irq_init(struct amdgpu_device *adev)
r = drm_irq_install(adev->ddev, adev->ddev->pdev->irq);
if (r) {
adev->irq.installed = false;
- flush_work(&adev->hotplug_work);
+ if (!amdgpu_device_has_dc_support(adev))
+ flush_work(&adev->hotplug_work);
cancel_work_sync(&adev->reset_work);
return r;
}
@@
-234,7
+235,8
@@
void amdgpu_irq_fini(struct amdgpu_device *adev)
adev->irq.installed = false;
if (adev->irq.msi_enabled)
pci_disable_msi(adev->pdev);
- flush_work(&adev->hotplug_work);
+ if (!amdgpu_device_has_dc_support(adev))
+ flush_work(&adev->hotplug_work);
cancel_work_sync(&adev->reset_work);
}