From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Fri, 16 Aug 2024 17:05:54 +0000 (-0700)
Subject: Merge drm/drm-next into drm-xe-next
X-Git-Tag: v6.12-rc1~126^2~15^2~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed7171ff9fabc49ae6ed42fbd082a576473836fc;p=thirdparty%2Fkernel%2Flinux.git

Merge drm/drm-next into drm-xe-next

Get drm-xe-next on v6.11-rc2 and synchronized with drm-intel-next for
the display side. This resolves the current conflict for the
enable_display module parameter and allows further pending refactors.

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

ed7171ff9fabc49ae6ed42fbd082a576473836fc
diff --cc drivers/gpu/drm/xe/display/xe_display.c
index 56a940b39412c,0e4adde84cb29..982b9c5b440f2
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@@ -126,8 -127,9 +127,9 @@@ int xe_display_init_nommio(struct xe_de
  static void xe_display_fini_noirq(void *arg)
  {
  	struct xe_device *xe = arg;
+ 	struct intel_display *display = &xe->display;
  
 -	if (!xe->info.enable_display)
 +	if (!xe->info.probe_display)
  		return;
  
  	intel_display_driver_remove_noirq(xe);
@@@ -135,9 -138,10 +138,10 @@@
  
  int xe_display_init_noirq(struct xe_device *xe)
  {
+ 	struct intel_display *display = &xe->display;
  	int err;
  
 -	if (!xe->info.enable_display)
 +	if (!xe->info.probe_display)
  		return 0;
  
  	intel_display_driver_early_probe(xe);
@@@ -246,7 -252,9 +252,9 @@@ void xe_display_irq_handler(struct xe_d
  
  void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir)
  {
+ 	struct intel_display *display = &xe->display;
+ 
 -	if (!xe->info.enable_display)
 +	if (!xe->info.probe_display)
  		return;
  
  	if (gu_misc_iir & GU_MISC_GSE)
@@@ -296,8 -289,9 +289,9 @@@ static bool suspend_to_idle(void
  
  void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
  {
+ 	struct intel_display *display = &xe->display;
  	bool s2idle = suspend_to_idle();
 -	if (!xe->info.enable_display)
 +	if (!xe->info.probe_display)
  		return;
  
  	/*
@@@ -347,7 -341,9 +341,9 @@@ void xe_display_pm_resume_early(struct 
  
  void xe_display_pm_resume(struct xe_device *xe, bool runtime)
  {
+ 	struct intel_display *display = &xe->display;
+ 
 -	if (!xe->info.enable_display)
 +	if (!xe->info.probe_display)
  		return;
  
  	intel_dmc_resume(xe);