From: Jani Nikula <jani.nikula@linux.intel.com>
To: Lucas De Marchi <lucas.demarchi@intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v2 00/12] drm/i915: Extend GEN renames to the rest of the driver
Date: Wed, 14 Apr 2021 11:08:48 +0300 [thread overview]
Message-ID: <87v98pffu7.fsf@intel.com> (raw)
In-Reply-To: <87a6q2h57k.fsf@intel.com>
On Tue, 13 Apr 2021, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Mon, 12 Apr 2021, Lucas De Marchi <lucas.demarchi@intel.com> 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@linux.intel.com/
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-04-14 8:08 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 5:09 [Intel-gfx] [PATCH v2 00/12] drm/i915: Extend GEN renames to the rest of the driver Lucas De Marchi
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 01/12] drm/i915/display: use DISPLAY_VER() on remaining users Lucas De Marchi
2021-04-13 9:24 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 02/12] drm/i915: rename display.version to display.ver Lucas De Marchi
2021-04-13 9:25 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 03/12] drm/i915/display: rename display version macros Lucas De Marchi
2021-04-13 9:35 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 04/12] drm/i915: add macros for graphics and media versions Lucas De Marchi
2021-04-13 9:33 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 05/12] drm/i915/gt: replace gen use in intel_engine_cs Lucas De Marchi
2021-04-13 9:36 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 06/12] drm/i915/selftests: replace unused mask with simple version Lucas De Marchi
2021-04-13 9:36 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 07/12] drm/i915/selftests: eliminate use of gen_mask Lucas De Marchi
2021-04-13 9:38 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 08/12] drm/i915: finish removal " Lucas De Marchi
2021-04-13 9:40 ` Jani Nikula
2021-04-14 11:38 ` Tvrtko Ursulin
2021-04-14 13:13 ` Jani Nikula
2021-04-14 13:46 ` Tvrtko Ursulin
2021-04-15 10:22 ` Jani Nikula
2021-04-14 17:41 ` Lucas De Marchi
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 09/12] drm/i915: eliminate remaining uses of intel_device_info->gen Lucas De Marchi
2021-04-13 9:43 ` Jani Nikula
2021-04-13 5:10 ` [Intel-gfx] [PATCH v2 10/12] drm/i915: finish removal of gen from intel_device_info Lucas De Marchi
2021-04-13 9:45 ` Jani Nikula
2021-04-13 5:10 ` [Intel-gfx] [PATCH v2 11/12] drm/i915: add media and display versions to device_info print Lucas De Marchi
2021-04-13 9:46 ` Jani Nikula
2021-04-13 5:10 ` [Intel-gfx] [PATCH v2 12/12] drm/i915: split dgfx features from gen 12 Lucas De Marchi
2021-04-13 9:47 ` Jani Nikula
2021-04-13 5:43 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Extend GEN renames to the rest of the driver (rev3) Patchwork
2021-04-13 5:45 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-04-13 5:48 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-04-13 6:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-04-13 7:29 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-04-13 10:03 ` [Intel-gfx] [PATCH v2 00/12] drm/i915: Extend GEN renames to the rest of the driver Jani Nikula
2021-04-14 8:08 ` Jani Nikula [this message]
2021-04-14 10:06 ` Jani Nikula
2021-04-14 11:17 ` Joonas Lahtinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87v98pffu7.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lucas.demarchi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox