Re: [PATCH] drm: use "0" instead of "" for deprecated driver date

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, May 10, 2024 at 08:33:59PM +0300, Ville Syrjälä wrote:
> On Fri, May 10, 2024 at 12:09:51PM +0300, Jani Nikula wrote:
> > libdrm does not like the empty string for driver date. Use "0" instead,
> > which has been used by virtio previously.
> > 
> > Reported-by: Steven Price <steven.price@xxxxxxx>
> > Closes: https://lore.kernel.org/r/9d0cff47-308e-4b11-a9f3-4157dc26b6fa@xxxxxxx
> > Fixes: 7fb8af6798e8 ("drm: deprecate driver date")
> > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> > ---
> >  drivers/gpu/drm/drm_ioctl.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
> > index 89feb7306e47..51f39912866f 100644
> > --- a/drivers/gpu/drm/drm_ioctl.c
> > +++ b/drivers/gpu/drm/drm_ioctl.c
> > @@ -530,9 +530,9 @@ int drm_version(struct drm_device *dev, void *data,
> >  	err = drm_copy_field(version->name, &version->name_len,
> >  			dev->driver->name);
> >  
> > -	/* Driver date is deprecated. Return the empty string. */
> > +	/* Driver date is deprecated. Userspace expects a non-empty string. */
> >  	if (!err)
> > -		err = drm_copy_field(version->date, &version->date_len, "");
> > +		err = drm_copy_field(version->date, &version->date_len, "0");
> 
> Does this also fix igt/core_getversion which is on fire now?

At least it fixes Xorg which currently just segfaults.

Pushed to drm-misc-next. Thanks everyone.

> 
> >  	if (!err)
> >  		err = drm_copy_field(version->desc, &version->desc_len,
> >  				dev->driver->desc);
> > -- 
> > 2.39.2
> 
> -- 
> Ville Syrjälä
> Intel

-- 
Ville Syrjälä
Intel



[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux