diff options
| author | Joonas Lahtinen <[email protected]> | 2025-05-28 07:20:17 +0000 |
|---|---|---|
| committer | Joonas Lahtinen <[email protected]> | 2025-05-28 07:20:17 +0000 |
| commit | bbfd5594756011167b8f8de9a00e0c946afda1e6 (patch) | |
| tree | 11171eb57fdb6b5123d796805cd0df10f6fc877b /drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | |
| parent | Revert "drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1" (diff) | |
| parent | drm/nouveau/tegra: Fix error pointer vs NULL return in nvkm_device_tegra_reso... (diff) | |
| download | kernel-bbfd5594756011167b8f8de9a00e0c946afda1e6.tar.gz kernel-bbfd5594756011167b8f8de9a00e0c946afda1e6.zip | |
Merge drm/drm-next into drm-intel-gt-next
Need to pull in a67221b5eb8d ("drm/i915/dp: Return min bpc supported by source instead of 0")
in order to fix build breakage on GCC 9.4.0 (from Ubuntu 20.04).
Signed-off-by: Joonas Lahtinen <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index 19ce4da285e8..5517451fc75d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -619,6 +619,10 @@ int amdgpu_irq_get(struct amdgpu_device *adev, struct amdgpu_irq_src *src, int amdgpu_irq_put(struct amdgpu_device *adev, struct amdgpu_irq_src *src, unsigned int type) { + /* When the threshold is reached,the interrupt source may not be enabled.return -EINVAL */ + if (amdgpu_ras_is_rma(adev)) + return -EINVAL; + if (!adev->irq.installed) return -ENOENT; |