[PATCH 0/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[PATCH 0/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[Robert Swindells]

There was some earlier discussion on dual licencing as GPL-2 and MIT
some files that were previously just GPL-2:

<https://lore.kernel.org/dri-devel/CAKMK7uH-8+tbKsAoiChsxELEc_77RVVxP2wapHWhqB+0Viifog@mail.gmail.com/>

Would it be possible to dual licence two more of the files?

drivers/gpu/drm/drm_gem_shmem_helper.c
include/drm/drm_gem_shmem_helper.h

They are used by the lima driver, which is dual licenced.

Robert Swindells
rjs@NetBSD.org

Robert Swindells (1):
  drm/shmem: Dual licence the files as GPL-2 and MIT

 drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +-
 include/drm/drm_gem_shmem_helper.h     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.38.0

[PATCH 1/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[Robert Swindells]

Contributors to these files are:

Noralf Trønnes <noralf@tronnes.org>
Liu Zixian <liuzixian4@huawei.com>
Dave Airlie <airlied@redhat.com>
Thomas Zimmermann <tzimmermann@suse.de>
Lucas De Marchi <lucas.demarchi@intel.com>
Gerd Hoffmann <kraxel@redhat.com>
Rob Herring <robh@kernel.org>
Jakub Kicinski <kuba@kernel.org>
Marcel Ziswiler <marcel.ziswiler@toradex.com>
Stephen Rothwell <sfr@canb.auug.org.au>
Daniel Vetter <daniel.vetter@ffwll.ch>
Cai Huoqing <cai.huoqing@linux.dev>
Neil Roberts <nroberts@igalia.com>
Marek Szyprowski <m.szyprowski@samsung.com>
Emil Velikov <emil.velikov@collabora.com>
Sam Ravnborg <sam@ravnborg.org>
Boris Brezillon <boris.brezillon@collabora.com>
Dan Carpenter <dan.carpenter@oracle.com>

Signed-off-by: Robert Swindells <rjs@fdy2.co.uk>
---
 drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +-
 include/drm/drm_gem_shmem_helper.h     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 35138f8a375c..f1a68a71f876 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0 or MIT
 /*
  * Copyright 2018 Noralf Trønnes
  */
diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h
index a2201b2488c5..56ac32947d1c 100644
--- a/include/drm/drm_gem_shmem_helper.h
+++ b/include/drm/drm_gem_shmem_helper.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 or MIT */
 
 #ifndef __DRM_GEM_SHMEM_HELPER_H__
 #define __DRM_GEM_SHMEM_HELPER_H__
-- 
2.38.0

Re: [PATCH 1/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[Jakub Kicinski]

On Sat, 12 Nov 2022 19:42:10 +0000 Robert Swindells wrote:
> Contributors to these files are:
> 
> Noralf Trønnes <noralf@tronnes.org>
> Liu Zixian <liuzixian4@huawei.com>
> Dave Airlie <airlied@redhat.com>
> Thomas Zimmermann <tzimmermann@suse.de>
> Lucas De Marchi <lucas.demarchi@intel.com>
> Gerd Hoffmann <kraxel@redhat.com>
> Rob Herring <robh@kernel.org>
> Jakub Kicinski <kuba@kernel.org>
> Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Stephen Rothwell <sfr@canb.auug.org.au>
> Daniel Vetter <daniel.vetter@ffwll.ch>
> Cai Huoqing <cai.huoqing@linux.dev>
> Neil Roberts <nroberts@igalia.com>
> Marek Szyprowski <m.szyprowski@samsung.com>
> Emil Velikov <emil.velikov@collabora.com>
> Sam Ravnborg <sam@ravnborg.org>
> Boris Brezillon <boris.brezillon@collabora.com>
> Dan Carpenter <dan.carpenter@oracle.com>
> 
> Signed-off-by: Robert Swindells <rjs@fdy2.co.uk>

For the one-line #include addition I've contributed:

Acked-by: Jakub Kicinski <kuba@kernel.org>

:)

Re: [PATCH 1/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[Noralf Trønnes]

Den 12.11.2022 20.42, skrev Robert Swindells:
> Contributors to these files are:
> 
> Noralf Trønnes <noralf@tronnes.org>

Acked-by: Noralf Trønnes <noralf@tronnes.org>

> Liu Zixian <liuzixian4@huawei.com>
> Dave Airlie <airlied@redhat.com>
> Thomas Zimmermann <tzimmermann@suse.de>
> Lucas De Marchi <lucas.demarchi@intel.com>
> Gerd Hoffmann <kraxel@redhat.com>
> Rob Herring <robh@kernel.org>
> Jakub Kicinski <kuba@kernel.org>
> Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Stephen Rothwell <sfr@canb.auug.org.au>
> Daniel Vetter <daniel.vetter@ffwll.ch>
> Cai Huoqing <cai.huoqing@linux.dev>
> Neil Roberts <nroberts@igalia.com>
> Marek Szyprowski <m.szyprowski@samsung.com>
> Emil Velikov <emil.velikov@collabora.com>
> Sam Ravnborg <sam@ravnborg.org>
> Boris Brezillon <boris.brezillon@collabora.com>
> Dan Carpenter <dan.carpenter@oracle.com>
> 
> Signed-off-by: Robert Swindells <rjs@fdy2.co.uk>
> ---
>  drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +-
>  include/drm/drm_gem_shmem_helper.h     | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index 35138f8a375c..f1a68a71f876 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +// SPDX-License-Identifier: GPL-2.0 or MIT
>  /*
>   * Copyright 2018 Noralf Trønnes
>   */
> diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h
> index a2201b2488c5..56ac32947d1c 100644
> --- a/include/drm/drm_gem_shmem_helper.h
> +++ b/include/drm/drm_gem_shmem_helper.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 or MIT */
>  
>  #ifndef __DRM_GEM_SHMEM_HELPER_H__
>  #define __DRM_GEM_SHMEM_HELPER_H__

Re: [PATCH 1/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[Boris Brezillon]

On Sat, 12 Nov 2022 19:42:10 +0000
Robert Swindells <rjs@fdy2.co.uk> wrote:

> Contributors to these files are:
> 
> Noralf Trønnes <noralf@tronnes.org>
> Liu Zixian <liuzixian4@huawei.com>
> Dave Airlie <airlied@redhat.com>
> Thomas Zimmermann <tzimmermann@suse.de>
> Lucas De Marchi <lucas.demarchi@intel.com>
> Gerd Hoffmann <kraxel@redhat.com>
> Rob Herring <robh@kernel.org>
> Jakub Kicinski <kuba@kernel.org>
> Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Stephen Rothwell <sfr@canb.auug.org.au>
> Daniel Vetter <daniel.vetter@ffwll.ch>
> Cai Huoqing <cai.huoqing@linux.dev>
> Neil Roberts <nroberts@igalia.com>
> Marek Szyprowski <m.szyprowski@samsung.com>
> Emil Velikov <emil.velikov@collabora.com>
> Sam Ravnborg <sam@ravnborg.org>
> Boris Brezillon <boris.brezillon@collabora.com>

Acked-by: Boris Brezillon <boris.brezillon@collabora.com>

> Dan Carpenter <dan.carpenter@oracle.com>
> 
> Signed-off-by: Robert Swindells <rjs@fdy2.co.uk>
> ---
>  drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +-
>  include/drm/drm_gem_shmem_helper.h     | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index 35138f8a375c..f1a68a71f876 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +// SPDX-License-Identifier: GPL-2.0 or MIT
>  /*
>   * Copyright 2018 Noralf Trønnes
>   */
> diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h
> index a2201b2488c5..56ac32947d1c 100644
> --- a/include/drm/drm_gem_shmem_helper.h
> +++ b/include/drm/drm_gem_shmem_helper.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 or MIT */
>  
>  #ifndef __DRM_GEM_SHMEM_HELPER_H__
>  #define __DRM_GEM_SHMEM_HELPER_H__

Re: [PATCH 1/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[Rob Herring]

On Sat, Nov 12, 2022 at 1:44 PM Robert Swindells <rjs@fdy2.co.uk> wrote:
>
> Contributors to these files are:
>
> Noralf Trønnes <noralf@tronnes.org>
> Liu Zixian <liuzixian4@huawei.com>
> Dave Airlie <airlied@redhat.com>
> Thomas Zimmermann <tzimmermann@suse.de>
> Lucas De Marchi <lucas.demarchi@intel.com>
> Gerd Hoffmann <kraxel@redhat.com>
> Rob Herring <robh@kernel.org>

My contributions are related to the madvise functions. That's largely
lifted or inspired from the MSM code which is GPL only. That in turn
looks inspired from i915 which is MIT (though not much more than the
comment):

$ git grep 'Our goal here is to return as much of the memory'
drivers/gpu/drm/drm_gem_shmem_helper.c: /* Our goal here is to return
as much of the memory as
drivers/gpu/drm/i915/gem/i915_gem_shmem.c:       * Our goal here is to
return as much of the memory as
drivers/gpu/drm/msm/msm_gem.c:  /* Our goal here is to return as much
of the memory as


I imagine this is not the only example in this file. In fact, looking
at the introduction of this file, it looks like it originated from V3D
code as that was the first driver to convert over. V3D is licensed
GPL2+. Of course, its code was not written in a vacuum either and came
from ???

This to me is a problem with the dual licensing in DRM drivers. Code
moves around with little attention paid at the time to licensing. I
wouldn't trust anything claiming MIT license is not GPL
'contaminated'.

OTOH, there's really only one way for the madvise code to work, so
maybe not a copyrightable work on its own.

Rob

Re: [PATCH 1/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[Sam Ravnborg]

On Sat, Nov 12, 2022 at 07:42:10PM +0000, Robert Swindells wrote:
> Contributors to these files are:
> 
> Noralf Trønnes <noralf@tronnes.org>
> Liu Zixian <liuzixian4@huawei.com>
> Dave Airlie <airlied@redhat.com>
> Thomas Zimmermann <tzimmermann@suse.de>
> Lucas De Marchi <lucas.demarchi@intel.com>
> Gerd Hoffmann <kraxel@redhat.com>
> Rob Herring <robh@kernel.org>
> Jakub Kicinski <kuba@kernel.org>
> Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Stephen Rothwell <sfr@canb.auug.org.au>
> Daniel Vetter <daniel.vetter@ffwll.ch>
> Cai Huoqing <cai.huoqing@linux.dev>
> Neil Roberts <nroberts@igalia.com>
> Marek Szyprowski <m.szyprowski@samsung.com>
> Emil Velikov <emil.velikov@collabora.com>
> Sam Ravnborg <sam@ravnborg.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>

Re: [PATCH 1/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[Liu Zixian]

On Sat, Nov 12, 2022 at 07:42:10PM +0000, Robert Swindells wrote:
> Contributors to these files are:
> 
> Noralf Trønnes <noralf@tronnes.org>
> Liu Zixian <liuzixian4@huawei.com>
Acked-by: Liu Zixian <liuzixian4@huawei.com>

Re: [PATCH 1/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

Hi Robert,

On Sat, 12 Nov 2022 19:42:10 +0000 Robert Swindells <rjs@fdy2.co.uk> wrote:
>
> Contributors to these files are:
> 
> Stephen Rothwell <sfr@canb.auug.org.au>

I don't think my (1 line) contribution is even copyrightable, but anyway

Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH 1/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[Thomas Zimmermann]

[-- Attachment #1.1: Type: text/plain, Size: 2411 bytes --]

Hi

Am 12.11.22 um 20:42 schrieb Robert Swindells:
> Contributors to these files are:
> 
> Noralf Trønnes <noralf@tronnes.org>
> Liu Zixian <liuzixian4@huawei.com>
> Dave Airlie <airlied@redhat.com>
> Thomas Zimmermann <tzimmermann@suse.de>
> Lucas De Marchi <lucas.demarchi@intel.com>
> Gerd Hoffmann <kraxel@redhat.com>
> Rob Herring <robh@kernel.org>
> Jakub Kicinski <kuba@kernel.org>
> Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Stephen Rothwell <sfr@canb.auug.org.au>
> Daniel Vetter <daniel.vetter@ffwll.ch>
> Cai Huoqing <cai.huoqing@linux.dev>
> Neil Roberts <nroberts@igalia.com>
> Marek Szyprowski <m.szyprowski@samsung.com>
> Emil Velikov <emil.velikov@collabora.com>
> Sam Ravnborg <sam@ravnborg.org>
> Boris Brezillon <boris.brezillon@collabora.com>
> Dan Carpenter <dan.carpenter@oracle.com>
> 
> Signed-off-by: Robert Swindells <rjs@fdy2.co.uk>
> ---
>   drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +-
>   include/drm/drm_gem_shmem_helper.h     | 2 +-

You're welcome to dual-license my contributions to these files under 
GPL-2.0 and MIT.

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

>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index 35138f8a375c..f1a68a71f876 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +// SPDX-License-Identifier: GPL-2.0 or MIT

IDK for sure, but I think 'or' should be written in capital letters by 
common convention. [1]

>   /*
>    * Copyright 2018 Noralf Trønnes
>    */
> diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h
> index a2201b2488c5..56ac32947d1c 100644
> --- a/include/drm/drm_gem_shmem_helper.h
> +++ b/include/drm/drm_gem_shmem_helper.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 or MIT */

OR

Best regards
Thomas

[1] https://github.com/david-a-wheeler/spdx-tutorial#spdx-tutorial

>   
>   #ifndef __DRM_GEM_SHMEM_HELPER_H__
>   #define __DRM_GEM_SHMEM_HELPER_H__

-- 
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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [PATCH 1/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[Emil Velikov]

On 2022/11/12, Robert Swindells wrote:
> Contributors to these files are:
> 
> Noralf Trønnes <noralf@tronnes.org>
> Liu Zixian <liuzixian4@huawei.com>
> Dave Airlie <airlied@redhat.com>
> Thomas Zimmermann <tzimmermann@suse.de>
> Lucas De Marchi <lucas.demarchi@intel.com>
> Gerd Hoffmann <kraxel@redhat.com>
> Rob Herring <robh@kernel.org>
> Jakub Kicinski <kuba@kernel.org>
> Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Stephen Rothwell <sfr@canb.auug.org.au>
> Daniel Vetter <daniel.vetter@ffwll.ch>
> Cai Huoqing <cai.huoqing@linux.dev>
> Neil Roberts <nroberts@igalia.com>
> Marek Szyprowski <m.szyprowski@samsung.com>
> Emil Velikov <emil.velikov@collabora.com>
> Sam Ravnborg <sam@ravnborg.org>
> Boris Brezillon <boris.brezillon@collabora.com>
> Dan Carpenter <dan.carpenter@oracle.com>
> 
> Signed-off-by: Robert Swindells <rjs@fdy2.co.uk>
> ---
>  drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +-
>  include/drm/drm_gem_shmem_helper.h     | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 

As far as my changes are concerned, this patch is:
Acked-by: Emil Velikov <emil.velikov@collabora.com>

HTH
Emil

Re: [PATCH 1/1] drm/shmem: Dual licence the files as GPL-2 and MIT

[Marek Szyprowski]

On 12.11.2022 20:42, Robert Swindells wrote:
> Contributors to these files are:
>
> Noralf Trønnes <noralf@tronnes.org>
> Liu Zixian <liuzixian4@huawei.com>
> Dave Airlie <airlied@redhat.com>
> Thomas Zimmermann <tzimmermann@suse.de>
> Lucas De Marchi <lucas.demarchi@intel.com>
> Gerd Hoffmann <kraxel@redhat.com>
> Rob Herring <robh@kernel.org>
> Jakub Kicinski <kuba@kernel.org>
> Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Stephen Rothwell <sfr@canb.auug.org.au>
> Daniel Vetter <daniel.vetter@ffwll.ch>
> Cai Huoqing <cai.huoqing@linux.dev>
> Neil Roberts <nroberts@igalia.com>
> Marek Szyprowski <m.szyprowski@samsung.com>
> Emil Velikov <emil.velikov@collabora.com>
> Sam Ravnborg <sam@ravnborg.org>
> Boris Brezillon <boris.brezillon@collabora.com>
> Dan Carpenter <dan.carpenter@oracle.com>
>
> Signed-off-by: Robert Swindells <rjs@fdy2.co.uk>


Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>


Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland