From: Jani Nikula <jani.nikula@linux.intel.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
intel-xe@lists.freedesktop.org
Cc: Lucas De Marchi <lucas.demarchi@intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: Re: [Intel-xe] [PATCH 1/2] fixup! drm/i915/display: Remaining changes to make xe compile
Date: Thu, 01 Jun 2023 12:13:11 +0300 [thread overview]
Message-ID: <87r0qvfsuw.fsf@intel.com> (raw)
In-Reply-To: <20230531151804.2017924-2-maarten.lankhorst@linux.intel.com>
On Wed, 31 May 2023, Maarten Lankhorst <maarten.lankhorst@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
next prev parent reply other threads:[~2023-06-01 9:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 15:18 [Intel-xe] [PATCH 0/2] drm/xe: Small cleanups to DPT code Maarten Lankhorst
2023-05-31 15:18 ` [Intel-xe] [PATCH 1/2] fixup! drm/i915/display: Remaining changes to make xe compile Maarten Lankhorst
2023-06-01 9:13 ` Jani Nikula [this message]
2023-05-31 15:18 ` [Intel-xe] [PATCH 2/2] drm/xe: Implement xe DPT slightly differently Maarten Lankhorst
2023-05-31 15:20 ` [Intel-xe] ✓ CI.Patch_applied: success for drm/xe: Small cleanups to DPT code Patchwork
2023-05-31 15:22 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-05-31 15:26 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-05-31 15:56 ` [Intel-xe] ○ CI.BAT: info " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-08-14 8:37 [Intel-xe] [PATCH 1/2] fixup! drm/i915/display: Remaining changes to make xe compile Maarten Lankhorst
2023-05-12 7:43 Jani Nikula
2023-05-15 14:00 ` Jani Nikula
2023-05-15 14:41 ` Rodrigo Vivi
2023-05-15 16:42 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r0qvfsuw.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=lucas.demarchi@intel.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox