Skip to content

Commit 029f9f8

Browse files
Alex Hungalexdeucher
authored andcommitted
Revert "drm/amd/display: Skip entire amdgpu_dm build if !CONFIG_DRM_AMD_DC"
This reverts commit 1b097bc. [WHY & HOW] The writeback series cause a regression in thunderbolt display. Signed-off-by: Alex Hung <alex.hung@amd.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 0c9ae5c commit 029f9f8

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

  • drivers/gpu/drm/amd/display/amdgpu_dm

drivers/gpu/drm/amd/display/amdgpu_dm/Makefile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,22 @@
2525

2626

2727

28-
ifneq ($(CONFIG_DRM_AMD_DC),)
2928
AMDGPUDM = \
3029
amdgpu_dm.o \
3130
amdgpu_dm_plane.o \
3231
amdgpu_dm_crtc.o \
3332
amdgpu_dm_irq.o \
3433
amdgpu_dm_mst_types.o \
35-
amdgpu_dm_color.o \
36-
amdgpu_dm_services.o \
37-
amdgpu_dm_helpers.o \
38-
amdgpu_dm_pp_smu.o \
39-
amdgpu_dm_psr.o \
40-
amdgpu_dm_replay.o
34+
amdgpu_dm_color.o
4135

4236
ifdef CONFIG_DRM_AMD_DC_FP
4337
AMDGPUDM += dc_fpu.o
4438
endif
4539

40+
ifneq ($(CONFIG_DRM_AMD_DC),)
41+
AMDGPUDM += amdgpu_dm_services.o amdgpu_dm_helpers.o amdgpu_dm_pp_smu.o amdgpu_dm_psr.o amdgpu_dm_replay.o
42+
endif
43+
4644
AMDGPUDM += amdgpu_dm_hdcp.o
4745

4846
ifneq ($(CONFIG_DEBUG_FS),)
@@ -54,4 +52,3 @@ subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc
5452
AMDGPU_DM = $(addprefix $(AMDDALPATH)/amdgpu_dm/,$(AMDGPUDM))
5553

5654
AMD_DISPLAY_FILES += $(AMDGPU_DM)
57-
endif

0 commit comments

Comments
 (0)