[Intel-xe] [PATCH 3/4] drm/xe: allow building XE_DISPLAY without ACPI

[Lucas De Marchi]

On Fri, Feb 03, 2023 at 03:17:57PM -0500, Rodrigo Vivi wrote:
>From: Mauro Carvalho Chehab <mchehab at kernel.org>
>
>It is not needed to make XE_DISPLAY dependent on ACPI. All it is
>needed is to not include intel_acpi and intel_opregion.
>
>Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>
>Cc: Maarten Lankhort <maarten.lankhorst at linux.intel.com>
>Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
>---
> drivers/gpu/drm/xe/Kconfig.debug | 1 -
> drivers/gpu/drm/xe/Makefile      | 8 ++++++--
> 2 files changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/Kconfig.debug b/drivers/gpu/drm/xe/Kconfig.debug
>index 6f7123e90563..6726caa63acc 100644
>--- a/drivers/gpu/drm/xe/Kconfig.debug
>+++ b/drivers/gpu/drm/xe/Kconfig.debug
>@@ -99,7 +99,6 @@ config DRM_XE_USERPTR_INVAL_INJECT
> config DRM_XE_DISPLAY
> 	bool "Enable display support"
> 	depends on DRM_XE && EXPERT
>-	depends on ACPI
> 	default y
> 	help
> 	  Disable this option only if you want to compile out display support.
>diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
>index 76cabaee562f..3d716b71e54f 100644
>--- a/drivers/gpu/drm/xe/Makefile
>+++ b/drivers/gpu/drm/xe/Makefile
>@@ -132,7 +132,6 @@ $(obj)/display/intel_%.o: $(srctree)/drivers/gpu/drm/i915/display/intel_%.c FORC
> # Display..
> xe-$(CONFIG_DRM_XE_DISPLAY) += \
> 	display/icl_dsi.o \
>-	display/intel_acpi.o \
> 	display/intel_atomic.o \
> 	display/intel_atomic_plane.o \
> 	display/intel_audio.o \
>@@ -185,7 +184,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
> 	display/intel_lvds.o \
> 	display/intel_modeset_setup.o \
> 	display/intel_modeset_verify.o \
>-	display/intel_opregion.o \
> 	display/intel_panel.o \
> 	display/intel_pipe_crc.o \
> 	display/intel_pps.o \
>@@ -209,6 +207,12 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
> 	display/ext/intel_pch.o \
> 	display/ext/intel_pm.o
>
>+ifeq ($(CONFIG_ACPI),y)
>+	xe-$(CONFIG_DRM_XE_DISPLAY) += \
>+		display/intel_acpi.o \
>+		display/intel_opregion.o

extra tabs here look agains the coding style, but it is what this file
is doing in other places, so ok.

Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Lucas De Marchi

>+endif
>+
> obj-$(CONFIG_DRM_XE) += xe.o
> obj-$(CONFIG_DRM_XE_KUNIT_TEST) += tests/
>
>-- 
>2.39.1
>