From: Lucas De Marchi <lucas.demarchi@intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: Daniel Vetter <daniel.vetter@intel.com> Subject: [PATCH 0/3] drm/i915: Nuke GEN macros Date: Wed, 7 Jul 2021 11:13:22 -0700 [thread overview] Message-ID: <20210707181325.2130821-1-lucas.demarchi@intel.com> (raw) 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. 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(-) -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Lucas De Marchi <lucas.demarchi@intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: Daniel Vetter <daniel.vetter@intel.com> Subject: [Intel-gfx] [PATCH 0/3] drm/i915: Nuke GEN macros Date: Wed, 7 Jul 2021 11:13:22 -0700 [thread overview] Message-ID: <20210707181325.2130821-1-lucas.demarchi@intel.com> (raw) 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. 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(-) -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2021-07-07 18:14 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-07 18:13 Lucas De Marchi [this message] 2021-07-07 18:13 ` [Intel-gfx] [PATCH 0/3] drm/i915: Nuke GEN macros Lucas De Marchi 2021-07-07 18:13 ` [PATCH 1/3] drm/i915/gt: finish INTEL_GEN and friends conversion Lucas De Marchi 2021-07-07 18:13 ` [Intel-gfx] " Lucas De Marchi 2021-07-07 19:36 ` Matt Roper 2021-07-07 19:36 ` [Intel-gfx] " Matt Roper 2021-07-07 18:13 ` [PATCH 2/3] drm/i915: " Lucas De Marchi 2021-07-07 18:13 ` [Intel-gfx] " Lucas De Marchi 2021-07-07 19:39 ` Matt Roper 2021-07-07 19:39 ` [Intel-gfx] " Matt Roper 2021-07-07 21:44 ` Lucas De Marchi 2021-07-07 21:44 ` [Intel-gfx] " Lucas De Marchi 2021-07-07 18:13 ` [PATCH 3/3] gpu/drm/i915: nuke old GEN macros Lucas De Marchi 2021-07-07 18:13 ` [Intel-gfx] " Lucas De Marchi 2021-07-07 19:41 ` Matt Roper 2021-07-07 19:41 ` [Intel-gfx] " Matt Roper 2021-07-07 18:27 ` [PATCH 0/3] drm/i915: Nuke " Jani Nikula 2021-07-07 18:27 ` [Intel-gfx] " Jani Nikula 2021-07-07 19:00 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2021-07-07 22:44 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
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=20210707181325.2130821-1-lucas.demarchi@intel.com \ --to=lucas.demarchi@intel.com \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.