Re: [PATCH 01/18] drm/amd/display: Skip entire amdgpu_dm build if !CONFIG_DRM_AMD_DC

[Alex Hung]

Reviewed-by: Alex Hung <alex.h...@amd.com>

On 2023-08-16 15:26, Alex Hung wrote:

From: Harry Wentland <harry.wentl...@amd.com>

[WHY]
Previously this only excluded build for a few amdgpu_dm
binaries which makes no sense.

[HOW]
Wrap the entire Makefile in "ifneq ($(CONFIG_DRM_AMD_DC),)"

Signed-off-by: Harry Wentland <harry.wentl...@amd.com>
Signed-off-by: Alex Hung <alex.h...@amd.com>
---
  drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 13 ++++++++-----
  1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/Makefile 
b/drivers/gpu/drm/amd/display/amdgpu_dm/Makefile
index 8bf94920d23e..063205ecb137 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/Makefile
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/Makefile
@@ -25,22 +25,24 @@

+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_color.o \
+       amdgpu_dm_services.o \
+       amdgpu_dm_helpers.o \
+       amdgpu_dm_pp_smu.o \
+       amdgpu_dm_psr.o \
+       amdgpu_dm_replay.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),)

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

AMD_DISPLAY_FILES += $(AMDGPU_DM)

+endif