linux-next: manual merge of the drm-xe tree with the drm-intel tree

[Lucas De Marchi]

On Thu, Aug 15, 2024 at 11:37:17AM GMT, Stephen Rothwell wrote:
>Hi all,
>
>Today's linux-next merge of the drm-xe tree got a conflict in:
>
>  drivers/gpu/drm/xe/display/xe_display.c
>
>between commit:
>
>  769b081c18b9 ("drm/i915/opregion: convert to struct intel_display")
>
>from the drm-intel tree and commit:
>
>  1eda95cba9df ("drm/xe: Rename enable_display module param")
>
>from the drm-xe tree.
>
>I fixed it up (see below) and can carry the fix as necessary. This
>is now fixed as far as linux-next is concerned, but any non trivial
>conflicts should be mentioned to your upstream maintainer when your tree
>is submitted for merging.  You may also want to consider cooperating
>with the maintainer of the conflicting tree to minimise any particularly
>complex conflicts.

this matches our current merge and will be resolved when we backmerge
drm-next, before sending our next pull.

thanks
Lucas De Marchi

>
>-- 
>Cheers,
>Stephen Rothwell
>
>diff --cc drivers/gpu/drm/xe/display/xe_display.c
>index 0e4adde84cb2,56a940b39412..000000000000
>--- a/drivers/gpu/drm/xe/display/xe_display.c
>+++ b/drivers/gpu/drm/xe/display/xe_display.c
>@@@ -127,9 -126,8 +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);
>@@@ -138,10 -135,9 +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);
>@@@ -252,9 -246,7 +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)
>@@@ -289,9 -296,8 +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;
>
>  	/*
>@@@ -341,9 -347,7 +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);