[Intel-xe] [PATCH 1/2] fixup! drm/i915/display: Remaining changes to make xe compile

[Jani Nikula]

On Wed, 31 May 2023, Maarten Lankhorst <maarten.lankhorst at linux.intel.com> wrote:
> diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
> index da1e447c08c7..ecf37dded78d 100644
> --- a/drivers/gpu/drm/xe/Makefile
> +++ b/drivers/gpu/drm/xe/Makefile
> @@ -176,7 +176,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
>  	i915-display/intel_dp_mst.o \
>  	i915-display/intel_dpll.o \
>  	i915-display/intel_dpll_mgr.o \
> -	i915-display/intel_dpt.o \

So, this should be a fixup to the commit that adds it, which is
different from "drm/i915/display: Remaining changes to make xe compile".

However, something has gone horribly wrong in drm-xe-next rebase,
because earlier it was added in "drm/xe/display: Implement display
support", but that has now been squashed into "drm/i915/irq: split out
hotplug irq handling" which is supposed to be just a cherry-pick from
upstream to help rebasing.

Uh-oh.

BR,
Jani.

>  	i915-display/intel_drrs.o \
>  	i915-display/intel_dsb.o \
>  	i915-display/intel_dsi.o \

-- 
Jani Nikula, Intel Open Source Graphics Center