On Wednesday, 2019-04-10 21:49:33 -0400, Rob Clark wrote: > On Tue, Apr 9, 2019 at 8:27 AM Eric Engestrom <eric.engestrom@xxxxxxxxx> wrote: > > > > diff --git a/include/drm/msm_drm.h b/include/drm/msm_drm.h > > > > index c06d0a5..91a16b3 100644 > > > > --- a/include/drm/msm_drm.h > > > > +++ b/include/drm/msm_drm.h > > > > @@ -105,14 +105,24 @@ struct drm_msm_gem_new { > > > > __u32 handle; /* out */ > > > > }; > > > > > > > > -#define MSM_INFO_IOVA 0x01 > > > > - > > > > -#define MSM_INFO_FLAGS (MSM_INFO_IOVA) > > > > +/* Get or set GEM buffer info. The requested value can be passed > > > > + * directly in 'value', or for data larger than 64b 'value' is a > > > > + * pointer to userspace buffer, with 'len' specifying the number of > > > > + * bytes copied into that buffer. For info returned by pointer, > > > > + * calling the GEM_INFO ioctl with null 'value' will return the > > > > + * required buffer size in 'len' > > > > + */ > > > > +#define MSM_INFO_GET_OFFSET 0x00 /* get mmap() offset, returned by value */ > > > > +#define MSM_INFO_GET_IOVA 0x01 /* get iova, returned by value */ > > > > +#define MSM_INFO_SET_NAME 0x02 /* set the debug name (by pointer) */ > > > > +#define MSM_INFO_GET_NAME 0x03 /* get debug name, returned by pointer */ > > > > > > > > struct drm_msm_gem_info { > > > > __u32 handle; /* in */ > > > > - __u32 flags; /* in - combination of MSM_INFO_* flags */ > > > > - __u64 offset; /* out, mmap() offset or iova */ > > > > + __u32 info; /* in - one of MSM_INFO_* */ > > > > + __u64 value; /* in or out */ > > > > + __u32 len; /* in or out */ > > > > + __u32 pad; > > > > freedreno/msm/msm_bo.c needs to be updated to reflect those changes. > > > I think you can just rename flags->info and offset->value, the rest of > the struct should be zero-initialized.. if in doubt you can check > $mesa/src/freedreno/drm/msm_bo.c > > side-note: the libdrm_freedreno code was folded into mesa in 19.0, so > at *some* point we can probably disable libdrm_freedreno build by > default. Right now, freedreno's `auto` enables it by default on arm and disables it on everything else. I always enable everything to at least build-test it, but Ayan was using the defaults which is why he didn't see this issue at first. Btw, the GitLab CI builds everything, so it hopefully won't bitrot unnoticed. > (I'd kinda still like to keep the code around for some misc > standalone tools I have, but that is the sort of thing where I can fix > libdrm if it gets broken). When to switch to disabled by default I > guess comes down to how long we want to support mesa 18.x with latest > libdrm?? Maybe after 19.1, since (selfishly motivated) that gives me > a long enough window back in case I find myself needing to bisect for > some regression.. _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx