diff options
| author | Dave Airlie | 2019-04-12 06:46:10 +0200 |
|---|---|---|
| committer | Dave Airlie | 2019-04-12 06:46:58 +0200 |
| commit | ecc4946f11a07884f230450a6d5a92337bc21375 (patch) | |
| tree | 1fbd1a873dfc76deff867aed7b16640ffc453f7d /drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | |
| parent | Merge tag 'drm-misc-next-2019-04-10' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| parent | drm/amd/display: fix is odm head pipe logic (diff) | |
| download | kernel-qcow2-linux-ecc4946f11a07884f230450a6d5a92337bc21375.tar.gz kernel-qcow2-linux-ecc4946f11a07884f230450a6d5a92337bc21375.tar.xz kernel-qcow2-linux-ecc4946f11a07884f230450a6d5a92337bc21375.zip | |
Merge branch 'drm-next-5.2' of git://people.freedesktop.org/~agd5f/linux into drm-next
- Fixes for powerplay custom profiles
- DC bandwidth clean ups and fixes
- RAS fixes for vega20
- DC atomic resume fix
- Better plane handling in DC
- Freesync improvements
- Misc bug fixes and cleanups
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190411031242.3337-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h index c17af30e758d..1ba9ba3b54f7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h @@ -28,11 +28,8 @@ #define AMDGPU_MAX_SDMA_INSTANCES 2 enum amdgpu_sdma_irq { - AMDGPU_SDMA_IRQ_TRAP0 = 0, - AMDGPU_SDMA_IRQ_TRAP1, - AMDGPU_SDMA_IRQ_ECC0, - AMDGPU_SDMA_IRQ_ECC1, - + AMDGPU_SDMA_IRQ_INSTANCE0 = 0, + AMDGPU_SDMA_IRQ_INSTANCE1, AMDGPU_SDMA_IRQ_LAST }; |