Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers

2021-01-08 Thread Laurent Pinchart
Hi Alex,

On Thu, Jan 07, 2021 at 10:01:00AM -0500, Alex Deucher wrote:
> On Wed, Dec 16, 2020 at 10:30 AM Greg Kroah-Hartman wrote:
> > On Wed, Dec 16, 2020 at 02:52:25PM +, Deucher, Alexander wrote:
> > > [AMD Public Use]
> > >
> > > > -Original Message-
> > > > From: Laurent Pinchart 
> > > > Sent: Tuesday, December 15, 2020 9:15 PM
> > > > To: Koenig, Christian 
> > > > Cc: Daniel Vetter ; Laurent Pinchart
> > > > ; dri-
> > > > de...@lists.freedesktop.org; Dave Airlie ; Greg 
> > > > Kroah-
> > > > Hartman ; Thomas Gleixner
> > > > ; Deucher, Alexander ;
> > > > Rob Clark ; Sean Paul ; Ben
> > > > Skeggs ; Gerd Hoffmann ;
> > > > Thierry Reding ; Eric Anholt 
> > > > ;
> > > > VMware Graphics ; Thomas
> > > > Hellstrom 
> > > > Subject: Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers
> > > >
> > > > Hi Christian,
> > > >
> > > > On Fri, Jul 17, 2020 at 04:05:42PM +0200, Christian König wrote:
> > > > > Am 17.07.20 um 04:27 schrieb Laurent Pinchart:
> > > > > > On Mon, Jun 22, 2020 at 11:29:33AM +0200, Daniel Vetter wrote:
> > > > > >> On Mon, Jun 22, 2020 at 09:58:44AM +0200, Christian König wrote:
> > > > > >>> Am 21.06.20 um 04:07 schrieb Laurent Pinchart:
> > > > > >>>> Most of the DRM drivers uAPI headers are licensed under the MIT
> > > > > >>>> license, and carry copies of the license with slight variations.
> > > > > >>>> Replace them with SPDX headers.
> > > > > >>> My personal opinion is that this is a really good idea, but my
> > > > > >>> professional is that we need the acknowledgment from our legal
> > > > department for this.
> > > > > >> I think official ack from amd on first patch, especially the .rst
> > > > > >> snippet, would be really good indeed.
> > > > > > Any update on this one ?
> > > > >
> > > > > Sorry totally forgot to forward this because I was waiting for split
> > > > > up patches.
> > > > >
> > > > > Going to do so right now.
> > > >
> > > > Has there been any update ? :-)
> > >
> > > AMD legal requires the full license.
> >
> > Um, what?  Please let me talk to them about this, it's not ok for one
> > individual company, out of 450+, to somehow decide to do something
> > different.
> >
> > Please put your lawyers in contact with me and I will have them discuss
> > it with the proper lawyers on our side.
> 
> After more discussion, the lawyers have allowed us to use the SPDX licenses 
> now.

Very nice to hear this, thank you :-)

Could you reply to the corresponding patches in v2 with an Acked-by ?

-- 
Regards,

Laurent Pinchart
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers

2021-01-07 Thread Greg Kroah-Hartman
On Thu, Jan 07, 2021 at 10:01:00AM -0500, Alex Deucher wrote:
> On Wed, Dec 16, 2020 at 10:30 AM Greg Kroah-Hartman
>  wrote:
> >
> > On Wed, Dec 16, 2020 at 02:52:25PM +, Deucher, Alexander wrote:
> > > [AMD Public Use]
> > >
> > > > -Original Message-
> > > > From: Laurent Pinchart 
> > > > Sent: Tuesday, December 15, 2020 9:15 PM
> > > > To: Koenig, Christian 
> > > > Cc: Daniel Vetter ; Laurent Pinchart
> > > > ; dri-
> > > > de...@lists.freedesktop.org; Dave Airlie ; Greg 
> > > > Kroah-
> > > > Hartman ; Thomas Gleixner
> > > > ; Deucher, Alexander ;
> > > > Rob Clark ; Sean Paul ; Ben
> > > > Skeggs ; Gerd Hoffmann ;
> > > > Thierry Reding ; Eric Anholt 
> > > > ;
> > > > VMware Graphics ; Thomas
> > > > Hellstrom 
> > > > Subject: Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers
> > > >
> > > > Hi Christian,
> > > >
> > > > On Fri, Jul 17, 2020 at 04:05:42PM +0200, Christian König wrote:
> > > > > Am 17.07.20 um 04:27 schrieb Laurent Pinchart:
> > > > > > On Mon, Jun 22, 2020 at 11:29:33AM +0200, Daniel Vetter wrote:
> > > > > >> On Mon, Jun 22, 2020 at 09:58:44AM +0200, Christian König wrote:
> > > > > >>> Am 21.06.20 um 04:07 schrieb Laurent Pinchart:
> > > > > >>>> Most of the DRM drivers uAPI headers are licensed under the MIT
> > > > > >>>> license, and carry copies of the license with slight variations.
> > > > > >>>> Replace them with SPDX headers.
> > > > > >>> My personal opinion is that this is a really good idea, but my
> > > > > >>> professional is that we need the acknowledgment from our legal
> > > > department for this.
> > > > > >> I think official ack from amd on first patch, especially the .rst
> > > > > >> snippet, would be really good indeed.
> > > > > > Any update on this one ?
> > > > >
> > > > > Sorry totally forgot to forward this because I was waiting for split
> > > > > up patches.
> > > > >
> > > > > Going to do so right now.
> > > >
> > > > Has there been any update ? :-)
> > >
> > > AMD legal requires the full license.
> >
> > Um, what?  Please let me talk to them about this, it's not ok for one
> > individual company, out of 450+, to somehow decide to do something
> > different.
> >
> > Please put your lawyers in contact with me and I will have them discuss
> > it with the proper lawyers on our side.
> 
> After more discussion, the lawyers have allowed us to use the SPDX licenses 
> now.

Wonderful, thanks for pushing this through and letting us know!

greg k-h
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers

2021-01-07 Thread Alex Deucher
On Wed, Dec 16, 2020 at 10:30 AM Greg Kroah-Hartman
 wrote:
>
> On Wed, Dec 16, 2020 at 02:52:25PM +, Deucher, Alexander wrote:
> > [AMD Public Use]
> >
> > > -Original Message-
> > > From: Laurent Pinchart 
> > > Sent: Tuesday, December 15, 2020 9:15 PM
> > > To: Koenig, Christian 
> > > Cc: Daniel Vetter ; Laurent Pinchart
> > > ; dri-
> > > de...@lists.freedesktop.org; Dave Airlie ; Greg Kroah-
> > > Hartman ; Thomas Gleixner
> > > ; Deucher, Alexander ;
> > > Rob Clark ; Sean Paul ; Ben
> > > Skeggs ; Gerd Hoffmann ;
> > > Thierry Reding ; Eric Anholt ;
> > > VMware Graphics ; Thomas
> > > Hellstrom 
> > > Subject: Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers
> > >
> > > Hi Christian,
> > >
> > > On Fri, Jul 17, 2020 at 04:05:42PM +0200, Christian König wrote:
> > > > Am 17.07.20 um 04:27 schrieb Laurent Pinchart:
> > > > > On Mon, Jun 22, 2020 at 11:29:33AM +0200, Daniel Vetter wrote:
> > > > >> On Mon, Jun 22, 2020 at 09:58:44AM +0200, Christian König wrote:
> > > > >>> Am 21.06.20 um 04:07 schrieb Laurent Pinchart:
> > > > >>>> Most of the DRM drivers uAPI headers are licensed under the MIT
> > > > >>>> license, and carry copies of the license with slight variations.
> > > > >>>> Replace them with SPDX headers.
> > > > >>> My personal opinion is that this is a really good idea, but my
> > > > >>> professional is that we need the acknowledgment from our legal
> > > department for this.
> > > > >> I think official ack from amd on first patch, especially the .rst
> > > > >> snippet, would be really good indeed.
> > > > > Any update on this one ?
> > > >
> > > > Sorry totally forgot to forward this because I was waiting for split
> > > > up patches.
> > > >
> > > > Going to do so right now.
> > >
> > > Has there been any update ? :-)
> >
> > AMD legal requires the full license.
>
> Um, what?  Please let me talk to them about this, it's not ok for one
> individual company, out of 450+, to somehow decide to do something
> different.
>
> Please put your lawyers in contact with me and I will have them discuss
> it with the proper lawyers on our side.

After more discussion, the lawyers have allowed us to use the SPDX licenses now.

Alex
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers

2020-12-16 Thread Greg Kroah-Hartman
On Wed, Dec 16, 2020 at 02:52:25PM +, Deucher, Alexander wrote:
> [AMD Public Use]
> 
> > -Original Message-
> > From: Laurent Pinchart 
> > Sent: Tuesday, December 15, 2020 9:15 PM
> > To: Koenig, Christian 
> > Cc: Daniel Vetter ; Laurent Pinchart
> > ; dri-
> > de...@lists.freedesktop.org; Dave Airlie ; Greg Kroah-
> > Hartman ; Thomas Gleixner
> > ; Deucher, Alexander ;
> > Rob Clark ; Sean Paul ; Ben
> > Skeggs ; Gerd Hoffmann ;
> > Thierry Reding ; Eric Anholt ;
> > VMware Graphics ; Thomas
> > Hellstrom 
> > Subject: Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers
> > 
> > Hi Christian,
> > 
> > On Fri, Jul 17, 2020 at 04:05:42PM +0200, Christian König wrote:
> > > Am 17.07.20 um 04:27 schrieb Laurent Pinchart:
> > > > On Mon, Jun 22, 2020 at 11:29:33AM +0200, Daniel Vetter wrote:
> > > >> On Mon, Jun 22, 2020 at 09:58:44AM +0200, Christian König wrote:
> > > >>> Am 21.06.20 um 04:07 schrieb Laurent Pinchart:
> > > >>>> Most of the DRM drivers uAPI headers are licensed under the MIT
> > > >>>> license, and carry copies of the license with slight variations.
> > > >>>> Replace them with SPDX headers.
> > > >>> My personal opinion is that this is a really good idea, but my
> > > >>> professional is that we need the acknowledgment from our legal
> > department for this.
> > > >> I think official ack from amd on first patch, especially the .rst
> > > >> snippet, would be really good indeed.
> > > > Any update on this one ?
> > >
> > > Sorry totally forgot to forward this because I was waiting for split
> > > up patches.
> > >
> > > Going to do so right now.
> > 
> > Has there been any update ? :-)
> 
> AMD legal requires the full license.

