Re: [PATCH 1/2] tools: Move tools/include/uapi/drm to tools/perf/trace/beauty/include/uapi

[Arnaldo Carvalho de Melo]

On Wed, Apr 01, 2026 at 02:22:44PM -0700, Ian Rogers wrote:
> On Wed, Apr 1, 2026 at 2:02 PM Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> wrote:
> >
> > From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> >
> > As it is used only to parse ioctl numbers, not to build perf and so far
> > no other tools/ living tool uses it, so to clean up tools/include/ to be
> > used just for building tools, to have access to things available in the
> > kernel and not yet in the system headers, move it to the directory where
> > just the tools/perf/trace/beauty/ scripts can use to generate tables
> > used by perf.
> >
> > Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> 
> The moving headers changes I think have been incorporated into your
> clean up series. For the moving headers:
> 
> Reviewed-by: Ian Rogers <irogers@xxxxxxxxxx>

I see, I didn't cleanup the 000*.patch files from a previous pull req
:-\ So ended up resending them.

- Arnaldo
 
> Thanks,
> Ian
> 
> > ---
> >  tools/perf/Makefile.perf                                  | 2 +-
> >  tools/perf/check-headers.sh                               | 4 ++--
> >  tools/perf/trace/beauty/drm_ioctl.sh                      | 2 +-
> >  tools/{ => perf/trace/beauty}/include/uapi/drm/drm.h      | 0
> >  tools/{ => perf/trace/beauty}/include/uapi/drm/i915_drm.h | 0
> >  5 files changed, 4 insertions(+), 4 deletions(-)
> >  rename tools/{ => perf/trace/beauty}/include/uapi/drm/drm.h (100%)
> >  rename tools/{ => perf/trace/beauty}/include/uapi/drm/i915_drm.h (100%)
> >
> > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> > index f7b936deeaa2cd7c..a560fbc847934fad 100644
> > --- a/tools/perf/Makefile.perf
> > +++ b/tools/perf/Makefile.perf
> > @@ -547,7 +547,7 @@ $(clone_flags_array): $(beauty_uapi_linux_dir)/sched.h $(clone_flags_tbl)
> >         $(Q)$(SHELL) '$(clone_flags_tbl)' $(beauty_uapi_linux_dir) > $@
> >
> >  drm_ioctl_array := $(beauty_ioctl_outdir)/drm_ioctl_array.c
> > -drm_hdr_dir := $(srctree)/tools/include/uapi/drm
> > +drm_hdr_dir := $(srctree)/tools/perf/trace/beauty/include/uapi/drm
> >  drm_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/drm_ioctl.sh
> >
> >  $(drm_ioctl_array): $(drm_hdr_dir)/drm.h $(drm_hdr_dir)/i915_drm.h $(drm_ioctl_tbl)
> > diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh
> > index 31826621eebdb003..c6b136fe8d13053d 100755
> > --- a/tools/perf/check-headers.sh
> > +++ b/tools/perf/check-headers.sh
> > @@ -6,8 +6,6 @@ NC='\033[0m' # No Color
> >
> >  declare -a FILES=(
> >    "include/uapi/linux/const.h"
> > -  "include/uapi/drm/drm.h"
> > -  "include/uapi/drm/i915_drm.h"
> >    "include/uapi/linux/bits.h"
> >    "include/uapi/linux/fadvise.h"
> >    "include/uapi/linux/fscrypt.h"
> > @@ -90,6 +88,8 @@ declare -a SYNC_CHECK_FILES=(
> >  declare -a BEAUTY_FILES=(
> >    "arch/x86/include/asm/irq_vectors.h"
> >    "arch/x86/include/uapi/asm/prctl.h"
> > +  "include/uapi/drm/drm.h"
> > +  "include/uapi/drm/i915_drm.h"
> >    "include/linux/socket.h"
> >    "include/uapi/linux/fcntl.h"
> >    "include/uapi/linux/fs.h"
> > diff --git a/tools/perf/trace/beauty/drm_ioctl.sh b/tools/perf/trace/beauty/drm_ioctl.sh
> > index 9aa94fd523a9c2dd..f2f1a257bac8b41e 100755
> > --- a/tools/perf/trace/beauty/drm_ioctl.sh
> > +++ b/tools/perf/trace/beauty/drm_ioctl.sh
> > @@ -1,7 +1,7 @@
> >  #!/bin/sh
> >  # SPDX-License-Identifier: LGPL-2.1
> >
> > -[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/include/uapi/drm/
> > +[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/perf/trace/beauty/include/uapi/drm/
> >
> >  printf "#ifndef DRM_COMMAND_BASE\n"
> >  grep "#define DRM_COMMAND_BASE" $header_dir/drm.h
> > diff --git a/tools/include/uapi/drm/drm.h b/tools/perf/trace/beauty/include/uapi/drm/drm.h
> > similarity index 100%
> > rename from tools/include/uapi/drm/drm.h
> > rename to tools/perf/trace/beauty/include/uapi/drm/drm.h
> > diff --git a/tools/include/uapi/drm/i915_drm.h b/tools/perf/trace/beauty/include/uapi/drm/i915_drm.h
> > similarity index 100%
> > rename from tools/include/uapi/drm/i915_drm.h
> > rename to tools/perf/trace/beauty/include/uapi/drm/i915_drm.h
> > --
> > 2.53.0
> >