All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm: use "0" instead of "" for deprecated driver date
@ 2024-05-10  9:09 Jani Nikula
  2024-05-10  9:30 ` Javier Martinez Canillas
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Jani Nikula @ 2024-05-10  9:09 UTC (permalink / raw)
  To: dri-devel; +Cc: jani.nikula, Steven Price

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@arm.com>
Closes: https://lore.kernel.org/r/9d0cff47-308e-4b11-a9f3-4157dc26b6fa@arm.com
Fixes: 7fb8af6798e8 ("drm: deprecate driver date")
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 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");
 	if (!err)
 		err = drm_copy_field(version->desc, &version->desc_len,
 				dev->driver->desc);
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH] drm: use "0" instead of "" for deprecated driver date
  2024-05-10  9:09 [PATCH] drm: use "0" instead of "" for deprecated driver date Jani Nikula
@ 2024-05-10  9:30 ` Javier Martinez Canillas
  2024-05-10  9:36 ` Steven Price
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 7+ messages in thread
From: Javier Martinez Canillas @ 2024-05-10  9:30 UTC (permalink / raw)
  To: Jani Nikula, dri-devel; +Cc: jani.nikula, Steven Price

Jani Nikula <jani.nikula@intel.com> writes:

> 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@arm.com>
> Closes: https://lore.kernel.org/r/9d0cff47-308e-4b11-a9f3-4157dc26b6fa@arm.com
> Fixes: 7fb8af6798e8 ("drm: deprecate driver date")
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---

It's a pity that libdrm can't cope with the empty string, using 0 makes sense.

Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] drm: use "0" instead of "" for deprecated driver date
  2024-05-10  9:09 [PATCH] drm: use "0" instead of "" for deprecated driver date Jani Nikula
  2024-05-10  9:30 ` Javier Martinez Canillas
@ 2024-05-10  9:36 ` Steven Price
  2024-05-10 10:36 ` Simon Ser
  2024-05-10 17:33 ` Ville Syrjälä
  3 siblings, 0 replies; 7+ messages in thread
From: Steven Price @ 2024-05-10  9:36 UTC (permalink / raw)
  To: Jani Nikula, dri-devel

On 10/05/2024 10:09, 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@arm.com>
> Closes: https://lore.kernel.org/r/9d0cff47-308e-4b11-a9f3-4157dc26b6fa@arm.com
> Fixes: 7fb8af6798e8 ("drm: deprecate driver date")
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Tested-by: Steven Price <steven.price@arm.com>

Thanks,
Steve

> ---
>  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");
>  	if (!err)
>  		err = drm_copy_field(version->desc, &version->desc_len,
>  				dev->driver->desc);


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] drm: use "0" instead of "" for deprecated driver date
  2024-05-10  9:09 [PATCH] drm: use "0" instead of "" for deprecated driver date Jani Nikula
  2024-05-10  9:30 ` Javier Martinez Canillas
  2024-05-10  9:36 ` Steven Price
@ 2024-05-10 10:36 ` Simon Ser
  2024-05-10 17:33 ` Ville Syrjälä
  3 siblings, 0 replies; 7+ messages in thread
From: Simon Ser @ 2024-05-10 10:36 UTC (permalink / raw)
  To: Jani Nikula; +Cc: dri-devel, Steven Price

Sounds good to me.

Reviewed-by: Simon Ser <contact@emersion.fr>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] drm: use "0" instead of "" for deprecated driver date
  2024-05-10  9:09 [PATCH] drm: use "0" instead of "" for deprecated driver date Jani Nikula
                   ` (2 preceding siblings ...)
  2024-05-10 10:36 ` Simon Ser
@ 2024-05-10 17:33 ` Ville Syrjälä
  2024-05-10 17:59   ` Ville Syrjälä
  3 siblings, 1 reply; 7+ messages in thread
From: Ville Syrjälä @ 2024-05-10 17:33 UTC (permalink / raw)
  To: Jani Nikula; +Cc: dri-devel, Steven Price

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@arm.com>
> Closes: https://lore.kernel.org/r/9d0cff47-308e-4b11-a9f3-4157dc26b6fa@arm.com
> Fixes: 7fb8af6798e8 ("drm: deprecate driver date")
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  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?

>  	if (!err)
>  		err = drm_copy_field(version->desc, &version->desc_len,
>  				dev->driver->desc);
> -- 
> 2.39.2

-- 
Ville Syrjälä
Intel

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] drm: use "0" instead of "" for deprecated driver date
  2024-05-10 17:33 ` Ville Syrjälä
@ 2024-05-10 17:59   ` Ville Syrjälä
  2024-05-13  7:46     ` Jani Nikula
  0 siblings, 1 reply; 7+ messages in thread
From: Ville Syrjälä @ 2024-05-10 17:59 UTC (permalink / raw)
  To: Jani Nikula; +Cc: dri-devel, Steven Price

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@arm.com>
> > Closes: https://lore.kernel.org/r/9d0cff47-308e-4b11-a9f3-4157dc26b6fa@arm.com
> > Fixes: 7fb8af6798e8 ("drm: deprecate driver date")
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> > ---
> >  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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] drm: use "0" instead of "" for deprecated driver date
  2024-05-10 17:59   ` Ville Syrjälä
@ 2024-05-13  7:46     ` Jani Nikula
  0 siblings, 0 replies; 7+ messages in thread
From: Jani Nikula @ 2024-05-13  7:46 UTC (permalink / raw)
  To: Ville Syrjälä; +Cc: dri-devel, Steven Price

On Fri, 10 May 2024, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> 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@arm.com>
>> > Closes: https://lore.kernel.org/r/9d0cff47-308e-4b11-a9f3-4157dc26b6fa@arm.com
>> > Fixes: 7fb8af6798e8 ("drm: deprecate driver date")
>> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> > ---
>> >  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.

Thanks, and sorry.

BR,
Jani.

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

-- 
Jani Nikula, Intel

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-05-13  7:46 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-10  9:09 [PATCH] drm: use "0" instead of "" for deprecated driver date Jani Nikula
2024-05-10  9:30 ` Javier Martinez Canillas
2024-05-10  9:36 ` Steven Price
2024-05-10 10:36 ` Simon Ser
2024-05-10 17:33 ` Ville Syrjälä
2024-05-10 17:59   ` Ville Syrjälä
2024-05-13  7:46     ` Jani Nikula

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.