diff options
| author | Alex Hung <alex.hung@amd.com> | 2023-10-11 13:24:00 -0600 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2023-10-13 11:31:42 -0400 |
| commit | 029f9f8ae5e72a8bb22af3829121b97dcd624793 (patch) | |
| tree | 6b3ad9c70af9f7b7a05e556f6d4ecf8b098d9554 | |
| parent | 0c9ae5cfefb06ed0f9d8d8ef140f8baa946c3ac4 (diff) | |
Revert "drm/amd/display: Skip entire amdgpu_dm build if !CONFIG_DRM_AMD_DC"
This reverts commit 1b097bcd224e76807b66ef32cee76a3e87271a2b.
[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>
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/Makefile b/drivers/gpu/drm/amd/display/amdgpu_dm/Makefile index 063205ecb137..8bf94920d23e 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/Makefile +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/Makefile @@ -25,24 +25,22 @@ -ifneq ($(CONFIG_DRM_AMD_DC),) AMDGPUDM = \ amdgpu_dm.o \ amdgpu_dm_plane.o \ amdgpu_dm_crtc.o \ amdgpu_dm_irq.o \ amdgpu_dm_mst_types.o \ - amdgpu_dm_color.o \ - amdgpu_dm_services.o \ - amdgpu_dm_helpers.o \ - amdgpu_dm_pp_smu.o \ - amdgpu_dm_psr.o \ - amdgpu_dm_replay.o + amdgpu_dm_color.o ifdef CONFIG_DRM_AMD_DC_FP AMDGPUDM += dc_fpu.o endif +ifneq ($(CONFIG_DRM_AMD_DC),) +AMDGPUDM += amdgpu_dm_services.o amdgpu_dm_helpers.o amdgpu_dm_pp_smu.o amdgpu_dm_psr.o amdgpu_dm_replay.o +endif + AMDGPUDM += amdgpu_dm_hdcp.o ifneq ($(CONFIG_DEBUG_FS),) @@ -54,4 +52,3 @@ subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc AMDGPU_DM = $(addprefix $(AMDDALPATH)/amdgpu_dm/,$(AMDGPUDM)) AMD_DISPLAY_FILES += $(AMDGPU_DM) -endif |