On Wed, 07 Jul 2021, Lucas De Marchi <lucas.demarchi@xxxxxxxxx> wrote: > Finish the conversion to the new VER macros and nuke the old macros so > we don't have more changes sneaking in. > > Initially I thought about waiting for a backmerge from drm-next in > drm-intel-next so I could use a topic branch to finish the conversion > and nuke the macro, merging the topic branch in both drm-intel-next and > drm-intel-gt-next. After the backmerge landed, I realized that would not > be possible anymore as we already have changes on top preventing the > merge-base to be used for a topic branch. > > Therefore the plan is: > - Apply patch 1 in drm-intel-gt-next > - Apply patches 2 and 3 in drm-intel-next > > Since patches are tested on drm-tip, CI should flag a build breakage if > someone uses the GEN macros. Another possibility is to simply apply the > 3rd patch on both branches, but I don't see a real need for that. Acked-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > Lucas De Marchi (3): > drm/i915/gt: finish INTEL_GEN and friends conversion > drm/i915: finish INTEL_GEN and friends conversion > gpu/drm/i915: nuke old GEN macros > > .../drm/i915/display/intel_display_debugfs.c | 3 ++- > drivers/gpu/drm/i915/gt/intel_migrate.c | 20 +++++++++---------- > drivers/gpu/drm/i915/i915_debugfs.c | 2 +- > drivers/gpu/drm/i915/i915_drv.h | 15 -------------- > drivers/gpu/drm/i915/intel_uncore.c | 2 +- > 5 files changed, 14 insertions(+), 28 deletions(-) -- Jani Nikula, Intel Open Source Graphics Center
