Re: [PATCH 0/3] Update to GuC 70.19.2 and add LNL

[John Harrison <john.c.harrison@intel.com>]

On 2/2/2024 11:35, Lucas De Marchi wrote:
> On Fri, Feb 02, 2024 at 10:51:36AM -0800, John Harrison wrote:
>> On 2/2/2024 08:53, Lucas De Marchi wrote:
>>> On Thu, Feb 01, 2024 at 11:30:47PM -0800, John.C.Harrison@Intel.com 
>>> wrote:
>>>> From: John Harrison <John.C.Harrison@Intel.com>
>>>>
>>>> Update to the latest GuC release including the first release for LNL.
>>>> Also include the patch version in the expectation check as it can be
>>>> important.
>>>>
>>>> Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
>>>
>>> For CI to be able to test this series you have to do:
>>>
>>> a) be on top of drm-tip, not drm-xe-next
>> Is this instruction special for this particular patch set because of 
>> the for-ci conflict? The wiki page is definitely still saying to base 
>
> If you're talking about our internal documentation, it's
> outdated since drm-xe-next got merged upstream. Documentation for
> drm-xe-next is now maintained upstream as part of drm-tip too.
It would be useful if the internal doc could be updated to reflect this 
change. You can't really complain at people when they are correctly 
following instructions!


>
>> patches on drm-xe-next from fdo:/drm/xe/kernel.git.
>
> patches targeting xe are *merged* through drm-xe-next. Usually. And it
> usually applies fine if you are on top of drm-tip or drm-xe-next, but
> not in this case as we have the topic branch that conflicts.
>
> Since when we got merged, drm-xe-next is "just one more branch" that
> forms drm-tip:
>
> https://drm.pages.freedesktop.org/maintainer-tools/drm-xe.html
>
> and drm-tip, as an integration branch, is the merge of all its component
> branches that is done on every push to any component branch.
I am aware of how drm-tip is constructed. I just being confused by the 
conflicting documentation.

>
>>
>> Is there an Xe specific repo for an Xe specific drm-tip? Or are you 
>> meaning the genuine drm-tip from fdo:/drm-tip?
>
> not sure I understand the question, but I meant the one and only
> drm-tip as per doc above.
Okay. That's what I meant. I just wasn't sure if there was some new, Xe 
specific version of that entire process alongside the regular one. As I 
said, the internal doc describes a very Xe specific process so it is 
confusing as to how much is Xe only versus how much is now just regular drm.

John.


>
> Lucas De Marchi