[igt-dev] [PATCH i-g-t 1/8] tests/i915/gem_pxp: Add LOCAL_ UAPI defines

Petri Latvala petri.latvala at intel.com
Thu Oct 7 08:19:49 UTC 2021


On Wed, Oct 06, 2021 at 10:32:04AM -0700, Dixit, Ashutosh wrote:
> 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?

Yeah that is fine. The directory is already not a full copy of _all_
drm-uapi headers.

-- 
Petri Latvala


> 
> 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