Re: [Intel-xe] [PATCH] drm/xe: Rename intel_de.h to xe_de.h

[Maarten Lankhorst <maarten.lankhorst@linux.intel.com>]

On 2023-03-23 12:24, Jani Nikula wrote:
> On Thu, 23 Mar 2023, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote:
>> On 2023-03-23 11:58, Jani Nikula wrote:
>>> On Thu, 23 Mar 2023, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote:
>>>> Rename intel_de.h to xe_de.h in order to remove #include_next,
>>>> and change the ifdef guard to be the same as the rest of xe headers.
>>>>
>>>> This is consistent with the other files that are inside xe/display,
>>>> and implement xe specific behavior.
>>>>
>>>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>>>> ---
>>>>    drivers/gpu/drm/i915/display/intel_de.h            | 2 +-
>>>>    drivers/gpu/drm/xe/display/{intel_de.h => xe_de.h} | 8 ++++----
>>>>    2 files changed, 5 insertions(+), 5 deletions(-)
>>>>    rename drivers/gpu/drm/xe/display/{intel_de.h => xe_de.h} (97%)
>>>>
>>>> diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h
>>>> index 5c223ff6b3ec..267b1108abbb 100644
>>>> --- a/drivers/gpu/drm/i915/display/intel_de.h
>>>> +++ b/drivers/gpu/drm/i915/display/intel_de.h
>>>> @@ -4,7 +4,7 @@
>>>>     */
>>>>    
>>>>    #ifdef BUILD_FOR_XE
>>> I wonder why this isn't just
>>>
>>> #ifndef I915
>>>
>>> and why do we need the separate
>>>
>>> 	-DBUILD_FOR_XE=1 \
>>>
>>> in xe Makefile?
>> If you give the ack, I will remove the BUILD_FOR_XE too when committing.
> Ack, FWIW. All this needs to be squashed to something else,
> eventually...
>
> BR,
> Jani.

Thanks, pushed!

I think BUILD_FOR_XE was introduced when we stopped doing the symlinks in xe, but ifndef I915 also works since this was the only user.

~Maarten