Um, what?  Please let me talk to them about this, it's not ok for one
individual company, out of 450+, to somehow decide to do something
different.

Please put your lawyers in contact with me and I will have them discuss
it with the proper lawyers on our side.

thanks,

greg k-h
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


RE: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers

2020-12-16 Thread Deucher, Alexander
[AMD Public Use]

> -Original Message-
> From: Laurent Pinchart 
> Sent: Tuesday, December 15, 2020 9:15 PM
> To: Koenig, Christian 
> Cc: Daniel Vetter ; Laurent Pinchart
> ; dri-
> de...@lists.freedesktop.org; Dave Airlie ; Greg Kroah-
> Hartman ; Thomas Gleixner
> ; Deucher, Alexander ;
> Rob Clark ; Sean Paul ; Ben
> Skeggs ; Gerd Hoffmann ;
> Thierry Reding ; Eric Anholt ;
> VMware Graphics ; Thomas
> Hellstrom 
> Subject: Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers
> 
> Hi Christian,
> 
> On Fri, Jul 17, 2020 at 04:05:42PM +0200, Christian König wrote:
> > Am 17.07.20 um 04:27 schrieb Laurent Pinchart:
> > > On Mon, Jun 22, 2020 at 11:29:33AM +0200, Daniel Vetter wrote:
> > >> On Mon, Jun 22, 2020 at 09:58:44AM +0200, Christian König wrote:
> > >>> Am 21.06.20 um 04:07 schrieb Laurent Pinchart:
> > >>>> Most of the DRM drivers uAPI headers are licensed under the MIT
> > >>>> license, and carry copies of the license with slight variations.
> > >>>> Replace them with SPDX headers.
> > >>> My personal opinion is that this is a really good idea, but my
> > >>> professional is that we need the acknowledgment from our legal
> department for this.
> > >> I think official ack from amd on first patch, especially the .rst
> > >> snippet, would be really good indeed.
> > > Any update on this one ?
> >
> > Sorry totally forgot to forward this because I was waiting for split
> > up patches.
> >
> > Going to do so right now.
> 
> Has there been any update ? :-)

AMD legal requires the full license.

Alex


