On Wed, Jan 03, 2024 at 02:50:57PM +0100, Thomas Hellström wrote:
On Tue, 2023-12-26 at 13:30 -0500, Rodrigo Vivi wrote:
On Fri, Dec 22, 2023 at 12:36:39PM +0100, Thomas Hellström wrote:
> Add the xe repo to drm-tip and the dim tools.
> For now use the sha1 of the first drm-xe-next pull request for drm-
> tip,
> since that branch tip is currently adapted for our CI testing.
>
> Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
> Cc: Oded Gabbay <ogabbay@xxxxxxxxxx>
> Cc: daniel.vetter@xxxxxxxx
> Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> Cc: dim-tools@xxxxxxxxxxxxxxxxxxxxx
> Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
> Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Signed-off-by: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx>
> ---
> nightly.conf | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/nightly.conf b/nightly.conf
> index 24126b61b797..accd3ff2cc39 100644
> --- a/nightly.conf
> +++ b/nightly.conf
> @@ -24,6 +24,10 @@ git://anongit.freedesktop.org/drm-tip
> https://anongit.freedesktop.org/git/drm/drm-tip
> https://anongit.freedesktop.org/git/drm/drm-tip.git
> "
> +drm_tip_repos[drm-xe]="
> +ssh://git@xxxxxxxxxxxxxxxxxxxxxx/drm/xe/kernel.git
> +https://gitlab.freedesktop.org/drm/xe/kernel.git
> +"
> drm_tip_repos[drm-intel]="
> ssh://git.freedesktop.org/git/drm/drm-intel
> ssh://git.freedesktop.org/git/drm-intel
> @@ -65,14 +69,17 @@ drm_tip_config=(
> "drm drm-fixes"
> "drm-misc drm-misc-fixes"
> "drm-intel drm-intel-fixes"
> + "drm-xe drm-xe-fixes"
>
> "drm drm-next"
> "drm-misc drm-misc-next-fixes"
> "drm-intel drm-intel-next-fixes"
> + "drm-xe drm-xe-next-fixes"
>
> "drm-misc drm-misc-next"
> "drm-intel drm-intel-next"
> "drm-intel drm-intel-gt-next"
> + "drm-xe drm-xe-next b6e1b7081768"
yeap, up to this commit nothing else should change, but
then we will need an extra rebase of the rest on top of drm/drm-next.
But then we need to decide where these following patches will live:
880277f31cc69 drm/xe/guc: define LNL FW
2cfc5ae1b8267 drm/xe/guc: define PVC FW
52383b58eb8cf mei/hdcp: Also enable for XE
bea27d7369855 mei: gsc: add support for auxiliary device created by
Xe driver
fcb3410197f05 fault-inject: Include linux/types.h by default.
8ebd9cd71f8ac drm/xe: Add PVC's PCI device IDs
Will it be the topic/core-for-CI?
or topic/xe-extras?
or what?
This sounds to me like topic/core-for-CI? Or is there any drawback with
that?
I think some of them are not really a "for CI". It's more like the
workflow we are adopting e.g. with guc/huc, not sending it to linux-firmware
until we are confident on what version we will start officially
supporting.
This one can't go to topic/core-for-CI neither:
fcb3410197f05 fault-inject: Include linux/types.h by default.
what it would do would be that we would not see the build error anymore,
but everyone else would (and it's not a CI-only configuration).
Unless it's merged to another branch, we shouldn't merge it.
"52383b58eb8cf mei/hdcp: Also enable for XE" could be material for
topic/core-for-CI and "8ebd9cd71f8ac drm/xe: Add PVC's PCI device IDs"
could either be on that branch or another xe-specific one.
Anyway, for the inclusion like this, after our CI is ready:
Could we merge this patch already at this point, considering it will,
at least for now, only update drm-tip with our fixes?
ack
Lucas De Marchi
Thanks,
/Thomas
Acked-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
>
> "drm-intel topic/core-for-CI"
> "drm-misc topic/i915-ttm"
> --
> 2.42.0
>
