Re: [Intel-xe] [PATCH 1/8] drm/i915/display: don't use relative ../i915 includes

[Lucas De Marchi <lucas.demarchi@intel.com>]

On Thu, Mar 02, 2023 at 05:45:57PM +0200, Jani Nikula wrote:
>On Thu, 02 Mar 2023, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>> On Thu, Mar 02, 2023 at 04:12:23PM +0200, Jani Nikula wrote:
>>>We can't have this in upstream i915, so don't try that here either.
>>>
>>>Note: This should be squashed to the commit adding the relative
>>>includes.
>>
>> is this a requirement?  I think squashing this is not very problematic,
>> but it may not work as the build infra with the different -I also
>> changes in the tree.
>>
>> I'm also wondering why we have these changes at all in the xe side. Was
>> it maybe a temporary solution not needed anymore due to the -I added to
>> the build system?
>>
>> Another idea would be not to squash it now, but only at the end
>> with all the i915 changes together.
>
>Basically we don't want to have the back and forth when submitting xe.

ok. It sounds like we may want to squash/re-split it later when it's
time to get merged.

For my own patches required in i915 I'm trying to merge those in
drm-intel-next and then I cherry-pick them to the xe branch.  So when we
rebase they are just dropped.  If it's something undoing a change that
we have a better alternative for now, then yeah probably good to have
separate commits that can be squashed.

 From a quick look it seems this would be
a09f88e470b6 ("drm/i915/display: Remaining changes to make xe compile")

thanks
Lucas De Marchi