[Intel-xe] [PATCH 0/4] A few display patches needing review to be confirmed

[Intel-xe] [PATCH 0/4] A few display patches needing review to be confirmed

[Rodrigo Vivi]

Resending a few chuncks to ensure we confirm the reviews and
are able to merge to drm-xe-next.

Matthew Auld (1):
  drm/xe/fbc: set compressed_fb to NULL on error

Mauro Carvalho Chehab (3):
  drm/xe: fix XE_DISPLAY dependency on ACPI
  drm/xe: allow building XE_DISPLAY without ACPI
  drm/xe: fix DRM_FBDEV_EMULATION dependencies

 drivers/gpu/drm/i915/display/intel_fbc.c |  2 +-
 drivers/gpu/drm/xe/Makefile              | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

-- 
2.39.1

[Intel-xe] [PATCH 1/4] drm/xe/fbc: set compressed_fb to NULL on error

[Rodrigo Vivi]

From: Matthew Auld <matthew.auld@intel.com>

On DG2 we get a massive flood of the following:

[ 1068.790446] xe 0000:03:00.0: drm_WARN_ON((!!(fbc->compressed_fb)))
[ 1068.790465] WARNING: CPU: 9 PID: 637 at drivers/gpu/drm/xe/display/intel_fbc.c:843 intel_fbc_update+0x605/0x670 [xe]

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Maarten Lankhort <maarten.lankhorst@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index 82bc21b09332..13f03c6ea818 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -75,7 +75,7 @@ static int i915_gem_stolen_insert_node_in_range(struct xe_device *xe, struct xe_
 					ttm_bo_type_kernel, flags);
 	if (IS_ERR(*bo)) {
 		err = PTR_ERR(*bo);
-		bo = NULL;
+		*bo = NULL;
 		return err;
 	}
 	err = xe_bo_pin(*bo);
-- 
2.39.1

[Intel-xe] [PATCH 2/4] drm/xe: fix XE_DISPLAY dependency on ACPI

[Rodrigo Vivi]

From: Mauro Carvalho Chehab <mchehab@kernel.org>

Trying to run KUnit without passing arch currently fails with:

$ ./tools/testing/kunit/kunit.py run  --kunitconfig drivers/gpu/drm/xe/.kunitconfig
[10:42:07] Configuring KUnit Kernel ...
[10:42:07] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make ARCH=um O=.kunit --jobs=8
ERROR:root:../drivers/gpu/drm/xe/display/intel_acpi.c: In function ‘intel_dsm_platform_mux_info’:
../drivers/gpu/drm/xe/display/intel_acpi.c:86:15: error: implicit declaration of function ‘acpi_evaluate_dsm_typed’; did you mean ‘acpi_evaluate_dsm’? [-Werror=implicit-function-declaration]
   86 |         pkg = acpi_evaluate_dsm_typed(dhandle, &intel_dsm_guid,
      |               ^~~~~~~~~~~~~~~~~~~~~~~
      |               acpi_evaluate_dsm
../drivers/gpu/drm/xe/display/intel_acpi.c:86:13: warning: assignment to ‘union acpi_object *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
   86 |         pkg = acpi_evaluate_dsm_typed(dhandle, &intel_dsm_guid,
      |             ^
../drivers/gpu/drm/xe/display/intel_acpi.c: In function ‘intel_dsm_pci_probe’:
../drivers/gpu/drm/xe/display/intel_acpi.c:142:14: error: implicit declaration of function ‘acpi_check_dsm’; did you mean ‘acpi_check_region’? [-Werror=implicit-function-declaration]
  142 |         if (!acpi_check_dsm(dhandle, &intel_dsm_guid, INTEL_DSM_REVISION_ID,
      |              ^~~~~~~~~~~~~~
      |              acpi_check_region
../drivers/gpu/drm/xe/display/intel_acpi.c: At top level:
../drivers/gpu/drm/xe/display/intel_acpi.c:176:6: error: redefinition of ‘intel_register_dsm_handler’
  176 | void intel_register_dsm_handler(void)
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/display/intel_acpi.c:13:
../drivers/gpu/drm/xe/display/intel_acpi.h:19:20: note: previous definition of ‘intel_register_dsm_handler’ with type ‘void(void)’
   19 | static inline void intel_register_dsm_handler(void) { return; }
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_acpi.c:182:6: error: redefinition of ‘intel_unregister_dsm_handler’
  182 | void intel_unregister_dsm_handler(void)
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_acpi.h:20:20: note: previous definition of ‘intel_unregister_dsm_handler’ with type ‘void(void)’
   20 | static inline void intel_unregister_dsm_handler(void) { return; }
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_acpi.c:186:6: error: redefinition of ‘intel_dsm_get_bios_data_funcs_supported’
  186 | void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915)
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_acpi.h:22:6: note: previous definition of ‘intel_dsm_get_bios_data_funcs_supported’ with type ‘void(struct xe_device *)’
   22 | void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915) { return; }
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_acpi.c: In function ‘intel_dsm_get_bios_data_funcs_supported’:
../drivers/gpu/drm/xe/display/intel_acpi.c:199:31: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
  199 |                 ACPI_FREE(obj);
      |                               ^
../drivers/gpu/drm/xe/display/intel_acpi.c:188:25: warning: unused variable ‘pdev’ [-Wunused-variable]
  188 |         struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
      |                         ^~~~
../drivers/gpu/drm/xe/display/intel_acpi.c: At top level:
../drivers/gpu/drm/xe/display/intel_acpi.c:266:6: error: redefinition of ‘intel_acpi_device_id_update’
  266 | void intel_acpi_device_id_update(struct drm_i915_private *dev_priv)
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_acpi.h:24:6: note: previous definition of ‘intel_acpi_device_id_update’ with type ‘void(struct xe_device *)’
   24 | void intel_acpi_device_id_update(struct drm_i915_private *i915) { return; }
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_acpi.c:291:6: error: redefinition of ‘intel_acpi_assign_connector_fwnodes’
  291 | void intel_acpi_assign_connector_fwnodes(struct drm_i915_private *i915)
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_acpi.h:26:6: note: previous definition of ‘intel_acpi_assign_connector_fwnodes’ with type ‘void(struct xe_device *)’
   26 | void intel_acpi_assign_connector_fwnodes(struct drm_i915_private *i915) { return; }
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_acpi.c: In function ‘intel_acpi_assign_connector_fwnodes’:
../drivers/gpu/drm/xe/display/intel_acpi.c:314:32: error: implicit declaration of function ‘acpi_find_child_device’; did you mean ‘acpi_match_device’? [-Werror=implicit-function-declaration]
  314 |                         adev = acpi_find_child_device(ACPI_COMPANION(drm_dev->dev),
      |                                ^~~~~~~~~~~~~~~~~~~~~~
      |                                acpi_match_device
../drivers/gpu/drm/xe/display/intel_acpi.c:314:30: warning: assignment to ‘struct acpi_device *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
  314 |                         adev = acpi_find_child_device(ACPI_COMPANION(drm_dev->dev),
      |                              ^
../drivers/gpu/drm/xe/display/intel_acpi.c: At top level:
../drivers/gpu/drm/xe/display/intel_acpi.c:336:6: error: redefinition of ‘intel_acpi_video_register’
  336 | void intel_acpi_video_register(struct drm_i915_private *i915)
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_acpi.h:28:6: note: previous definition of ‘intel_acpi_video_register’ with type ‘void(struct xe_device *)’
   28 | void intel_acpi_video_register(struct drm_i915_private *i915) { return; }
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~

The reason is that XE_DISPLAY depends on ACPI. This issue may
also manifest on other randconfig, so fix the dependencies.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Philippe Lecluse <philippe.lecluse@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/xe/Kconfig.debug | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/xe/Kconfig.debug b/drivers/gpu/drm/xe/Kconfig.debug
index 6726caa63acc..6f7123e90563 100644
--- a/drivers/gpu/drm/xe/Kconfig.debug
+++ b/drivers/gpu/drm/xe/Kconfig.debug
@@ -99,6 +99,7 @@ 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.
-- 
2.39.1

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

[Rodrigo Vivi]

From: Mauro Carvalho Chehab <mchehab@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@kernel.org>
Cc: Maarten Lankhort <maarten.lankhorst@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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
+endif
+
 obj-$(CONFIG_DRM_XE) += xe.o
 obj-$(CONFIG_DRM_XE_KUNIT_TEST) += tests/
 
-- 
2.39.1

[Intel-xe] [PATCH 4/4] drm/xe: fix DRM_FBDEV_EMULATION dependencies

[Rodrigo Vivi]

From: Mauro Carvalho Chehab <mchehab@kernel.org>

The intel_fbdev should only be added when framebuffer emulation
is enabled.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Maarten Lankhort <maarten.lankhorst@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/xe/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index 3d716b71e54f..74fa741b1937 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -170,7 +170,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
 	display/intel_dsi_vbt.o \
 	display/intel_fb.o \
 	display/intel_fbc.o \
-	display/intel_fbdev.o \
 	display/intel_fdi.o \
 	display/intel_fifo_underrun.o \
 	display/intel_frontbuffer.o \
@@ -213,6 +212,10 @@ ifeq ($(CONFIG_ACPI),y)
 		display/intel_opregion.o
 endif
 
+ifeq ($(CONFIG_DRM_FBDEV_EMULATION),y)
+	xe-$(CONFIG_DRM_XE_DISPLAY) += display/intel_fbdev.o
+endif
+
 obj-$(CONFIG_DRM_XE) += xe.o
 obj-$(CONFIG_DRM_XE_KUNIT_TEST) += tests/
 
-- 
2.39.1

Re: [Intel-xe] [PATCH 2/4] drm/xe: fix XE_DISPLAY dependency on ACPI

[Lucas De Marchi]

On Fri, Feb 03, 2023 at 03:17:56PM -0500, Rodrigo Vivi wrote:
>From: Mauro Carvalho Chehab <mchehab@kernel.org>
>
>Trying to run KUnit without passing arch currently fails with:
>
>$ ./tools/testing/kunit/kunit.py run  --kunitconfig drivers/gpu/drm/xe/.kunitconfig
>[10:42:07] Configuring KUnit Kernel ...
>[10:42:07] Building KUnit Kernel ...
>Populating config with:
>$ make ARCH=um O=.kunit olddefconfig
>Building with:
>$ make ARCH=um O=.kunit --jobs=8
>ERROR:root:../drivers/gpu/drm/xe/display/intel_acpi.c: In function ‘intel_dsm_platform_mux_info’:
>../drivers/gpu/drm/xe/display/intel_acpi.c:86:15: error: implicit declaration of function ‘acpi_evaluate_dsm_typed’; did you mean ‘acpi_evaluate_dsm’? [-Werror=implicit-function-declaration]
>   86 |         pkg = acpi_evaluate_dsm_typed(dhandle, &intel_dsm_guid,
>      |               ^~~~~~~~~~~~~~~~~~~~~~~
>      |               acpi_evaluate_dsm
>../drivers/gpu/drm/xe/display/intel_acpi.c:86:13: warning: assignment to ‘union acpi_object *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
>   86 |         pkg = acpi_evaluate_dsm_typed(dhandle, &intel_dsm_guid,
>      |             ^
>../drivers/gpu/drm/xe/display/intel_acpi.c: In function ‘intel_dsm_pci_probe’:
>../drivers/gpu/drm/xe/display/intel_acpi.c:142:14: error: implicit declaration of function ‘acpi_check_dsm’; did you mean ‘acpi_check_region’? [-Werror=implicit-function-declaration]
>  142 |         if (!acpi_check_dsm(dhandle, &intel_dsm_guid, INTEL_DSM_REVISION_ID,
>      |              ^~~~~~~~~~~~~~
>      |              acpi_check_region
>../drivers/gpu/drm/xe/display/intel_acpi.c: At top level:
>../drivers/gpu/drm/xe/display/intel_acpi.c:176:6: error: redefinition of ‘intel_register_dsm_handler’
>  176 | void intel_register_dsm_handler(void)
>      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~
>In file included from ../drivers/gpu/drm/xe/display/intel_acpi.c:13:
>../drivers/gpu/drm/xe/display/intel_acpi.h:19:20: note: previous definition of ‘intel_register_dsm_handler’ with type ‘void(void)’
>   19 | static inline void intel_register_dsm_handler(void) { return; }
>      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~
>../drivers/gpu/drm/xe/display/intel_acpi.c:182:6: error: redefinition of ‘intel_unregister_dsm_handler’
>  182 | void intel_unregister_dsm_handler(void)
>      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>../drivers/gpu/drm/xe/display/intel_acpi.h:20:20: note: previous definition of ‘intel_unregister_dsm_handler’ with type ‘void(void)’
>   20 | static inline void intel_unregister_dsm_handler(void) { return; }
>      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>../drivers/gpu/drm/xe/display/intel_acpi.c:186:6: error: redefinition of ‘intel_dsm_get_bios_data_funcs_supported’
>  186 | void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915)
>      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>../drivers/gpu/drm/xe/display/intel_acpi.h:22:6: note: previous definition of ‘intel_dsm_get_bios_data_funcs_supported’ with type ‘void(struct xe_device *)’
>   22 | void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915) { return; }
>      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>../drivers/gpu/drm/xe/display/intel_acpi.c: In function ‘intel_dsm_get_bios_data_funcs_supported’:
>../drivers/gpu/drm/xe/display/intel_acpi.c:199:31: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
>  199 |                 ACPI_FREE(obj);
>      |                               ^
>../drivers/gpu/drm/xe/display/intel_acpi.c:188:25: warning: unused variable ‘pdev’ [-Wunused-variable]
>  188 |         struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
>      |                         ^~~~
>../drivers/gpu/drm/xe/display/intel_acpi.c: At top level:
>../drivers/gpu/drm/xe/display/intel_acpi.c:266:6: error: redefinition of ‘intel_acpi_device_id_update’
>  266 | void intel_acpi_device_id_update(struct drm_i915_private *dev_priv)
>      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>../drivers/gpu/drm/xe/display/intel_acpi.h:24:6: note: previous definition of ‘intel_acpi_device_id_update’ with type ‘void(struct xe_device *)’
>   24 | void intel_acpi_device_id_update(struct drm_i915_private *i915) { return; }
>      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>../drivers/gpu/drm/xe/display/intel_acpi.c:291:6: error: redefinition of ‘intel_acpi_assign_connector_fwnodes’
>  291 | void intel_acpi_assign_connector_fwnodes(struct drm_i915_private *i915)
>      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>../drivers/gpu/drm/xe/display/intel_acpi.h:26:6: note: previous definition of ‘intel_acpi_assign_connector_fwnodes’ with type ‘void(struct xe_device *)’
>   26 | void intel_acpi_assign_connector_fwnodes(struct drm_i915_private *i915) { return; }
>      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>../drivers/gpu/drm/xe/display/intel_acpi.c: In function ‘intel_acpi_assign_connector_fwnodes’:
>../drivers/gpu/drm/xe/display/intel_acpi.c:314:32: error: implicit declaration of function ‘acpi_find_child_device’; did you mean ‘acpi_match_device’? [-Werror=implicit-function-declaration]
>  314 |                         adev = acpi_find_child_device(ACPI_COMPANION(drm_dev->dev),
>      |                                ^~~~~~~~~~~~~~~~~~~~~~
>      |                                acpi_match_device
>../drivers/gpu/drm/xe/display/intel_acpi.c:314:30: warning: assignment to ‘struct acpi_device *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
>  314 |                         adev = acpi_find_child_device(ACPI_COMPANION(drm_dev->dev),
>      |                              ^
>../drivers/gpu/drm/xe/display/intel_acpi.c: At top level:
>../drivers/gpu/drm/xe/display/intel_acpi.c:336:6: error: redefinition of ‘intel_acpi_video_register’
>  336 | void intel_acpi_video_register(struct drm_i915_private *i915)
>      |      ^~~~~~~~~~~~~~~~~~~~~~~~~
>../drivers/gpu/drm/xe/display/intel_acpi.h:28:6: note: previous definition of ‘intel_acpi_video_register’ with type ‘void(struct xe_device *)’
>   28 | void intel_acpi_video_register(struct drm_i915_private *i915) { return; }
>      |      ^~~~~~~~~~~~~~~~~~~~~~~~~
>
>The reason is that XE_DISPLAY depends on ACPI. This issue may
>also manifest on other randconfig, so fix the dependencies.
>
>Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
>Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>Cc: Philippe Lecluse <philippe.lecluse@intel.com>
>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

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

Lucas De Marchi

>---
> drivers/gpu/drm/xe/Kconfig.debug | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/drivers/gpu/drm/xe/Kconfig.debug b/drivers/gpu/drm/xe/Kconfig.debug
>index 6726caa63acc..6f7123e90563 100644
>--- a/drivers/gpu/drm/xe/Kconfig.debug
>+++ b/drivers/gpu/drm/xe/Kconfig.debug
>@@ -99,6 +99,7 @@ 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.
>-- 
>2.39.1
>

Re: [Intel-xe] [PATCH 1/4] drm/xe/fbc: set compressed_fb to NULL on error

[Lucas De Marchi]

On Fri, Feb 03, 2023 at 03:17:55PM -0500, Rodrigo Vivi wrote:
>From: Matthew Auld <matthew.auld@intel.com>
>
>On DG2 we get a massive flood of the following:
>
>[ 1068.790446] xe 0000:03:00.0: drm_WARN_ON((!!(fbc->compressed_fb)))
>[ 1068.790465] WARNING: CPU: 9 PID: 637 at drivers/gpu/drm/xe/display/intel_fbc.c:843 intel_fbc_update+0x605/0x670 [xe]
>
>Signed-off-by: Matthew Auld <matthew.auld@intel.com>
>Cc: Maarten Lankhort <maarten.lankhorst@linux.intel.com>
>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>


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

alghough this display integration with ifdef copying i915_gem_stolen_insert_node_in_range()
looks ugly

Lucas De Marchi

>---
> drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
>index 82bc21b09332..13f03c6ea818 100644
>--- a/drivers/gpu/drm/i915/display/intel_fbc.c
>+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
>@@ -75,7 +75,7 @@ static int i915_gem_stolen_insert_node_in_range(struct xe_device *xe, struct xe_
> 					ttm_bo_type_kernel, flags);
> 	if (IS_ERR(*bo)) {
> 		err = PTR_ERR(*bo);
>-		bo = NULL;
>+		*bo = NULL;
> 		return err;
> 	}
> 	err = xe_bo_pin(*bo);
>-- 
>2.39.1
>

Re: [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@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@kernel.org>
>Cc: Maarten Lankhort <maarten.lankhorst@linux.intel.com>
>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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@intel.com>

Lucas De Marchi

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

Re: [Intel-xe] [PATCH 4/4] drm/xe: fix DRM_FBDEV_EMULATION dependencies

[Lucas De Marchi]

On Fri, Feb 03, 2023 at 03:17:58PM -0500, Rodrigo Vivi wrote:
>From: Mauro Carvalho Chehab <mchehab@kernel.org>
>
>The intel_fbdev should only be added when framebuffer emulation
>is enabled.
>
>Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
>Cc: Maarten Lankhort <maarten.lankhorst@linux.intel.com>
>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>---
> drivers/gpu/drm/xe/Makefile | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
>index 3d716b71e54f..74fa741b1937 100644
>--- a/drivers/gpu/drm/xe/Makefile
>+++ b/drivers/gpu/drm/xe/Makefile
>@@ -170,7 +170,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
> 	display/intel_dsi_vbt.o \
> 	display/intel_fb.o \
> 	display/intel_fbc.o \
>-	display/intel_fbdev.o \
> 	display/intel_fdi.o \
> 	display/intel_fifo_underrun.o \
> 	display/intel_frontbuffer.o \
>@@ -213,6 +212,10 @@ ifeq ($(CONFIG_ACPI),y)
> 		display/intel_opregion.o
> endif
>
>+ifeq ($(CONFIG_DRM_FBDEV_EMULATION),y)
>+	xe-$(CONFIG_DRM_XE_DISPLAY) += display/intel_fbdev.o
>+endif

same comment as patch 3/4.


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

Lucas De Marchi

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