[igt-dev] [PATCH v2] drm-uapi: sync with drm-next

[Simon Ser]

On Friday, July 28th, 2023 at 10:49, Zbigniew Kempczyński <zbigniew.kempczynski at intel.com> wrote:

> On Fri, Jul 28, 2023 at 08:31:18AM +0000, Simon Ser wrote:
> 
> > On Friday, July 28th, 2023 at 10:21, Zbigniew Kempczyński zbigniew.kempczynski at intel.com wrote:
> > 
> > > On Thu, Jul 27, 2023 at 05:43:17PM +0000, Simon Ser wrote:
> > > 
> > > > Sync with drm-next commit 52920704df878050123dfeb469aa6ab8022547c1.
> > > > 
> > > > This is required for:
> > > > https://patchwork.freedesktop.org/patch/547602/?series=120551&rev=4
> > > > 
> > > > v2: drop redefinitions from lib/i915/i915_drm_local.h
> > > 
> > > I was pretty sure we're doing verbatim copy of kernel drm uapi
> > > files but it looks due to two issues there's not possible at the
> > > moment.
> > > 
> > > I've copied all drm files to igt directories and two definitions
> > > needs to be added locally to work:
> > > 
> > > 1. in drm.h
> > > +#define __user
> > > 
> > > 2. in i915_drm:
> > > #define __packed attribute((packed))
> > > 
> > > (change 2 requires removing this definition from tools/intel_vbt_decode.c)
> > > 
> > > I think the best would be to replace in kernel uapi i915_drm.h file
> > > __packed to attribute((packed)) (this is used in single place).
> > > 
> > > Simon - what do you think? I think to avoid manually comparison of
> > > drm uapi header files between kernel and igt would be better to
> > > introduce #define __user in drm.h each time we sync but rest of
> > > the files would be intact (but this requires merging 2.).
> > 
> > This is not what the README says, and I don't think it's a great
> > solution, because it requires more manual steps and is difficult to
> > review.
> > 
> > I don't see __user anywhere, neither in the old nor in the new headers.
> 
> Maybe we're not on the same page. I've copied all headers from kernel
> include/uapi/drm/ directory. And I would like to do this in the future.
> But those files contains __user definition which is not defined in the
> userspace. Adding empty definition solves this.

You need to "make headers_install" as described in the README.

> I'm not sure how you've did the copy from the kernel uapi headers to
> igt but as there're differences (__user) you had to do this manually
> removing it. This is what I would like to avoid in the future. One
> big pain now, then verbatim copy + adding __user in drm.h. I tried
> to do this in meson.build adding -Duser='' but without success.

This would set a Meson option, not a C define. It should be possible to

    add_project_arguments('-D__user', language: 'c')

But as mentioned above, should not be necessary.