drm/shmem-helper: Revert accidental non-GPL export

[PATCH] drm/shmem-helper: Revert accidental non-GPL export

Posted by Asahi Lina 2 years, 6 months ago

The referenced commit added a wrapper for drm_gem_shmem_get_pages_sgt(),
but in the process it accidentally changed the export type from GPL to
non-GPL. Switch it back to GPL.

Reported-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Fixes: ddddedaa0db9 ("drm/shmem-helper: Fix locking for drm_gem_shmem_get_pages_sgt()")
Signed-off-by: Asahi Lina <lina@asahilina.net>
---
 drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 7e5c6a8d0212..75185a960fc4 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -744,7 +744,7 @@ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem)
 
 	return sgt;
 }
-EXPORT_SYMBOL(drm_gem_shmem_get_pages_sgt);
+EXPORT_SYMBOL_GPL(drm_gem_shmem_get_pages_sgt);
 
 /**
  * drm_gem_shmem_prime_import_sg_table - Produce a shmem GEM object from

---
base-commit: f3a2439f20d918930cc4ae8f76fe1c1afd26958f
change-id: 20230227-shmem-export-fix-85fde1351104

Thank you,
~~ Lina

Re: [PATCH] drm/shmem-helper: Revert accidental non-GPL export

Posted by Thomas Zimmermann 2 years, 6 months ago

Added to drm-misc-next-fixes.

Am 27.02.23 um 10:04 schrieb Asahi Lina:
> The referenced commit added a wrapper for drm_gem_shmem_get_pages_sgt(),
> but in the process it accidentally changed the export type from GPL to
> non-GPL. Switch it back to GPL.
> 
> Reported-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> Fixes: ddddedaa0db9 ("drm/shmem-helper: Fix locking for drm_gem_shmem_get_pages_sgt()")
> Signed-off-by: Asahi Lina <lina@asahilina.net>
> ---
>   drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index 7e5c6a8d0212..75185a960fc4 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -744,7 +744,7 @@ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem)
>   
>   	return sgt;
>   }
> -EXPORT_SYMBOL(drm_gem_shmem_get_pages_sgt);
> +EXPORT_SYMBOL_GPL(drm_gem_shmem_get_pages_sgt);
>   
>   /**
>    * drm_gem_shmem_prime_import_sg_table - Produce a shmem GEM object from
> 
> ---
> base-commit: f3a2439f20d918930cc4ae8f76fe1c1afd26958f
> change-id: 20230227-shmem-export-fix-85fde1351104
> 
> Thank you,
> ~~ Lina
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev

Re: [PATCH] drm/shmem-helper: Revert accidental non-GPL export

Posted by Thomas Zimmermann 2 years, 6 months ago

Hi

Am 27.02.23 um 10:04 schrieb Asahi Lina:
> The referenced commit added a wrapper for drm_gem_shmem_get_pages_sgt(),
> but in the process it accidentally changed the export type from GPL to
> non-GPL. Switch it back to GPL.
> 
> Reported-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> Fixes: ddddedaa0db9 ("drm/shmem-helper: Fix locking for drm_gem_shmem_get_pages_sgt()")
> Signed-off-by: Asahi Lina <lina@asahilina.net>

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

Thanks a lot. I'll add your patch to drm-misc-fixes ASAP.

Best regards
Thomas

> ---
>   drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index 7e5c6a8d0212..75185a960fc4 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -744,7 +744,7 @@ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem)
>   
>   	return sgt;
>   }
> -EXPORT_SYMBOL(drm_gem_shmem_get_pages_sgt);
> +EXPORT_SYMBOL_GPL(drm_gem_shmem_get_pages_sgt);
>   
>   /**
>    * drm_gem_shmem_prime_import_sg_table - Produce a shmem GEM object from
> 
> ---
> base-commit: f3a2439f20d918930cc4ae8f76fe1c1afd26958f
> change-id: 20230227-shmem-export-fix-85fde1351104
> 
> Thank you,
> ~~ Lina
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev

Re: [PATCH] drm/shmem-helper: Revert accidental non-GPL export

Posted by Javier Martinez Canillas 2 years, 6 months ago

Thomas Zimmermann <tzimmermann@suse.de> writes:

> Hi
>
> Am 27.02.23 um 10:04 schrieb Asahi Lina:
>> The referenced commit added a wrapper for drm_gem_shmem_get_pages_sgt(),
>> but in the process it accidentally changed the export type from GPL to
>> non-GPL. Switch it back to GPL.
>> 
>> Reported-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>> Fixes: ddddedaa0db9 ("drm/shmem-helper: Fix locking for drm_gem_shmem_get_pages_sgt()")
>> Signed-off-by: Asahi Lina <lina@asahilina.net>
>
> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
>
> Thanks a lot. I'll add your patch to drm-misc-fixes ASAP.
>

Thanks for fixing this and sorry that I missed it during review.

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

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat