On Tue, 13 Apr 2021, Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> wrote:
> On Mon, 12 Apr 2021, Lucas De Marchi <lucas.demarchi@xxxxxxxxx> wrote:
>> Like was done for the display part that parted ways with INTEL_GEN(),
>> replacing with DISPLAY_VER(), do a similar conversion for the rest of
>> the driver.
>>
>> v1.1: Remove .ko that was incorrectly added as part of patch 11, making it
>> very big and not going through the mailing list. Sorry for those in CC
>> who received it.
>>
>> v2:
>> - Add "drm/i915/display: rename display version macros" to rename
>> macro and repurpose it: s/IS_DISPLAY_RANGE/IS_DISPLAY_VER/ and convert
>> the current users of IS_DISPLAY_VER to use direct comparison
>> - Group display patches to easily apply independently
>
> I like the direction here. Even as the version checks diversify, we
> manage to simplify and reduce the macros.
>
> I think we're going to have to queueu this via a topic branch, and merge
> that to both drm-intel-next and drm-intel-gt-next. The next time the
> branches can sync up is just too far away at this point, and the
> conflicts may be really nasty to solve later.
>
> That does mean having to solve the conflict with 70bfb30743d5
> ("drm/i915/display: Eliminate IS_GEN9_{BC,LP}") which is in din but not
> dign. The topic branch would be based on:
>
> $ git merge-base drm-intel/drm-intel-next drm-intel/drm-intel-gt-next
> 9c0fed84d5750e1eea6c664e073ffa2534a17743
>
> There are two (crappy?) ideas to make that easier. 1) revert
> 70bfb30743d5 from din and add it to the topic branch instead, 2) don't
> revert it but cherry-pick it to the topic branch also.
>
> Cc: Joonas and Daniel for their input on this as well.
I've created the topic branch topic/intel-gen-to-ver where the series
should be applied.
However, for the reasons above, it does not apply as-is, and the merge
will conflict slightly.
Also, I think Ville's fixes [1] should land on the topic branch *first*
because they need to be propagated to drm-intel-next-fixes.
BR,
Jani.
[1] https://lore.kernel.org/intel-gfx/20210412054607.18133-1-ville.syrjala@xxxxxxxxxxxxxxx/
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
