diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-04-28 14:56:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-04-28 14:56:04 +1000 |
| commit | 4eaf02db9c2680ca92af92e2de7b33c6e079b2cd (patch) | |
| tree | f8d2ccc9f89003a1a90c95ed3ae9e95bd13e045c /drivers/gpu/drm/amd/amdgpu/Makefile | |
| parent | dbe946287e0825f0e9cd4cbeacfcde9d9b2dd168 (diff) | |
| parent | e15c9d06e9ad70df41285ca41d535de6215e0b21 (diff) | |
Merge tag 'amd-drm-next-5.19-2022-04-22' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-5.19-2022-04-22:
amdgpu:
- SMU message documentation update
- Misc code cleanups
- Documenation updates
- PSP TA updates
- Runtime PM regression fix
- SR-IOV header cleanup
- Misc fixes
amdkfd:
- TLB flush fixes
- GWS fixes
- CRIU GWS support
radeon:
- Misc code cleanups
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220422150049.5859-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/Makefile')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile index 7d7af43a258f..b525f9be9326 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile @@ -58,7 +58,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \ amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \ amdgpu_fw_attestation.o amdgpu_securedisplay.o \ - amdgpu_eeprom.o amdgpu_mca.o + amdgpu_eeprom.o amdgpu_mca.o amdgpu_psp_ta.o amdgpu-$(CONFIG_PROC_FS) += amdgpu_fdinfo.o |