> 
> > >>> Please separate that change into one for each
> driver/company/maintainer.
> > >>> Amdgpu, radeon, r128 can be one for example.
> > >
> > > I'll do so.
> > >
> > >> You can leave all the other legacy drivers in one patch (mga,
> > >> savage, sis, via), since there's likely no one around anymore and
> > >> will just boil down to drm maintainer ack from Dave
> > >>
> > >>>> Signed-off-by: Laurent Pinchart
> > >>>> 
> > >>>> ---
> > >>>>include/uapi/drm/amdgpu_drm.h  | 19 +--
> > >>>>include/uapi/drm/i915_drm.h| 22 +-
> > >>>>include/uapi/drm/mga_drm.h | 20 +---
> > >>>>include/uapi/drm/msm_drm.h | 20 +---
> > >>>>include/uapi/drm/nouveau_drm.h | 20 +---
> > >>>>include/uapi/drm/qxl_drm.h | 20 +---
> > >>>>include/uapi/drm/r128_drm.h| 20 +---
> > >>>>include/uapi/drm/radeon_drm.h  | 20 +---
> > >>>>include/uapi/drm/savage_drm.h  | 20 +---
> > >>>>include/uapi/drm/sis_drm.h | 21 +
> > >>>>include/uapi/drm/tegra_drm.h   | 19 +--
> > >>>>include/uapi/drm/v3d_drm.h | 20 +---
> > >>>>include/uapi/drm/vc4_drm.h | 20 +---
> > >>>>include/uapi/drm/vgem_drm.h| 22 +-
> > >>>>include/uapi/drm/via_drm.h | 20 +---
> > >>>>include/uapi/drm/virtgpu_drm.h | 20 +---
> > >>>>include/uapi/drm/vmwgfx_drm.h  | 21 +
> > >>>>17 files changed, 17 insertions(+), 327 deletions(-)
> > >>>>
> > >>>> diff --git a/include/uapi/drm/amdgpu_drm.h
> > >>>> b/include/uapi/drm/amdgpu_drm.h index
> 4e873dcbe68f..c6adda72bec7
> > >>>> 100644
> > >>>> --- a/include/uapi/drm/amdgpu_drm.h
> > >>>> +++ b/include/uapi/drm/amdgpu_drm.h
> > >>>> @@ -1,3 +1,4 @@
> > >>>> +/* SPDX-License-Identifier: MIT */
> > >>>>/* amdgpu_drm.h -- Public header for the amdgpu driver -*- linux-c
> -*-
> > >>>> *
> > >>>> * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
> > >>>> @@ -5,24 +6,6 @@
> > >>>> * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
> > >>>> * Copyright 2014 Advanced Micro Devices, Inc.
> > >>>> *
> > >>>> - * Permission is hereby granted, free of cha

Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers

2020-12-15 Thread Laurent Pinchart
Hi Christian,

On Fri, Jul 17, 2020 at 04:05:42PM +0200, Christian König wrote:
> Am 17.07.20 um 04:27 schrieb Laurent Pinchart:
> > On Mon, Jun 22, 2020 at 11:29:33AM +0200, Daniel Vetter wrote:
> >> On Mon, Jun 22, 2020 at 09:58:44AM +0200, Christian König wrote:
> >>> Am 21.06.20 um 04:07 schrieb Laurent Pinchart:
>  Most of the DRM drivers uAPI headers are licensed under the MIT license,
>  and carry copies of the license with slight variations. Replace them
>  with SPDX headers.
> >>> My personal opinion is that this is a really good idea, but my 
> >>> professional
> >>> is that we need the acknowledgment from our legal department for this.
> >> I think official ack from amd on first patch, especially the .rst snippet,
> >> would be really good indeed.
> > Any update on this one ?
> 
> Sorry totally forgot to forward this because I was waiting for split up 
> patches.
> 
> Going to do so right now.

Has there been any update ? :-)

> >>> Please separate that change into one for each driver/company/maintainer.
> >>> Amdgpu, radeon, r128 can be one for example.
> >
> > I'll do so.
> >
> >> You can leave all the other legacy drivers in one patch (mga, savage, sis,
> >> via), since there's likely no one around anymore and will just boil down
> >> to drm maintainer ack from Dave
> >>
>  Signed-off-by: Laurent Pinchart 
>  
>  ---
> include/uapi/drm/amdgpu_drm.h  | 19 +--
> include/uapi/drm/i915_drm.h| 22 +-
> include/uapi/drm/mga_drm.h | 20 +---
> include/uapi/drm/msm_drm.h | 20 +---
> include/uapi/drm/nouveau_drm.h | 20 +---
> include/uapi/drm/qxl_drm.h | 20 +---
> include/uapi/drm/r128_drm.h| 20 +---
> include/uapi/drm/radeon_drm.h  | 20 +---
> include/uapi/drm/savage_drm.h  | 20 +---
> include/uapi/drm/sis_drm.h | 21 +
> include/uapi/drm/tegra_drm.h   | 19 +--
> include/uapi/drm/v3d_drm.h | 20 +---
> include/uapi/drm/vc4_drm.h | 20 +---
> include/uapi/drm/vgem_drm.h| 22 +-
> include/uapi/drm/via_drm.h | 20 +---
> include/uapi/drm/virtgpu_drm.h | 20 +---
> include/uapi/drm/vmwgfx_drm.h  | 21 +
> 17 files changed, 17 insertions(+), 327 deletions(-)
> 
>  diff --git a/include/uapi/drm/amdgpu_drm.h 
>  b/include/uapi/drm/amdgpu_drm.h
>  index 4e873dcbe68f..c6adda72bec7 100644
>  --- a/include/uapi/drm/amdgpu_drm.h
>  +++ b/include/uapi/drm/amdgpu_drm.h
>  @@ -1,3 +1,4 @@
>  +/* SPDX-License-Identifier: MIT */
> /* amdgpu_drm.h -- Public header for the amdgpu driver -*- linux-c -*-
>  *
>  * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
>  @@ -5,24 +6,6 @@
>  * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
>  * Copyright 2014 Advanced Micro Devices, Inc.
>  *
>  - * Permission is hereby granted, free of charge, to any person 
>  obtaining a
>  - * copy of this software and associated documentation files (the 
>  "Software"),
>  - * to deal in the Software without restriction, including without 
>  limitation
>  - * the rights to use, copy, modify, merge, publish, distribute, 
>  sublicense,
>  - * and/or sell copies of the Software, and to permit persons to whom the
>  - * Software is furnished to do so, subject to the following conditions:
>  - *
>  - * The above copyright notice and this permission notice shall be 
>  included in
>  - * all copies or substantial portions of the Software.
>  - *
>  - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
>  EXPRESS OR
>  - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
>  MERCHANTABILITY,
>  - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT 
>  SHALL
>  - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, 
>  DAMAGES OR
>  - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
>  - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
>  - * OTHER DEALINGS IN THE SOFTWARE.
>  - *
>  * Authors:
>  *Kevin E. Martin 
>  *Gareth Hughes 
>  diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
>  index 14b67cd6b54b..c29e3acb3026 100644
>  --- a/include/uapi/drm/i915_drm.h
>  +++ b/include/uapi/drm/i915_drm.h
>  @@ -1,27 +1,7 @@
>  +/* SPDX-License-Identifier: MIT */
> /*
>  * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
>  * All Rights Reserved.
>  - *
> 

Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers

2020-07-17 Thread Christian König

Am 17.07.20 um 04:27 schrieb Laurent Pinchart:

Hi Christian,

On Mon, Jun 22, 2020 at 11:29:33AM +0200, Daniel Vetter wrote:

On Mon, Jun 22, 2020 at 09:58:44AM +0200, Christian König wrote:

Am 21.06.20 um 04:07 schrieb Laurent Pinchart:

Most of the DRM drivers uAPI headers are licensed under the MIT license,
and carry copies of the license with slight variations. Replace them
with SPDX headers.

My personal opinion is that this is a really good idea, but my professional
is that we need the acknowledgment from our legal department for this.

I think official ack from amd on first patch, especially the .rst snippet,
would be really good indeed.

Any update on this one ?


Sorry totally forgot to forward this because I was waiting for split up 
patches.


Going to do so right now.

Christian.




Please separate that change into one for each driver/company/maintainer.
Amdgpu, radeon, r128 can be one for example.

I'll do so.


You can leave all the other legacy drivers in one patch (mga, savage, sis,
via), since there's likely no one around anymore and will just boil down
to drm maintainer ack from Dave


Signed-off-by: Laurent Pinchart 
---
   include/uapi/drm/amdgpu_drm.h  | 19 +--
   include/uapi/drm/i915_drm.h| 22 +-
   include/uapi/drm/mga_drm.h | 20 +---
   include/uapi/drm/msm_drm.h | 20 +---
   include/uapi/drm/nouveau_drm.h | 20 +---
   include/uapi/drm/qxl_drm.h | 20 +---
   include/uapi/drm/r128_drm.h| 20 +---
   include/uapi/drm/radeon_drm.h  | 20 +---
   include/uapi/drm/savage_drm.h  | 20 +---
   include/uapi/drm/sis_drm.h | 21 +
   include/uapi/drm/tegra_drm.h   | 19 +--
   include/uapi/drm/v3d_drm.h | 20 +---
   include/uapi/drm/vc4_drm.h | 20 +---
   include/uapi/drm/vgem_drm.h| 22 +-
   include/uapi/drm/via_drm.h | 20 +---
   include/uapi/drm/virtgpu_drm.h | 20 +---
   include/uapi/drm/vmwgfx_drm.h  | 21 +
   17 files changed, 17 insertions(+), 327 deletions(-)

diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 4e873dcbe68f..c6adda72bec7 100644
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
   /* amdgpu_drm.h -- Public header for the amdgpu driver -*- linux-c -*-
*
* Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
@@ -5,24 +6,6 @@
* Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
* Copyright 2014 Advanced Micro Devices, Inc.
*
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
* Authors:
*Kevin E. Martin 
*Gareth Hughes 
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index 14b67cd6b54b..c29e3acb3026 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -1,27 +1,7 @@
+/* SPDX-License-Identifier: MIT */
   /*
* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, 

Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers

2020-07-16 Thread Laurent Pinchart
Hi Christian,

On Mon, Jun 22, 2020 at 11:29:33AM +0200, Daniel Vetter wrote:
> On Mon, Jun 22, 2020 at 09:58:44AM +0200, Christian König wrote:
> > Am 21.06.20 um 04:07 schrieb Laurent Pinchart:
> > > Most of the DRM drivers uAPI headers are licensed under the MIT license,
> > > and carry copies of the license with slight variations. Replace them
> > > with SPDX headers.
> > 
> > My personal opinion is that this is a really good idea, but my professional
> > is that we need the acknowledgment from our legal department for this.
> 
> I think official ack from amd on first patch, especially the .rst snippet,
> would be really good indeed.

Any update on this one ?

> > Please separate that change into one for each driver/company/maintainer.
> > Amdgpu, radeon, r128 can be one for example.

I'll do so.

> You can leave all the other legacy drivers in one patch (mga, savage, sis,
> via), since there's likely no one around anymore and will just boil down
> to drm maintainer ack from Dave
>
> > > Signed-off-by: Laurent Pinchart 
> > > 
> > > ---
> > >   include/uapi/drm/amdgpu_drm.h  | 19 +--
> > >   include/uapi/drm/i915_drm.h| 22 +-
> > >   include/uapi/drm/mga_drm.h | 20 +---
> > >   include/uapi/drm/msm_drm.h | 20 +---
> > >   include/uapi/drm/nouveau_drm.h | 20 +---
> > >   include/uapi/drm/qxl_drm.h | 20 +---
> > >   include/uapi/drm/r128_drm.h| 20 +---
> > >   include/uapi/drm/radeon_drm.h  | 20 +---
> > >   include/uapi/drm/savage_drm.h  | 20 +---
> > >   include/uapi/drm/sis_drm.h | 21 +
> > >   include/uapi/drm/tegra_drm.h   | 19 +--
> > >   include/uapi/drm/v3d_drm.h | 20 +---
> > >   include/uapi/drm/vc4_drm.h | 20 +---
> > >   include/uapi/drm/vgem_drm.h| 22 +-
> > >   include/uapi/drm/via_drm.h | 20 +---
> > >   include/uapi/drm/virtgpu_drm.h | 20 +---
> > >   include/uapi/drm/vmwgfx_drm.h  | 21 +
> > >   17 files changed, 17 insertions(+), 327 deletions(-)
> > > 
> > > diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
> > > index 4e873dcbe68f..c6adda72bec7 100644
> > > --- a/include/uapi/drm/amdgpu_drm.h
> > > +++ b/include/uapi/drm/amdgpu_drm.h
> > > @@ -1,3 +1,4 @@
> > > +/* SPDX-License-Identifier: MIT */
> > >   /* amdgpu_drm.h -- Public header for the amdgpu driver -*- linux-c -*-
> > >*
> > >* Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
> > > @@ -5,24 +6,6 @@
> > >* Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
> > >* Copyright 2014 Advanced Micro Devices, Inc.
> > >*
> > > - * Permission is hereby granted, free of charge, to any person obtaining 
> > > a
> > > - * copy of this software and associated documentation files (the 
> > > "Software"),
> > > - * to deal in the Software without restriction, including without 
> > > limitation
> > > - * the rights to use, copy, modify, merge, publish, distribute, 
> > > sublicense,
> > > - * and/or sell copies of the Software, and to permit persons to whom the
> > > - * Software is furnished to do so, subject to the following conditions:
> > > - *
> > > - * The above copyright notice and this permission notice shall be 
> > > included in
> > > - * all copies or substantial portions of the Software.
> > > - *
> > > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
> > > EXPRESS OR
> > > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
> > > MERCHANTABILITY,
> > > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT 
> > > SHALL
> > > - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES 
> > > OR
> > > - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > > - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> > > - * OTHER DEALINGS IN THE SOFTWARE.
> > > - *
> > >* Authors:
> > >*Kevin E. Martin 
> > >*Gareth Hughes 
> > > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
> > > index 14b67cd6b54b..c29e3acb3026 100644
> > > --- a/include/uapi/drm/i915_drm.h
> > > +++ b/include/uapi/drm/i915_drm.h
> > > @@ -1,27 +1,7 @@
> > > +/* SPDX-License-Identifier: MIT */
> > >   /*
> > >* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
> > >* All Rights Reserved.
> > > - *
> > > - * Permission is hereby granted, free of charge, to any person obtaining 
> > > a
> > > - * copy of this software and associated documentation files (the
> > > - * "Software"), to deal in the Software without restriction, including
> > > - * without limitation the rights to use, copy, modify, merge, publish,
> > > - * distribute, sub license, and/or sell copies of the Software, and to
> > > - * permit persons to whom 

Re: [Linux-graphics-maintainer] [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers

2020-06-23 Thread Roland Scheidegger
At least for the vmwgfx bits, no objections here,
Reviewed-by: Roland Scheidegger 

Am 21.06.20 um 04:07 schrieb Laurent Pinchart:
> Most of the DRM drivers uAPI headers are licensed under the MIT license,
> and carry copies of the license with slight variations. Replace them
> with SPDX headers.
> 
> Signed-off-by: Laurent Pinchart 
> ---
>  include/uapi/drm/amdgpu_drm.h  | 19 +--
>  include/uapi/drm/i915_drm.h| 22 +-
>  include/uapi/drm/mga_drm.h | 20 +---
>  include/uapi/drm/msm_drm.h | 20 +---
>  include/uapi/drm/nouveau_drm.h | 20 +---
>  include/uapi/drm/qxl_drm.h | 20 +---
>  include/uapi/drm/r128_drm.h| 20 +---
>  include/uapi/drm/radeon_drm.h  | 20 +---
>  include/uapi/drm/savage_drm.h  | 20 +---
>  include/uapi/drm/sis_drm.h | 21 +
>  include/uapi/drm/tegra_drm.h   | 19 +--
>  include/uapi/drm/v3d_drm.h | 20 +---
>  include/uapi/drm/vc4_drm.h | 20 +---
>  include/uapi/drm/vgem_drm.h| 22 +-
>  include/uapi/drm/via_drm.h | 20 +---
>  include/uapi/drm/virtgpu_drm.h | 20 +---
>  include/uapi/drm/vmwgfx_drm.h  | 21 +
>  17 files changed, 17 insertions(+), 327 deletions(-)
> 
> diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
> index 4e873dcbe68f..c6adda72bec7 100644
> --- a/include/uapi/drm/amdgpu_drm.h
> +++ b/include/uapi/drm/amdgpu_drm.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: MIT */
>  /* amdgpu_drm.h -- Public header for the amdgpu driver -*- linux-c -*-
>   *
>   * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
> @@ -5,24 +6,6 @@
>   * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
>   * Copyright 2014 Advanced Micro Devices, Inc.
>   *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the "Software"),
> - * to deal in the Software without restriction, including without limitation
> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice shall be included in
> - * all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> - * OTHER DEALINGS IN THE SOFTWARE.
> - *
>   * Authors:
>   *Kevin E. Martin 
>   *Gareth Hughes 
> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
> index 14b67cd6b54b..c29e3acb3026 100644
> --- a/include/uapi/drm/i915_drm.h
> +++ b/include/uapi/drm/i915_drm.h
> @@ -1,27 +1,7 @@
> +/* SPDX-License-Identifier: MIT */
>  /*
>   * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
>   * All Rights Reserved.
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the
> - * "Software"), to deal in the Software without restriction, including
> - * without limitation the rights to use, copy, modify, merge, publish,
> - * distribute, sub license, and/or sell copies of the Software, and to
> - * permit persons to whom the Software is furnished to do so, subject to
> - * the following conditions:
> - *
> - * The above copyright notice and this permission notice (including the
> - * next paragraph) shall be included in all copies or substantial portions
> - * of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
> - * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
> - * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
> - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
> - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> - *
>   */
>  
>  #ifndef _UAPI_I915_DRM_H_
> diff --git a/include/uapi/drm/mga_drm.h b/include/uapi/drm/mga_drm.h
> index 8c4337548ab5..4415efefe0cf 100644
> --- a/include/uapi/drm/mga_drm.h
> +++ b/include/uapi/drm/mga_drm.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: MIT */
>  /* mga_drm.h -- Public 

Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers

2020-06-22 Thread Daniel Vetter
On Mon, Jun 22, 2020 at 09:58:44AM +0200, Christian König wrote:
> Am 21.06.20 um 04:07 schrieb Laurent Pinchart:
> > Most of the DRM drivers uAPI headers are licensed under the MIT license,
> > and carry copies of the license with slight variations. Replace them
> > with SPDX headers.
> 
> My personal opinion is that this is a really good idea, but my professional
> is that we need the acknowledgment from our legal department for this.

I think official ack from amd on first patch, especially the .rst snippet,
would be really good indeed.

> Please separate that change into one for each driver/company/maintainer.
> Amdgpu, radeon, r128 can be one for example.

You can leave all the other legacy drivers in one patch (mga, savage, sis,
via), since there's likely no one around anymore and will just boil down
to drm maintainer ack from Dave
-Daniel

> 
> Thanks,
> Christian.
> 
> > 
> > Signed-off-by: Laurent Pinchart 
> > ---
> >   include/uapi/drm/amdgpu_drm.h  | 19 +--
> >   include/uapi/drm/i915_drm.h| 22 +-
> >   include/uapi/drm/mga_drm.h | 20 +---
> >   include/uapi/drm/msm_drm.h | 20 +---
> >   include/uapi/drm/nouveau_drm.h | 20 +---
> >   include/uapi/drm/qxl_drm.h | 20 +---
> >   include/uapi/drm/r128_drm.h| 20 +---
> >   include/uapi/drm/radeon_drm.h  | 20 +---
> >   include/uapi/drm/savage_drm.h  | 20 +---
> >   include/uapi/drm/sis_drm.h | 21 +
> >   include/uapi/drm/tegra_drm.h   | 19 +--
> >   include/uapi/drm/v3d_drm.h | 20 +---
> >   include/uapi/drm/vc4_drm.h | 20 +---
> >   include/uapi/drm/vgem_drm.h| 22 +-
> >   include/uapi/drm/via_drm.h | 20 +---
> >   include/uapi/drm/virtgpu_drm.h | 20 +---
> >   include/uapi/drm/vmwgfx_drm.h  | 21 +
> >   17 files changed, 17 insertions(+), 327 deletions(-)
> > 
> > diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
> > index 4e873dcbe68f..c6adda72bec7 100644
> > --- a/include/uapi/drm/amdgpu_drm.h
> > +++ b/include/uapi/drm/amdgpu_drm.h
> > @@ -1,3 +1,4 @@
> > +/* SPDX-License-Identifier: MIT */
> >   /* amdgpu_drm.h -- Public header for the amdgpu driver -*- linux-c -*-
> >*
> >* Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
> > @@ -5,24 +6,6 @@
> >* Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
> >* Copyright 2014 Advanced Micro Devices, Inc.
> >*
> > - * Permission is hereby granted, free of charge, to any person obtaining a
> > - * copy of this software and associated documentation files (the 
> > "Software"),
> > - * to deal in the Software without restriction, including without 
> > limitation
> > - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> > - * and/or sell copies of the Software, and to permit persons to whom the
> > - * Software is furnished to do so, subject to the following conditions:
> > - *
> > - * The above copyright notice and this permission notice shall be included 
> > in
> > - * all copies or substantial portions of the Software.
> > - *
> > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
> > OR
> > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> > - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> > - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> > - * OTHER DEALINGS IN THE SOFTWARE.
> > - *
> >* Authors:
> >*Kevin E. Martin 
> >*Gareth Hughes 
> > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
> > index 14b67cd6b54b..c29e3acb3026 100644
> > --- a/include/uapi/drm/i915_drm.h
> > +++ b/include/uapi/drm/i915_drm.h
> > @@ -1,27 +1,7 @@
> > +/* SPDX-License-Identifier: MIT */
> >   /*
> >* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
> >* All Rights Reserved.
> > - *
> > - * Permission is hereby granted, free of charge, to any person obtaining a
> > - * copy of this software and associated documentation files (the
> > - * "Software"), to deal in the Software without restriction, including
> > - * without limitation the rights to use, copy, modify, merge, publish,
> > - * distribute, sub license, and/or sell copies of the Software, and to
> > - * permit persons to whom the Software is furnished to do so, subject to
> > - * the following conditions:
> > - *
> > - * The above copyright notice and this permission notice (including the
> > - * next paragraph) shall be included in all copies or substantial portions
> > - * of the Software.
> > - *
> > - * THE SOFTWARE IS 

Re: [PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers

2020-06-22 Thread Christian König

Am 21.06.20 um 04:07 schrieb Laurent Pinchart:

Most of the DRM drivers uAPI headers are licensed under the MIT license,
and carry copies of the license with slight variations. Replace them
with SPDX headers.


My personal opinion is that this is a really good idea, but my 
professional is that we need the acknowledgment from our legal 
department for this.


Please separate that change into one for each driver/company/maintainer. 
Amdgpu, radeon, r128 can be one for example.


Thanks,
Christian.



Signed-off-by: Laurent Pinchart 
---
  include/uapi/drm/amdgpu_drm.h  | 19 +--
  include/uapi/drm/i915_drm.h| 22 +-
  include/uapi/drm/mga_drm.h | 20 +---
  include/uapi/drm/msm_drm.h | 20 +---
  include/uapi/drm/nouveau_drm.h | 20 +---
  include/uapi/drm/qxl_drm.h | 20 +---
  include/uapi/drm/r128_drm.h| 20 +---
  include/uapi/drm/radeon_drm.h  | 20 +---
  include/uapi/drm/savage_drm.h  | 20 +---
  include/uapi/drm/sis_drm.h | 21 +
  include/uapi/drm/tegra_drm.h   | 19 +--
  include/uapi/drm/v3d_drm.h | 20 +---
  include/uapi/drm/vc4_drm.h | 20 +---
  include/uapi/drm/vgem_drm.h| 22 +-
  include/uapi/drm/via_drm.h | 20 +---
  include/uapi/drm/virtgpu_drm.h | 20 +---
  include/uapi/drm/vmwgfx_drm.h  | 21 +
  17 files changed, 17 insertions(+), 327 deletions(-)

diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 4e873dcbe68f..c6adda72bec7 100644
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
  /* amdgpu_drm.h -- Public header for the amdgpu driver -*- linux-c -*-
   *
   * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
@@ -5,24 +6,6 @@
   * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
   * Copyright 2014 Advanced Micro Devices, Inc.
   *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
   * Authors:
   *Kevin E. Martin 
   *Gareth Hughes 
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index 14b67cd6b54b..c29e3acb3026 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -1,27 +1,7 @@
+/* SPDX-License-Identifier: MIT */
  /*
   * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
   * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
   */
  
  #ifndef _UAPI_I915_DRM_H_

