[igt-dev] [PATCH i-g-t 1/8] tests/i915/gem_pxp: Add LOCAL_ UAPI defines
Teres Alexis, Alan Previn
alan.previn.teres.alexis at intel.com
Wed Oct 6 17:40:29 UTC 2021
Apologies for the IRQ, newbie-question:
WRT "... Early uapi declarations should be added here exactly as they are
expected to appear in the kernel uapi headers ", during the initial series reviews
(pending merge + propagation), I added those definitions / structures into
I915_drm_local.h with additional comments explaining where they belong
in the main header (example: this definition is a new flag param for structure 'foo'),
which is unnecessary once u merge the kernel UAPI in where the context is apparent.
I assume such additional-context would be okay? If so, the exclusion during merge would
Be expected to be manual right? (comparing the delta matched)?
...alan
-----Original Message-----
From: Dixit, Ashutosh <ashutosh.dixit at intel.com>
Sent: Wednesday, October 6, 2021 10:32 AM
To: Vivi, Rodrigo <rodrigo.vivi at intel.com>
Cc: igt-dev at lists.freedesktop.org; Teres Alexis, Alan Previn <alan.previn.teres.alexis at intel.com>; Latvala, Petri <petri.latvala at intel.com>
Subject: Re: [igt-dev] [PATCH i-g-t 1/8] tests/i915/gem_pxp: Add LOCAL_ UAPI defines
On Wed, 06 Oct 2021 10:25:25 -0700, Rodrigo Vivi wrote:
>
> On Wed, Oct 06, 2021 at 10:17:41AM -0700, Dixit, Ashutosh wrote:
> > On Wed, 06 Oct 2021 09:14:37 -0700, Rodrigo Vivi wrote:
> > >
> > > While the UAPI changes don't propagate to drm-next we should have
> > > that as LOCAL_ ones.
> >
> > Please add these in lib/i915/i915_drm_local.h as follows:
>
> Could we move this file to the include directory and document it in
> the README.md along with the uapi sync mention?
I think that should be fine. Petri: what do you think, since the directory is supposed to contain "imported" kernel headers?
Anyway, let's add the LOCAL's to this file for now as it says below. Thanks.
>
> >
> > /*
> > * It is necessary on occasion to add uapi declarations to IGT
> > before they
> > * appear in imported kernel uapi headers. This header is provided
> > for this
> > * purpose.
> >
> > * Early uapi declarations should be added here exactly as they are
> > * expected to appear in the kernel uapi headers, i.e. without the
> > LOCAL_
> > * or local_ prefix and without any #ifndef's. Attempt should be
> > made to
> > * clean these up when kernel uapi headers are sync'd.
> > */
> >
> > >
> > > That was my mistake during review and merge since I had ignored
> > > the rules documented at README.md and considered drm-intel
> > > branches would be enough. I'm sorry.
> > >
> > > Cc: Alan Previn <alan.previn.teres.alexis at intel.com>
> > > Cc: Petri Latvala <petri.latvala at intel.com>
> > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
More information about the igt-dev
mailing list