Skip to content

Commit cd951b3

Browse files
committed
Merge tag 'amd-drm-next-5.13-2021-04-12' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-5.13-2021-04-12: amdgpu: - Re-enable GPU reset on VanGogh - Enable DPM flags for SMART_SUSPEND and MAY_SKIP_RESUME - Disentangle HG from vga_switcheroo - S0ix fixes - W=1 fixes - Resource iterator fixes - DMCUB updates - UBSAN fixes - More PM API cleanup - Aldebaran updates - Modifier fixes - Enable VCN load balancing with asymmetric engines - Rework BO structs - Aldebaran reset support - Initial LTTPR display work - Display MALL fixes - Fall back to YCbCr420 when YCbCr444 fails - SR-IOV fixes - RAS updates - Misc cleanups and fixes radeon: - Typo fixes - Fix error handling for firmware on r6xx - Fix a missing check in DP MST handling Signed-off-by: Daniel Vetter <[email protected]> From: Alex Deucher <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents c103b85 + cbb8f98 commit cd951b3

File tree

251 files changed

+6567
-2798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+6567
-2798
lines changed

drivers/gpu/drm/amd/amdgpu/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ amdgpu-y += \
7171
vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \
7272
vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o navi10_reg_init.o navi14_reg_init.o \
7373
arct_reg_init.o navi12_reg_init.o mxgpu_nv.o sienna_cichlid_reg_init.o vangogh_reg_init.o \
74-
nbio_v7_2.o dimgrey_cavefish_reg_init.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o
74+
nbio_v7_2.o dimgrey_cavefish_reg_init.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o aldebaran.o
7575

7676
# add DF block
7777
amdgpu-y += \
@@ -88,7 +88,7 @@ amdgpu-y += \
8888

8989
# add UMC block
9090
amdgpu-y += \
91-
umc_v6_1.o umc_v6_0.o umc_v8_7.o
91+
umc_v6_0.o umc_v6_1.o umc_v6_7.o umc_v8_7.o
9292

9393
# add IH block
9494
amdgpu-y += \
@@ -179,9 +179,14 @@ amdgpu-y += \
179179
smuio_v11_0_6.o \
180180
smuio_v13_0.o
181181

182+
# add reset block
183+
amdgpu-y += \
184+
amdgpu_reset.o
185+
182186
# add amdkfd interfaces
183187
amdgpu-y += amdgpu_amdkfd.o
184188

189+
185190
ifneq ($(CONFIG_HSA_AMD),)
186191
AMDKFD_PATH := ../amdkfd
187192
include $(FULL_AMD_PATH)/amdkfd/Makefile

0 commit comments

Comments
 (0)