diff --git a/include/uapi/drm/mga_drm.h b/include/uapi/drm/mga_drm.h
index 8c4337548ab5..4415efefe0cf 100644
--- a/include/uapi/drm/mga_drm.h
+++ b/include/uapi/drm/mga_drm.h
@@ -1,3 +1,4 @@
+/* 

[PATCH 2/3] drm: uapi: Use SPDX in DRM drivers uAPI headers

2020-06-20 Thread Laurent Pinchart
Most of the DRM drivers uAPI headers are licensed under the MIT license,
and carry copies of the license with slight variations. Replace them
with SPDX headers.

Signed-off-by: Laurent Pinchart 
---
 include/uapi/drm/amdgpu_drm.h  | 19 +--
 include/uapi/drm/i915_drm.h| 22 +-
 include/uapi/drm/mga_drm.h | 20 +---
 include/uapi/drm/msm_drm.h | 20 +---
 include/uapi/drm/nouveau_drm.h | 20 +---
 include/uapi/drm/qxl_drm.h | 20 +---
 include/uapi/drm/r128_drm.h| 20 +---
 include/uapi/drm/radeon_drm.h  | 20 +---
 include/uapi/drm/savage_drm.h  | 20 +---
 include/uapi/drm/sis_drm.h | 21 +
 include/uapi/drm/tegra_drm.h   | 19 +--
 include/uapi/drm/v3d_drm.h | 20 +---
 include/uapi/drm/vc4_drm.h | 20 +---
 include/uapi/drm/vgem_drm.h| 22 +-
 include/uapi/drm/via_drm.h | 20 +---
 include/uapi/drm/virtgpu_drm.h | 20 +---
 include/uapi/drm/vmwgfx_drm.h  | 21 +
 17 files changed, 17 insertions(+), 327 deletions(-)

diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 4e873dcbe68f..c6adda72bec7 100644
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
 /* amdgpu_drm.h -- Public header for the amdgpu driver -*- linux-c -*-
  *
  * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
@@ -5,24 +6,6 @@
  * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
  * Copyright 2014 Advanced Micro Devices, Inc.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
  * Authors:
  *Kevin E. Martin 
  *Gareth Hughes 
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index 14b67cd6b54b..c29e3acb3026 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -1,27 +1,7 @@
+/* SPDX-License-Identifier: MIT */
 /*
  * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
  */
 
 #ifndef _UAPI_I915_DRM_H_
diff --git a/include/uapi/drm/mga_drm.h b/include/uapi/drm/mga_drm.h
index 8c4337548ab5..4415efefe0cf 100644
--- a/include/uapi/drm/mga_drm.h
+++ b/include/uapi/drm/mga_drm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: MIT */
 /* mga_drm.h -- Public header for the Matrox g200/g400 driver -*- linux-c -*-
  * Created: Tue Jan 25 01:50:01 1999 by jhartm...@precisioninsight.com
  *
@@ -5,25 +6,6 @@
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All rights reserved.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of