[PATCH] nightly.conf: Add the xe repo to drm-tip

[Thomas Hellström]

On 12/22/23 13:25, Thomas Hellström wrote:
> Hi,
>
> On 12/22/23 13:01, Jani Nikula wrote:
>> On Fri, 22 Dec 2023, Thomas Hellström 
>> <thomas.hellstrom at linux.intel.com> 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.
>> I guess we'll need xe CI to switch to drm-tip based testing, and then
>> force push drm-xe-next to drop that core-for-CI thing. But I think it's
>> fine.
>
> Yes, that's in the plan.
>
>>
>> However, please first push v6.7-rc6 to drm-xe-fixes and current drm-next
>> to drm-xe-next-fixes as a starting point. AFAICT the branches don't
>> exist yet.
>
> Yes, I have that queued-up. Still waiting for the right people to wake 
> up, though, since I'm ATM lacking the right to create those branches 
> in the xe repo. I did a dry-run building drm-tip with these patches
s/patches/branches/ ...
> present in a clone of the xe repo for testing purposes...
>
>>
>> Other than that, LGTM.
>
> Thanks,
>
> Thomas
>
>
>>
>> BR,
>> Jani.
>>
>>> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
>>> Cc: Lucas De Marchi <lucas.demarchi at intel.com>
>>> Cc: Oded Gabbay <ogabbay at kernel.org>
>>> Cc: daniel.vetter at ffwll.ch
>>> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
>>> Cc: dim-tools at lists.freedesktop.org
>>> Cc: dri-devel at lists.freedesktop.org
>>> Cc: intel-gfx at lists.freedesktop.org
>>> Signed-off-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>
>>> ---
>>>   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@gitlab.freedesktop.org/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"
>>>         "drm-intel        topic/core-for-CI"
>>>       "drm-misc        topic/i915-ttm"