| Message ID | 20200621020703.864-2-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm: uapi: Use SPDX in DRM core uAPI headers | expand |
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 <laurent.pinchart+renesas@ideasonboard.com> > --- > 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 <martin@valinux.com> > * Gareth Hughes <gareth@valinux.com> > 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 jhartmann@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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * VA LINUX SYSTEMS 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. > - * > * Authors: > * Jeff Hartmann <jhartmann@valinux.com> > * Keith Whitwell <keith@tungstengraphics.com> > diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h > index 0b85ed6a3710..189d1a7f7a7b 100644 > --- a/include/uapi/drm/msm_drm.h > +++ b/include/uapi/drm/msm_drm.h > @@ -1,25 +1,7 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright (C) 2013 Red Hat > * Author: Rob Clark <robdclark@gmail.com> > - * > - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __MSM_DRM_H__ > diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h > index 853a327433d3..555283b49080 100644 > --- a/include/uapi/drm/nouveau_drm.h > +++ b/include/uapi/drm/nouveau_drm.h > @@ -1,25 +1,7 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright 2005 Stephane Marchesin. > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * VA LINUX SYSTEMS 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 __NOUVEAU_DRM_H__ > diff --git a/include/uapi/drm/qxl_drm.h b/include/uapi/drm/qxl_drm.h > index 880999d2d863..9fbf97ad7272 100644 > --- a/include/uapi/drm/qxl_drm.h > +++ b/include/uapi/drm/qxl_drm.h > @@ -1,25 +1,7 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright 2013 Red Hat > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS 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 QXL_DRM_H > #define QXL_DRM_H > diff --git a/include/uapi/drm/r128_drm.h b/include/uapi/drm/r128_drm.h > index 690e9c62f510..c426e6a1c843 100644 > --- a/include/uapi/drm/r128_drm.h > +++ b/include/uapi/drm/r128_drm.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: MIT */ > /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*- > * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com > */ > @@ -6,25 +7,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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * PRECISION INSIGHT 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. > - * > * Authors: > * Gareth Hughes <gareth@valinux.com> > * Kevin E. Martin <martin@valinux.com> > diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h > index 490a59cc4532..b5c4ef813a9e 100644 > --- a/include/uapi/drm/radeon_drm.h > +++ b/include/uapi/drm/radeon_drm.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: MIT */ > /* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*- > * > * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. > @@ -5,25 +6,6 @@ > * Copyright 2002 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * PRECISION INSIGHT 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. > - * > * Authors: > * Kevin E. Martin <martin@valinux.com> > * Gareth Hughes <gareth@valinux.com> > diff --git a/include/uapi/drm/savage_drm.h b/include/uapi/drm/savage_drm.h > index 0f6eddef74aa..bd5e74348db4 100644 > --- a/include/uapi/drm/savage_drm.h > +++ b/include/uapi/drm/savage_drm.h > @@ -1,26 +1,8 @@ > +/* SPDX-License-Identifier: MIT */ > /* savage_drm.h -- Public header for the savage driver > * > * Copyright 2004 Felix Kuehling > * 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 FELIX KUEHLING 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 __SAVAGE_DRM_H__ > diff --git a/include/uapi/drm/sis_drm.h b/include/uapi/drm/sis_drm.h > index 3e3f7e989e0b..9f7eb13b1975 100644 > --- a/include/uapi/drm/sis_drm.h > +++ b/include/uapi/drm/sis_drm.h > @@ -1,27 +1,8 @@ > +/* SPDX-License-Identifier: MIT */ > /* sis_drv.h -- Private header for sis driver -*- linux-c -*- */ > /* > * Copyright 2005 Eric Anholt > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __SIS_DRM_H__ > diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h > index c4df3c3668b3..98c2f17aa7de 100644 > --- a/include/uapi/drm/tegra_drm.h > +++ b/include/uapi/drm/tegra_drm.h > @@ -1,23 +1,6 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright (c) 2012-2013, NVIDIA CORPORATION. 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, 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. > */ > > #ifndef _UAPI_TEGRA_DRM_H_ > diff --git a/include/uapi/drm/v3d_drm.h b/include/uapi/drm/v3d_drm.h > index 1ce746e228d9..7895fb9bc018 100644 > --- a/include/uapi/drm/v3d_drm.h > +++ b/include/uapi/drm/v3d_drm.h > @@ -1,24 +1,6 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright © 2014-2018 Broadcom > - * > - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS 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 _V3D_DRM_H_ > diff --git a/include/uapi/drm/vc4_drm.h b/include/uapi/drm/vc4_drm.h > index 2cac6277a1d7..14b9a2186eae 100644 > --- a/include/uapi/drm/vc4_drm.h > +++ b/include/uapi/drm/vc4_drm.h > @@ -1,24 +1,6 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright © 2014-2015 Broadcom > - * > - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS 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_VC4_DRM_H_ > diff --git a/include/uapi/drm/vgem_drm.h b/include/uapi/drm/vgem_drm.h > index bf66f5db6da8..965e1ad00dcb 100644 > --- a/include/uapi/drm/vgem_drm.h > +++ b/include/uapi/drm/vgem_drm.h > @@ -1,27 +1,7 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright 2016 Intel Corporation > * 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_VGEM_DRM_H_ > diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h > index a1e125d42208..d77a21e7eb70 100644 > --- a/include/uapi/drm/via_drm.h > +++ b/include/uapi/drm/via_drm.h > @@ -1,25 +1,7 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. > * Copyright 2001-2003 S3 Graphics, Inc. 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 > - * VIA, S3 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 _VIA_DRM_H_ > #define _VIA_DRM_H_ > diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h > index f06a789f34cd..cea0352bc319 100644 > --- a/include/uapi/drm/virtgpu_drm.h > +++ b/include/uapi/drm/virtgpu_drm.h > @@ -1,25 +1,7 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright 2013 Red Hat > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS 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 VIRTGPU_DRM_H > #define VIRTGPU_DRM_H > diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h > index 02e917507479..728e432f09a1 100644 > --- a/include/uapi/drm/vmwgfx_drm.h > +++ b/include/uapi/drm/vmwgfx_drm.h > @@ -1,28 +1,9 @@ > +/* SPDX-License-Identifier: MIT */ > /************************************************************************** > * > * Copyright © 2009-2015 VMware, Inc., Palo Alto, CA., USA > * 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 > - * THE COPYRIGHT HOLDERS, AUTHORS 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 __VMWGFX_DRM_H__
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&me. -Daniel > > Thanks, > Christian. > > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > --- > > 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 <martin@valinux.com> > > * Gareth Hughes <gareth@valinux.com> > > 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 jhartmann@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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > - * VA LINUX SYSTEMS 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. > > - * > > * Authors: > > * Jeff Hartmann <jhartmann@valinux.com> > > * Keith Whitwell <keith@tungstengraphics.com> > > diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h > > index 0b85ed6a3710..189d1a7f7a7b 100644 > > --- a/include/uapi/drm/msm_drm.h > > +++ b/include/uapi/drm/msm_drm.h > > @@ -1,25 +1,7 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* > > * Copyright (C) 2013 Red Hat > > * Author: Rob Clark <robdclark@gmail.com> > > - * > > - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __MSM_DRM_H__ > > diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h > > index 853a327433d3..555283b49080 100644 > > --- a/include/uapi/drm/nouveau_drm.h > > +++ b/include/uapi/drm/nouveau_drm.h > > @@ -1,25 +1,7 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* > > * Copyright 2005 Stephane Marchesin. > > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > - * VA LINUX SYSTEMS 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 __NOUVEAU_DRM_H__ > > diff --git a/include/uapi/drm/qxl_drm.h b/include/uapi/drm/qxl_drm.h > > index 880999d2d863..9fbf97ad7272 100644 > > --- a/include/uapi/drm/qxl_drm.h > > +++ b/include/uapi/drm/qxl_drm.h > > @@ -1,25 +1,7 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* > > * Copyright 2013 Red Hat > > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > - * THE AUTHORS 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 QXL_DRM_H > > #define QXL_DRM_H > > diff --git a/include/uapi/drm/r128_drm.h b/include/uapi/drm/r128_drm.h > > index 690e9c62f510..c426e6a1c843 100644 > > --- a/include/uapi/drm/r128_drm.h > > +++ b/include/uapi/drm/r128_drm.h > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*- > > * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com > > */ > > @@ -6,25 +7,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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > - * PRECISION INSIGHT 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. > > - * > > * Authors: > > * Gareth Hughes <gareth@valinux.com> > > * Kevin E. Martin <martin@valinux.com> > > diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h > > index 490a59cc4532..b5c4ef813a9e 100644 > > --- a/include/uapi/drm/radeon_drm.h > > +++ b/include/uapi/drm/radeon_drm.h > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*- > > * > > * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. > > @@ -5,25 +6,6 @@ > > * Copyright 2002 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > - * PRECISION INSIGHT 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. > > - * > > * Authors: > > * Kevin E. Martin <martin@valinux.com> > > * Gareth Hughes <gareth@valinux.com> > > diff --git a/include/uapi/drm/savage_drm.h b/include/uapi/drm/savage_drm.h > > index 0f6eddef74aa..bd5e74348db4 100644 > > --- a/include/uapi/drm/savage_drm.h > > +++ b/include/uapi/drm/savage_drm.h > > @@ -1,26 +1,8 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* savage_drm.h -- Public header for the savage driver > > * > > * Copyright 2004 Felix Kuehling > > * 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 FELIX KUEHLING 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 __SAVAGE_DRM_H__ > > diff --git a/include/uapi/drm/sis_drm.h b/include/uapi/drm/sis_drm.h > > index 3e3f7e989e0b..9f7eb13b1975 100644 > > --- a/include/uapi/drm/sis_drm.h > > +++ b/include/uapi/drm/sis_drm.h > > @@ -1,27 +1,8 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* sis_drv.h -- Private header for sis driver -*- linux-c -*- */ > > /* > > * Copyright 2005 Eric Anholt > > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __SIS_DRM_H__ > > diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h > > index c4df3c3668b3..98c2f17aa7de 100644 > > --- a/include/uapi/drm/tegra_drm.h > > +++ b/include/uapi/drm/tegra_drm.h > > @@ -1,23 +1,6 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* > > * Copyright (c) 2012-2013, NVIDIA CORPORATION. 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, 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. > > */ > > #ifndef _UAPI_TEGRA_DRM_H_ > > diff --git a/include/uapi/drm/v3d_drm.h b/include/uapi/drm/v3d_drm.h > > index 1ce746e228d9..7895fb9bc018 100644 > > --- a/include/uapi/drm/v3d_drm.h > > +++ b/include/uapi/drm/v3d_drm.h > > @@ -1,24 +1,6 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* > > * Copyright © 2014-2018 Broadcom > > - * > > - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > - * THE AUTHORS OR COPYRIGHT HOLDERS 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 _V3D_DRM_H_ > > diff --git a/include/uapi/drm/vc4_drm.h b/include/uapi/drm/vc4_drm.h > > index 2cac6277a1d7..14b9a2186eae 100644 > > --- a/include/uapi/drm/vc4_drm.h > > +++ b/include/uapi/drm/vc4_drm.h > > @@ -1,24 +1,6 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* > > * Copyright © 2014-2015 Broadcom > > - * > > - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > - * THE AUTHORS OR COPYRIGHT HOLDERS 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_VC4_DRM_H_ > > diff --git a/include/uapi/drm/vgem_drm.h b/include/uapi/drm/vgem_drm.h > > index bf66f5db6da8..965e1ad00dcb 100644 > > --- a/include/uapi/drm/vgem_drm.h > > +++ b/include/uapi/drm/vgem_drm.h > > @@ -1,27 +1,7 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* > > * Copyright 2016 Intel Corporation > > * 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_VGEM_DRM_H_ > > diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h > > index a1e125d42208..d77a21e7eb70 100644 > > --- a/include/uapi/drm/via_drm.h > > +++ b/include/uapi/drm/via_drm.h > > @@ -1,25 +1,7 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* > > * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. > > * Copyright 2001-2003 S3 Graphics, Inc. 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 > > - * VIA, S3 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 _VIA_DRM_H_ > > #define _VIA_DRM_H_ > > diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h > > index f06a789f34cd..cea0352bc319 100644 > > --- a/include/uapi/drm/virtgpu_drm.h > > +++ b/include/uapi/drm/virtgpu_drm.h > > @@ -1,25 +1,7 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* > > * Copyright 2013 Red Hat > > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > - * THE AUTHORS 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 VIRTGPU_DRM_H > > #define VIRTGPU_DRM_H > > diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h > > index 02e917507479..728e432f09a1 100644 > > --- a/include/uapi/drm/vmwgfx_drm.h > > +++ b/include/uapi/drm/vmwgfx_drm.h > > @@ -1,28 +1,9 @@ > > +/* SPDX-License-Identifier: MIT */ > > /************************************************************************** > > * > > * Copyright © 2009-2015 VMware, Inc., Palo Alto, CA., USA > > * 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 > > - * THE COPYRIGHT HOLDERS, AUTHORS 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 __VMWGFX_DRM_H__ >
At least for the vmwgfx bits, no objections here, Reviewed-by: Roland Scheidegger <sroland@vmware.com> 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 <laurent.pinchart+renesas@ideasonboard.com> > --- > 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 <martin@valinux.com> > * Gareth Hughes <gareth@valinux.com> > 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 jhartmann@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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * VA LINUX SYSTEMS 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. > - * > * Authors: > * Jeff Hartmann <jhartmann@valinux.com> > * Keith Whitwell <keith@tungstengraphics.com> > diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h > index 0b85ed6a3710..189d1a7f7a7b 100644 > --- a/include/uapi/drm/msm_drm.h > +++ b/include/uapi/drm/msm_drm.h > @@ -1,25 +1,7 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright (C) 2013 Red Hat > * Author: Rob Clark <robdclark@gmail.com> > - * > - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __MSM_DRM_H__ > diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h > index 853a327433d3..555283b49080 100644 > --- a/include/uapi/drm/nouveau_drm.h > +++ b/include/uapi/drm/nouveau_drm.h > @@ -1,25 +1,7 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright 2005 Stephane Marchesin. > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * VA LINUX SYSTEMS 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 __NOUVEAU_DRM_H__ > diff --git a/include/uapi/drm/qxl_drm.h b/include/uapi/drm/qxl_drm.h > index 880999d2d863..9fbf97ad7272 100644 > --- a/include/uapi/drm/qxl_drm.h > +++ b/include/uapi/drm/qxl_drm.h > @@ -1,25 +1,7 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright 2013 Red Hat > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS 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 QXL_DRM_H > #define QXL_DRM_H > diff --git a/include/uapi/drm/r128_drm.h b/include/uapi/drm/r128_drm.h > index 690e9c62f510..c426e6a1c843 100644 > --- a/include/uapi/drm/r128_drm.h > +++ b/include/uapi/drm/r128_drm.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: MIT */ > /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*- > * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com > */ > @@ -6,25 +7,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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * PRECISION INSIGHT 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. > - * > * Authors: > * Gareth Hughes <gareth@valinux.com> > * Kevin E. Martin <martin@valinux.com> > diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h > index 490a59cc4532..b5c4ef813a9e 100644 > --- a/include/uapi/drm/radeon_drm.h > +++ b/include/uapi/drm/radeon_drm.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: MIT */ > /* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*- > * > * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. > @@ -5,25 +6,6 @@ > * Copyright 2002 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * PRECISION INSIGHT 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. > - * > * Authors: > * Kevin E. Martin <martin@valinux.com> > * Gareth Hughes <gareth@valinux.com> > diff --git a/include/uapi/drm/savage_drm.h b/include/uapi/drm/savage_drm.h > index 0f6eddef74aa..bd5e74348db4 100644 > --- a/include/uapi/drm/savage_drm.h > +++ b/include/uapi/drm/savage_drm.h > @@ -1,26 +1,8 @@ > +/* SPDX-License-Identifier: MIT */ > /* savage_drm.h -- Public header for the savage driver > * > * Copyright 2004 Felix Kuehling > * 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 FELIX KUEHLING 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 __SAVAGE_DRM_H__ > diff --git a/include/uapi/drm/sis_drm.h b/include/uapi/drm/sis_drm.h > index 3e3f7e989e0b..9f7eb13b1975 100644 > --- a/include/uapi/drm/sis_drm.h > +++ b/include/uapi/drm/sis_drm.h > @@ -1,27 +1,8 @@ > +/* SPDX-License-Identifier: MIT */ > /* sis_drv.h -- Private header for sis driver -*- linux-c -*- */ > /* > * Copyright 2005 Eric Anholt > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __SIS_DRM_H__ > diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h > index c4df3c3668b3..98c2f17aa7de 100644 > --- a/include/uapi/drm/tegra_drm.h > +++ b/include/uapi/drm/tegra_drm.h > @@ -1,23 +1,6 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright (c) 2012-2013, NVIDIA CORPORATION. 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, 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. > */ > > #ifndef _UAPI_TEGRA_DRM_H_ > diff --git a/include/uapi/drm/v3d_drm.h b/include/uapi/drm/v3d_drm.h > index 1ce746e228d9..7895fb9bc018 100644 > --- a/include/uapi/drm/v3d_drm.h > +++ b/include/uapi/drm/v3d_drm.h > @@ -1,24 +1,6 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright © 2014-2018 Broadcom > - * > - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS 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 _V3D_DRM_H_ > diff --git a/include/uapi/drm/vc4_drm.h b/include/uapi/drm/vc4_drm.h > index 2cac6277a1d7..14b9a2186eae 100644 > --- a/include/uapi/drm/vc4_drm.h > +++ b/include/uapi/drm/vc4_drm.h > @@ -1,24 +1,6 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright © 2014-2015 Broadcom > - * > - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS 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_VC4_DRM_H_ > diff --git a/include/uapi/drm/vgem_drm.h b/include/uapi/drm/vgem_drm.h > index bf66f5db6da8..965e1ad00dcb 100644 > --- a/include/uapi/drm/vgem_drm.h > +++ b/include/uapi/drm/vgem_drm.h > @@ -1,27 +1,7 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright 2016 Intel Corporation > * 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_VGEM_DRM_H_ > diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h > index a1e125d42208..d77a21e7eb70 100644 > --- a/include/uapi/drm/via_drm.h > +++ b/include/uapi/drm/via_drm.h > @@ -1,25 +1,7 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. > * Copyright 2001-2003 S3 Graphics, Inc. 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 > - * VIA, S3 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 _VIA_DRM_H_ > #define _VIA_DRM_H_ > diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h > index f06a789f34cd..cea0352bc319 100644 > --- a/include/uapi/drm/virtgpu_drm.h > +++ b/include/uapi/drm/virtgpu_drm.h > @@ -1,25 +1,7 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright 2013 Red Hat > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS 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 VIRTGPU_DRM_H > #define VIRTGPU_DRM_H > diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h > index 02e917507479..728e432f09a1 100644 > --- a/include/uapi/drm/vmwgfx_drm.h > +++ b/include/uapi/drm/vmwgfx_drm.h > @@ -1,28 +1,9 @@ > +/* SPDX-License-Identifier: MIT */ > /************************************************************************** > * > * Copyright © 2009-2015 VMware, Inc., Palo Alto, CA., USA > * 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 > - * THE COPYRIGHT HOLDERS, AUTHORS 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 __VMWGFX_DRM_H__ >
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&me. > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > > --- > > > 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 <martin@valinux.com> > > > * Gareth Hughes <gareth@valinux.com> > > > 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 jhartmann@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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > > - * VA LINUX SYSTEMS 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. > > > - * > > > * Authors: > > > * Jeff Hartmann <jhartmann@valinux.com> > > > * Keith Whitwell <keith@tungstengraphics.com> > > > diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h > > > index 0b85ed6a3710..189d1a7f7a7b 100644 > > > --- a/include/uapi/drm/msm_drm.h > > > +++ b/include/uapi/drm/msm_drm.h > > > @@ -1,25 +1,7 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* > > > * Copyright (C) 2013 Red Hat > > > * Author: Rob Clark <robdclark@gmail.com> > > > - * > > > - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > > - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __MSM_DRM_H__ > > > diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h > > > index 853a327433d3..555283b49080 100644 > > > --- a/include/uapi/drm/nouveau_drm.h > > > +++ b/include/uapi/drm/nouveau_drm.h > > > @@ -1,25 +1,7 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* > > > * Copyright 2005 Stephane Marchesin. > > > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > > - * VA LINUX SYSTEMS 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 __NOUVEAU_DRM_H__ > > > diff --git a/include/uapi/drm/qxl_drm.h b/include/uapi/drm/qxl_drm.h > > > index 880999d2d863..9fbf97ad7272 100644 > > > --- a/include/uapi/drm/qxl_drm.h > > > +++ b/include/uapi/drm/qxl_drm.h > > > @@ -1,25 +1,7 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* > > > * Copyright 2013 Red Hat > > > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > > - * THE AUTHORS 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 QXL_DRM_H > > > #define QXL_DRM_H > > > diff --git a/include/uapi/drm/r128_drm.h b/include/uapi/drm/r128_drm.h > > > index 690e9c62f510..c426e6a1c843 100644 > > > --- a/include/uapi/drm/r128_drm.h > > > +++ b/include/uapi/drm/r128_drm.h > > > @@ -1,3 +1,4 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*- > > > * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com > > > */ > > > @@ -6,25 +7,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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > > - * PRECISION INSIGHT 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. > > > - * > > > * Authors: > > > * Gareth Hughes <gareth@valinux.com> > > > * Kevin E. Martin <martin@valinux.com> > > > diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h > > > index 490a59cc4532..b5c4ef813a9e 100644 > > > --- a/include/uapi/drm/radeon_drm.h > > > +++ b/include/uapi/drm/radeon_drm.h > > > @@ -1,3 +1,4 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*- > > > * > > > * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. > > > @@ -5,25 +6,6 @@ > > > * Copyright 2002 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > > - * PRECISION INSIGHT 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. > > > - * > > > * Authors: > > > * Kevin E. Martin <martin@valinux.com> > > > * Gareth Hughes <gareth@valinux.com> > > > diff --git a/include/uapi/drm/savage_drm.h b/include/uapi/drm/savage_drm.h > > > index 0f6eddef74aa..bd5e74348db4 100644 > > > --- a/include/uapi/drm/savage_drm.h > > > +++ b/include/uapi/drm/savage_drm.h > > > @@ -1,26 +1,8 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* savage_drm.h -- Public header for the savage driver > > > * > > > * Copyright 2004 Felix Kuehling > > > * 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 FELIX KUEHLING 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 __SAVAGE_DRM_H__ > > > diff --git a/include/uapi/drm/sis_drm.h b/include/uapi/drm/sis_drm.h > > > index 3e3f7e989e0b..9f7eb13b1975 100644 > > > --- a/include/uapi/drm/sis_drm.h > > > +++ b/include/uapi/drm/sis_drm.h > > > @@ -1,27 +1,8 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* sis_drv.h -- Private header for sis driver -*- linux-c -*- */ > > > /* > > > * Copyright 2005 Eric Anholt > > > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > > - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __SIS_DRM_H__ > > > diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h > > > index c4df3c3668b3..98c2f17aa7de 100644 > > > --- a/include/uapi/drm/tegra_drm.h > > > +++ b/include/uapi/drm/tegra_drm.h > > > @@ -1,23 +1,6 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* > > > * Copyright (c) 2012-2013, NVIDIA CORPORATION. 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, 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. > > > */ > > > #ifndef _UAPI_TEGRA_DRM_H_ > > > diff --git a/include/uapi/drm/v3d_drm.h b/include/uapi/drm/v3d_drm.h > > > index 1ce746e228d9..7895fb9bc018 100644 > > > --- a/include/uapi/drm/v3d_drm.h > > > +++ b/include/uapi/drm/v3d_drm.h > > > @@ -1,24 +1,6 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* > > > * Copyright © 2014-2018 Broadcom > > > - * > > > - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > > - * THE AUTHORS OR COPYRIGHT HOLDERS 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 _V3D_DRM_H_ > > > diff --git a/include/uapi/drm/vc4_drm.h b/include/uapi/drm/vc4_drm.h > > > index 2cac6277a1d7..14b9a2186eae 100644 > > > --- a/include/uapi/drm/vc4_drm.h > > > +++ b/include/uapi/drm/vc4_drm.h > > > @@ -1,24 +1,6 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* > > > * Copyright © 2014-2015 Broadcom > > > - * > > > - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > > - * THE AUTHORS OR COPYRIGHT HOLDERS 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_VC4_DRM_H_ > > > diff --git a/include/uapi/drm/vgem_drm.h b/include/uapi/drm/vgem_drm.h > > > index bf66f5db6da8..965e1ad00dcb 100644 > > > --- a/include/uapi/drm/vgem_drm.h > > > +++ b/include/uapi/drm/vgem_drm.h > > > @@ -1,27 +1,7 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* > > > * Copyright 2016 Intel Corporation > > > * 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_VGEM_DRM_H_ > > > diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h > > > index a1e125d42208..d77a21e7eb70 100644 > > > --- a/include/uapi/drm/via_drm.h > > > +++ b/include/uapi/drm/via_drm.h > > > @@ -1,25 +1,7 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* > > > * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. > > > * Copyright 2001-2003 S3 Graphics, Inc. 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 > > > - * VIA, S3 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 _VIA_DRM_H_ > > > #define _VIA_DRM_H_ > > > diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h > > > index f06a789f34cd..cea0352bc319 100644 > > > --- a/include/uapi/drm/virtgpu_drm.h > > > +++ b/include/uapi/drm/virtgpu_drm.h > > > @@ -1,25 +1,7 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* > > > * Copyright 2013 Red Hat > > > * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > > > - * THE AUTHORS 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 VIRTGPU_DRM_H > > > #define VIRTGPU_DRM_H > > > diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h > > > index 02e917507479..728e432f09a1 100644 > > > --- a/include/uapi/drm/vmwgfx_drm.h > > > +++ b/include/uapi/drm/vmwgfx_drm.h > > > @@ -1,28 +1,9 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /************************************************************************** > > > * > > > * Copyright © 2009-2015 VMware, Inc., Palo Alto, CA., USA > > > * 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 > > > - * THE COPYRIGHT HOLDERS, AUTHORS 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 __VMWGFX_DRM_H__
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&me. >> >>>> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> >>>> --- >>>> 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 <martin@valinux.com> >>>> * Gareth Hughes <gareth@valinux.com> >>>> 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 jhartmann@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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL >>>> - * VA LINUX SYSTEMS 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. >>>> - * >>>> * Authors: >>>> * Jeff Hartmann <jhartmann@valinux.com> >>>> * Keith Whitwell <keith@tungstengraphics.com> >>>> diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h >>>> index 0b85ed6a3710..189d1a7f7a7b 100644 >>>> --- a/include/uapi/drm/msm_drm.h >>>> +++ b/include/uapi/drm/msm_drm.h >>>> @@ -1,25 +1,7 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* >>>> * Copyright (C) 2013 Red Hat >>>> * Author: Rob Clark <robdclark@gmail.com> >>>> - * >>>> - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL >>>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __MSM_DRM_H__ >>>> diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h >>>> index 853a327433d3..555283b49080 100644 >>>> --- a/include/uapi/drm/nouveau_drm.h >>>> +++ b/include/uapi/drm/nouveau_drm.h >>>> @@ -1,25 +1,7 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* >>>> * Copyright 2005 Stephane Marchesin. >>>> * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL >>>> - * VA LINUX SYSTEMS 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 __NOUVEAU_DRM_H__ >>>> diff --git a/include/uapi/drm/qxl_drm.h b/include/uapi/drm/qxl_drm.h >>>> index 880999d2d863..9fbf97ad7272 100644 >>>> --- a/include/uapi/drm/qxl_drm.h >>>> +++ b/include/uapi/drm/qxl_drm.h >>>> @@ -1,25 +1,7 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* >>>> * Copyright 2013 Red Hat >>>> * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL >>>> - * THE AUTHORS 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 QXL_DRM_H >>>> #define QXL_DRM_H >>>> diff --git a/include/uapi/drm/r128_drm.h b/include/uapi/drm/r128_drm.h >>>> index 690e9c62f510..c426e6a1c843 100644 >>>> --- a/include/uapi/drm/r128_drm.h >>>> +++ b/include/uapi/drm/r128_drm.h >>>> @@ -1,3 +1,4 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*- >>>> * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com >>>> */ >>>> @@ -6,25 +7,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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL >>>> - * PRECISION INSIGHT 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. >>>> - * >>>> * Authors: >>>> * Gareth Hughes <gareth@valinux.com> >>>> * Kevin E. Martin <martin@valinux.com> >>>> diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h >>>> index 490a59cc4532..b5c4ef813a9e 100644 >>>> --- a/include/uapi/drm/radeon_drm.h >>>> +++ b/include/uapi/drm/radeon_drm.h >>>> @@ -1,3 +1,4 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*- >>>> * >>>> * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. >>>> @@ -5,25 +6,6 @@ >>>> * Copyright 2002 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL >>>> - * PRECISION INSIGHT 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. >>>> - * >>>> * Authors: >>>> * Kevin E. Martin <martin@valinux.com> >>>> * Gareth Hughes <gareth@valinux.com> >>>> diff --git a/include/uapi/drm/savage_drm.h b/include/uapi/drm/savage_drm.h >>>> index 0f6eddef74aa..bd5e74348db4 100644 >>>> --- a/include/uapi/drm/savage_drm.h >>>> +++ b/include/uapi/drm/savage_drm.h >>>> @@ -1,26 +1,8 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* savage_drm.h -- Public header for the savage driver >>>> * >>>> * Copyright 2004 Felix Kuehling >>>> * 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 FELIX KUEHLING 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 __SAVAGE_DRM_H__ >>>> diff --git a/include/uapi/drm/sis_drm.h b/include/uapi/drm/sis_drm.h >>>> index 3e3f7e989e0b..9f7eb13b1975 100644 >>>> --- a/include/uapi/drm/sis_drm.h >>>> +++ b/include/uapi/drm/sis_drm.h >>>> @@ -1,27 +1,8 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* sis_drv.h -- Private header for sis driver -*- linux-c -*- */ >>>> /* >>>> * Copyright 2005 Eric Anholt >>>> * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL >>>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __SIS_DRM_H__ >>>> diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h >>>> index c4df3c3668b3..98c2f17aa7de 100644 >>>> --- a/include/uapi/drm/tegra_drm.h >>>> +++ b/include/uapi/drm/tegra_drm.h >>>> @@ -1,23 +1,6 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* >>>> * Copyright (c) 2012-2013, NVIDIA CORPORATION. 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, 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. >>>> */ >>>> #ifndef _UAPI_TEGRA_DRM_H_ >>>> diff --git a/include/uapi/drm/v3d_drm.h b/include/uapi/drm/v3d_drm.h >>>> index 1ce746e228d9..7895fb9bc018 100644 >>>> --- a/include/uapi/drm/v3d_drm.h >>>> +++ b/include/uapi/drm/v3d_drm.h >>>> @@ -1,24 +1,6 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* >>>> * Copyright © 2014-2018 Broadcom >>>> - * >>>> - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL >>>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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 _V3D_DRM_H_ >>>> diff --git a/include/uapi/drm/vc4_drm.h b/include/uapi/drm/vc4_drm.h >>>> index 2cac6277a1d7..14b9a2186eae 100644 >>>> --- a/include/uapi/drm/vc4_drm.h >>>> +++ b/include/uapi/drm/vc4_drm.h >>>> @@ -1,24 +1,6 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* >>>> * Copyright © 2014-2015 Broadcom >>>> - * >>>> - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL >>>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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_VC4_DRM_H_ >>>> diff --git a/include/uapi/drm/vgem_drm.h b/include/uapi/drm/vgem_drm.h >>>> index bf66f5db6da8..965e1ad00dcb 100644 >>>> --- a/include/uapi/drm/vgem_drm.h >>>> +++ b/include/uapi/drm/vgem_drm.h >>>> @@ -1,27 +1,7 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* >>>> * Copyright 2016 Intel Corporation >>>> * 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_VGEM_DRM_H_ >>>> diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h >>>> index a1e125d42208..d77a21e7eb70 100644 >>>> --- a/include/uapi/drm/via_drm.h >>>> +++ b/include/uapi/drm/via_drm.h >>>> @@ -1,25 +1,7 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* >>>> * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. >>>> * Copyright 2001-2003 S3 Graphics, Inc. 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 >>>> - * VIA, S3 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 _VIA_DRM_H_ >>>> #define _VIA_DRM_H_ >>>> diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h >>>> index f06a789f34cd..cea0352bc319 100644 >>>> --- a/include/uapi/drm/virtgpu_drm.h >>>> +++ b/include/uapi/drm/virtgpu_drm.h >>>> @@ -1,25 +1,7 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /* >>>> * Copyright 2013 Red Hat >>>> * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL >>>> - * THE AUTHORS 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 VIRTGPU_DRM_H >>>> #define VIRTGPU_DRM_H >>>> diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h >>>> index 02e917507479..728e432f09a1 100644 >>>> --- a/include/uapi/drm/vmwgfx_drm.h >>>> +++ b/include/uapi/drm/vmwgfx_drm.h >>>> @@ -1,28 +1,9 @@ >>>> +/* SPDX-License-Identifier: MIT */ >>>> /************************************************************************** >>>> * >>>> * Copyright © 2009-2015 VMware, Inc., Palo Alto, CA., USA >>>> * 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 >>>> - * THE COPYRIGHT HOLDERS, AUTHORS 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 __VMWGFX_DRM_H__
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&me. > >> > >>>> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > >>>> --- > >>>> 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 <martin@valinux.com> > >>>> * Gareth Hughes <gareth@valinux.com> > >>>> 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 jhartmann@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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > >>>> - * VA LINUX SYSTEMS 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. > >>>> - * > >>>> * Authors: > >>>> * Jeff Hartmann <jhartmann@valinux.com> > >>>> * Keith Whitwell <keith@tungstengraphics.com> > >>>> diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h > >>>> index 0b85ed6a3710..189d1a7f7a7b 100644 > >>>> --- a/include/uapi/drm/msm_drm.h > >>>> +++ b/include/uapi/drm/msm_drm.h > >>>> @@ -1,25 +1,7 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* > >>>> * Copyright (C) 2013 Red Hat > >>>> * Author: Rob Clark <robdclark@gmail.com> > >>>> - * > >>>> - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > >>>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __MSM_DRM_H__ > >>>> diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h > >>>> index 853a327433d3..555283b49080 100644 > >>>> --- a/include/uapi/drm/nouveau_drm.h > >>>> +++ b/include/uapi/drm/nouveau_drm.h > >>>> @@ -1,25 +1,7 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* > >>>> * Copyright 2005 Stephane Marchesin. > >>>> * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > >>>> - * VA LINUX SYSTEMS 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 __NOUVEAU_DRM_H__ > >>>> diff --git a/include/uapi/drm/qxl_drm.h b/include/uapi/drm/qxl_drm.h > >>>> index 880999d2d863..9fbf97ad7272 100644 > >>>> --- a/include/uapi/drm/qxl_drm.h > >>>> +++ b/include/uapi/drm/qxl_drm.h > >>>> @@ -1,25 +1,7 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* > >>>> * Copyright 2013 Red Hat > >>>> * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > >>>> - * THE AUTHORS 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 QXL_DRM_H > >>>> #define QXL_DRM_H > >>>> diff --git a/include/uapi/drm/r128_drm.h b/include/uapi/drm/r128_drm.h > >>>> index 690e9c62f510..c426e6a1c843 100644 > >>>> --- a/include/uapi/drm/r128_drm.h > >>>> +++ b/include/uapi/drm/r128_drm.h > >>>> @@ -1,3 +1,4 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*- > >>>> * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com > >>>> */ > >>>> @@ -6,25 +7,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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > >>>> - * PRECISION INSIGHT 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. > >>>> - * > >>>> * Authors: > >>>> * Gareth Hughes <gareth@valinux.com> > >>>> * Kevin E. Martin <martin@valinux.com> > >>>> diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h > >>>> index 490a59cc4532..b5c4ef813a9e 100644 > >>>> --- a/include/uapi/drm/radeon_drm.h > >>>> +++ b/include/uapi/drm/radeon_drm.h > >>>> @@ -1,3 +1,4 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*- > >>>> * > >>>> * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. > >>>> @@ -5,25 +6,6 @@ > >>>> * Copyright 2002 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > >>>> - * PRECISION INSIGHT 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. > >>>> - * > >>>> * Authors: > >>>> * Kevin E. Martin <martin@valinux.com> > >>>> * Gareth Hughes <gareth@valinux.com> > >>>> diff --git a/include/uapi/drm/savage_drm.h b/include/uapi/drm/savage_drm.h > >>>> index 0f6eddef74aa..bd5e74348db4 100644 > >>>> --- a/include/uapi/drm/savage_drm.h > >>>> +++ b/include/uapi/drm/savage_drm.h > >>>> @@ -1,26 +1,8 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* savage_drm.h -- Public header for the savage driver > >>>> * > >>>> * Copyright 2004 Felix Kuehling > >>>> * 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 FELIX KUEHLING 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 __SAVAGE_DRM_H__ > >>>> diff --git a/include/uapi/drm/sis_drm.h b/include/uapi/drm/sis_drm.h > >>>> index 3e3f7e989e0b..9f7eb13b1975 100644 > >>>> --- a/include/uapi/drm/sis_drm.h > >>>> +++ b/include/uapi/drm/sis_drm.h > >>>> @@ -1,27 +1,8 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* sis_drv.h -- Private header for sis driver -*- linux-c -*- */ > >>>> /* > >>>> * Copyright 2005 Eric Anholt > >>>> * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > >>>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __SIS_DRM_H__ > >>>> diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h > >>>> index c4df3c3668b3..98c2f17aa7de 100644 > >>>> --- a/include/uapi/drm/tegra_drm.h > >>>> +++ b/include/uapi/drm/tegra_drm.h > >>>> @@ -1,23 +1,6 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* > >>>> * Copyright (c) 2012-2013, NVIDIA CORPORATION. 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, 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. > >>>> */ > >>>> #ifndef _UAPI_TEGRA_DRM_H_ > >>>> diff --git a/include/uapi/drm/v3d_drm.h b/include/uapi/drm/v3d_drm.h > >>>> index 1ce746e228d9..7895fb9bc018 100644 > >>>> --- a/include/uapi/drm/v3d_drm.h > >>>> +++ b/include/uapi/drm/v3d_drm.h > >>>> @@ -1,24 +1,6 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* > >>>> * Copyright © 2014-2018 Broadcom > >>>> - * > >>>> - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > >>>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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 _V3D_DRM_H_ > >>>> diff --git a/include/uapi/drm/vc4_drm.h b/include/uapi/drm/vc4_drm.h > >>>> index 2cac6277a1d7..14b9a2186eae 100644 > >>>> --- a/include/uapi/drm/vc4_drm.h > >>>> +++ b/include/uapi/drm/vc4_drm.h > >>>> @@ -1,24 +1,6 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* > >>>> * Copyright © 2014-2015 Broadcom > >>>> - * > >>>> - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > >>>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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_VC4_DRM_H_ > >>>> diff --git a/include/uapi/drm/vgem_drm.h b/include/uapi/drm/vgem_drm.h > >>>> index bf66f5db6da8..965e1ad00dcb 100644 > >>>> --- a/include/uapi/drm/vgem_drm.h > >>>> +++ b/include/uapi/drm/vgem_drm.h > >>>> @@ -1,27 +1,7 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* > >>>> * Copyright 2016 Intel Corporation > >>>> * 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_VGEM_DRM_H_ > >>>> diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h > >>>> index a1e125d42208..d77a21e7eb70 100644 > >>>> --- a/include/uapi/drm/via_drm.h > >>>> +++ b/include/uapi/drm/via_drm.h > >>>> @@ -1,25 +1,7 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* > >>>> * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. > >>>> * Copyright 2001-2003 S3 Graphics, Inc. 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 > >>>> - * VIA, S3 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 _VIA_DRM_H_ > >>>> #define _VIA_DRM_H_ > >>>> diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h > >>>> index f06a789f34cd..cea0352bc319 100644 > >>>> --- a/include/uapi/drm/virtgpu_drm.h > >>>> +++ b/include/uapi/drm/virtgpu_drm.h > >>>> @@ -1,25 +1,7 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /* > >>>> * Copyright 2013 Red Hat > >>>> * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL > >>>> - * THE AUTHORS 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 VIRTGPU_DRM_H > >>>> #define VIRTGPU_DRM_H > >>>> diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h > >>>> index 02e917507479..728e432f09a1 100644 > >>>> --- a/include/uapi/drm/vmwgfx_drm.h > >>>> +++ b/include/uapi/drm/vmwgfx_drm.h > >>>> @@ -1,28 +1,9 @@ > >>>> +/* SPDX-License-Identifier: MIT */ > >>>> /************************************************************************** > >>>> * > >>>> * Copyright © 2009-2015 VMware, Inc., Palo Alto, CA., USA > >>>> * 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 > >>>> - * THE COPYRIGHT HOLDERS, AUTHORS 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 __VMWGFX_DRM_H__
[AMD Public Use] > -----Original Message----- > From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Sent: Tuesday, December 15, 2020 9:15 PM > To: Koenig, Christian <Christian.Koenig@amd.com> > Cc: Daniel Vetter <daniel@ffwll.ch>; Laurent Pinchart > <laurent.pinchart+renesas@ideasonboard.com>; dri- > devel@lists.freedesktop.org; Dave Airlie <airlied@gmail.com>; Greg Kroah- > Hartman <gregkh@linuxfoundation.org>; Thomas Gleixner > <tglx@linutronix.de>; Deucher, Alexander <Alexander.Deucher@amd.com>; > Rob Clark <robdclark@gmail.com>; Sean Paul <sean@poorly.run>; Ben > Skeggs <bskeggs@redhat.com>; Gerd Hoffmann <kraxel@redhat.com>; > Thierry Reding <thierry.reding@gmail.com>; Eric Anholt <eric@anholt.net>; > VMware Graphics <linux-graphics-maintainer@vmware.com>; Thomas > Hellstrom <thellstrom@vmware.com> > 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&me. > > >> > > >>>> Signed-off-by: Laurent Pinchart > > >>>> <laurent.pinchart+renesas@ideasonboard.com> > > >>>> --- > > >>>> 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 <martin@valinux.com> > > >>>> * Gareth Hughes <gareth@valinux.com> > > >>>> 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 > jhartmann@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 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 > > >>>> (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 NONINFRINGEMENT. > IN NO > > >>>> EVENT SHALL > > >>>> - * VA LINUX SYSTEMS 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. > > >>>> - * > > >>>> * Authors: > > >>>> * Jeff Hartmann <jhartmann@valinux.com> > > >>>> * Keith Whitwell <keith@tungstengraphics.com> > > >>>> diff --git a/include/uapi/drm/msm_drm.h > > >>>> b/include/uapi/drm/msm_drm.h index 0b85ed6a3710..189d1a7f7a7b > > >>>> 100644 > > >>>> --- a/include/uapi/drm/msm_drm.h > > >>>> +++ b/include/uapi/drm/msm_drm.h > > >>>> @@ -1,25 +1,7 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* > > >>>> * Copyright (C) 2013 Red Hat > > >>>> * Author: Rob Clark <robdclark@gmail.com> > > >>>> - * > > >>>> - * 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 > > >>>> (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 NONINFRINGEMENT. > IN NO > > >>>> EVENT SHALL > > >>>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __MSM_DRM_H__ > > >>>> diff --git a/include/uapi/drm/nouveau_drm.h > > >>>> b/include/uapi/drm/nouveau_drm.h index > 853a327433d3..555283b49080 > > >>>> 100644 > > >>>> --- a/include/uapi/drm/nouveau_drm.h > > >>>> +++ b/include/uapi/drm/nouveau_drm.h > > >>>> @@ -1,25 +1,7 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* > > >>>> * Copyright 2005 Stephane Marchesin. > > >>>> * 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, > > >>>> 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 > > >>>> (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 NONINFRINGEMENT. > IN NO > > >>>> EVENT SHALL > > >>>> - * VA LINUX SYSTEMS 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 __NOUVEAU_DRM_H__ > > >>>> diff --git a/include/uapi/drm/qxl_drm.h > > >>>> b/include/uapi/drm/qxl_drm.h index 880999d2d863..9fbf97ad7272 > > >>>> 100644 > > >>>> --- a/include/uapi/drm/qxl_drm.h > > >>>> +++ b/include/uapi/drm/qxl_drm.h > > >>>> @@ -1,25 +1,7 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* > > >>>> * Copyright 2013 Red Hat > > >>>> * 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, > > >>>> 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 > > >>>> (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 NONINFRINGEMENT. > IN NO > > >>>> EVENT SHALL > > >>>> - * THE AUTHORS 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 QXL_DRM_H > > >>>> #define QXL_DRM_H > > >>>> diff --git a/include/uapi/drm/r128_drm.h > > >>>> b/include/uapi/drm/r128_drm.h index 690e9c62f510..c426e6a1c843 > > >>>> 100644 > > >>>> --- a/include/uapi/drm/r128_drm.h > > >>>> +++ b/include/uapi/drm/r128_drm.h > > >>>> @@ -1,3 +1,4 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*- > > >>>> * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com > > >>>> */ > > >>>> @@ -6,25 +7,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 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 > > >>>> (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 NONINFRINGEMENT. > IN NO > > >>>> EVENT SHALL > > >>>> - * PRECISION INSIGHT 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. > > >>>> - * > > >>>> * Authors: > > >>>> * Gareth Hughes <gareth@valinux.com> > > >>>> * Kevin E. Martin <martin@valinux.com> > > >>>> diff --git a/include/uapi/drm/radeon_drm.h > > >>>> b/include/uapi/drm/radeon_drm.h index > 490a59cc4532..b5c4ef813a9e > > >>>> 100644 > > >>>> --- a/include/uapi/drm/radeon_drm.h > > >>>> +++ b/include/uapi/drm/radeon_drm.h > > >>>> @@ -1,3 +1,4 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* radeon_drm.h -- Public header for the radeon driver -*- linux-c - > *- > > >>>> * > > >>>> * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. > > >>>> @@ -5,25 +6,6 @@ > > >>>> * Copyright 2002 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, > > >>>> 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 > > >>>> (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 NONINFRINGEMENT. > IN NO > > >>>> EVENT SHALL > > >>>> - * PRECISION INSIGHT 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. > > >>>> - * > > >>>> * Authors: > > >>>> * Kevin E. Martin <martin@valinux.com> > > >>>> * Gareth Hughes <gareth@valinux.com> > > >>>> diff --git a/include/uapi/drm/savage_drm.h > > >>>> b/include/uapi/drm/savage_drm.h index > 0f6eddef74aa..bd5e74348db4 > > >>>> 100644 > > >>>> --- a/include/uapi/drm/savage_drm.h > > >>>> +++ b/include/uapi/drm/savage_drm.h > > >>>> @@ -1,26 +1,8 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* savage_drm.h -- Public header for the savage driver > > >>>> * > > >>>> * Copyright 2004 Felix Kuehling > > >>>> * 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 FELIX KUEHLING 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 __SAVAGE_DRM_H__ > > >>>> diff --git a/include/uapi/drm/sis_drm.h > > >>>> b/include/uapi/drm/sis_drm.h index 3e3f7e989e0b..9f7eb13b1975 > > >>>> 100644 > > >>>> --- a/include/uapi/drm/sis_drm.h > > >>>> +++ b/include/uapi/drm/sis_drm.h > > >>>> @@ -1,27 +1,8 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* sis_drv.h -- Private header for sis driver -*- linux-c -*- */ > > >>>> /* > > >>>> * Copyright 2005 Eric Anholt > > >>>> * 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, > > >>>> 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 > > >>>> (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 NONINFRINGEMENT. > IN NO > > >>>> EVENT SHALL > > >>>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __SIS_DRM_H__ > > >>>> diff --git a/include/uapi/drm/tegra_drm.h > > >>>> b/include/uapi/drm/tegra_drm.h index c4df3c3668b3..98c2f17aa7de > > >>>> 100644 > > >>>> --- a/include/uapi/drm/tegra_drm.h > > >>>> +++ b/include/uapi/drm/tegra_drm.h > > >>>> @@ -1,23 +1,6 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* > > >>>> * Copyright (c) 2012-2013, NVIDIA CORPORATION. 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, > > >>>> 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. > > >>>> */ > > >>>> #ifndef _UAPI_TEGRA_DRM_H_ > > >>>> diff --git a/include/uapi/drm/v3d_drm.h > > >>>> b/include/uapi/drm/v3d_drm.h index 1ce746e228d9..7895fb9bc018 > > >>>> 100644 > > >>>> --- a/include/uapi/drm/v3d_drm.h > > >>>> +++ b/include/uapi/drm/v3d_drm.h > > >>>> @@ -1,24 +1,6 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* > > >>>> * Copyright © 2014-2018 Broadcom > > >>>> - * > > >>>> - * 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 > > >>>> (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 NONINFRINGEMENT. > IN NO > > >>>> EVENT SHALL > > >>>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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 _V3D_DRM_H_ > > >>>> diff --git a/include/uapi/drm/vc4_drm.h > > >>>> b/include/uapi/drm/vc4_drm.h index 2cac6277a1d7..14b9a2186eae > > >>>> 100644 > > >>>> --- a/include/uapi/drm/vc4_drm.h > > >>>> +++ b/include/uapi/drm/vc4_drm.h > > >>>> @@ -1,24 +1,6 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* > > >>>> * Copyright © 2014-2015 Broadcom > > >>>> - * > > >>>> - * 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 > > >>>> (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 NONINFRINGEMENT. > IN NO > > >>>> EVENT SHALL > > >>>> - * THE AUTHORS OR COPYRIGHT HOLDERS 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_VC4_DRM_H_ > > >>>> diff --git a/include/uapi/drm/vgem_drm.h > > >>>> b/include/uapi/drm/vgem_drm.h index > bf66f5db6da8..965e1ad00dcb > > >>>> 100644 > > >>>> --- a/include/uapi/drm/vgem_drm.h > > >>>> +++ b/include/uapi/drm/vgem_drm.h > > >>>> @@ -1,27 +1,7 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* > > >>>> * Copyright 2016 Intel Corporation > > >>>> * 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_VGEM_DRM_H_ > > >>>> diff --git a/include/uapi/drm/via_drm.h > > >>>> b/include/uapi/drm/via_drm.h index a1e125d42208..d77a21e7eb70 > > >>>> 100644 > > >>>> --- a/include/uapi/drm/via_drm.h > > >>>> +++ b/include/uapi/drm/via_drm.h > > >>>> @@ -1,25 +1,7 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* > > >>>> * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. > > >>>> * Copyright 2001-2003 S3 Graphics, Inc. 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 > > >>>> - * VIA, S3 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 _VIA_DRM_H_ > > >>>> #define _VIA_DRM_H_ > > >>>> diff --git a/include/uapi/drm/virtgpu_drm.h > > >>>> b/include/uapi/drm/virtgpu_drm.h index > f06a789f34cd..cea0352bc319 > > >>>> 100644 > > >>>> --- a/include/uapi/drm/virtgpu_drm.h > > >>>> +++ b/include/uapi/drm/virtgpu_drm.h > > >>>> @@ -1,25 +1,7 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> /* > > >>>> * Copyright 2013 Red Hat > > >>>> * 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, > > >>>> 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 > > >>>> (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 NONINFRINGEMENT. > IN NO > > >>>> EVENT SHALL > > >>>> - * THE AUTHORS 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 VIRTGPU_DRM_H > > >>>> #define VIRTGPU_DRM_H > > >>>> diff --git a/include/uapi/drm/vmwgfx_drm.h > > >>>> b/include/uapi/drm/vmwgfx_drm.h index > 02e917507479..728e432f09a1 > > >>>> 100644 > > >>>> --- a/include/uapi/drm/vmwgfx_drm.h > > >>>> +++ b/include/uapi/drm/vmwgfx_drm.h > > >>>> @@ -1,28 +1,9 @@ > > >>>> +/* SPDX-License-Identifier: MIT */ > > >>>> > /********************************************************** > **************** > > >>>> * > > >>>> * Copyright © 2009-2015 VMware, Inc., Palo Alto, CA., USA > > >>>> * 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 > > >>>> - * THE COPYRIGHT HOLDERS, AUTHORS 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 __VMWGFX_DRM_H__ > > -- > Regards, > > Laurent Pinchart
On Wed, Dec 16, 2020 at 02:52:25PM +0000, Deucher, Alexander wrote: > [AMD Public Use] > > > -----Original Message----- > > From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Sent: Tuesday, December 15, 2020 9:15 PM > > To: Koenig, Christian <Christian.Koenig@amd.com> > > Cc: Daniel Vetter <daniel@ffwll.ch>; Laurent Pinchart > > <laurent.pinchart+renesas@ideasonboard.com>; dri- > > devel@lists.freedesktop.org; Dave Airlie <airlied@gmail.com>; Greg Kroah- > > Hartman <gregkh@linuxfoundation.org>; Thomas Gleixner > > <tglx@linutronix.de>; Deucher, Alexander <Alexander.Deucher@amd.com>; > > Rob Clark <robdclark@gmail.com>; Sean Paul <sean@poorly.run>; Ben > > Skeggs <bskeggs@redhat.com>; Gerd Hoffmann <kraxel@redhat.com>; > > Thierry Reding <thierry.reding@gmail.com>; Eric Anholt <eric@anholt.net>; > > VMware Graphics <linux-graphics-maintainer@vmware.com>; Thomas > > Hellstrom <thellstrom@vmware.com> > > 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
On Wed, Dec 16, 2020 at 10:30 AM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > On Wed, Dec 16, 2020 at 02:52:25PM +0000, Deucher, Alexander wrote: > > [AMD Public Use] > > > > > -----Original Message----- > > > From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > Sent: Tuesday, December 15, 2020 9:15 PM > > > To: Koenig, Christian <Christian.Koenig@amd.com> > > > Cc: Daniel Vetter <daniel@ffwll.ch>; Laurent Pinchart > > > <laurent.pinchart+renesas@ideasonboard.com>; dri- > > > devel@lists.freedesktop.org; Dave Airlie <airlied@gmail.com>; Greg Kroah- > > > Hartman <gregkh@linuxfoundation.org>; Thomas Gleixner > > > <tglx@linutronix.de>; Deucher, Alexander <Alexander.Deucher@amd.com>; > > > Rob Clark <robdclark@gmail.com>; Sean Paul <sean@poorly.run>; Ben > > > Skeggs <bskeggs@redhat.com>; Gerd Hoffmann <kraxel@redhat.com>; > > > Thierry Reding <thierry.reding@gmail.com>; Eric Anholt <eric@anholt.net>; > > > VMware Graphics <linux-graphics-maintainer@vmware.com>; Thomas > > > Hellstrom <thellstrom@vmware.com> > > > 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
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 > <gregkh@linuxfoundation.org> wrote: > > > > On Wed, Dec 16, 2020 at 02:52:25PM +0000, Deucher, Alexander wrote: > > > [AMD Public Use] > > > > > > > -----Original Message----- > > > > From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > > Sent: Tuesday, December 15, 2020 9:15 PM > > > > To: Koenig, Christian <Christian.Koenig@amd.com> > > > > Cc: Daniel Vetter <daniel@ffwll.ch>; Laurent Pinchart > > > > <laurent.pinchart+renesas@ideasonboard.com>; dri- > > > > devel@lists.freedesktop.org; Dave Airlie <airlied@gmail.com>; Greg Kroah- > > > > Hartman <gregkh@linuxfoundation.org>; Thomas Gleixner > > > > <tglx@linutronix.de>; Deucher, Alexander <Alexander.Deucher@amd.com>; > > > > Rob Clark <robdclark@gmail.com>; Sean Paul <sean@poorly.run>; Ben > > > > Skeggs <bskeggs@redhat.com>; Gerd Hoffmann <kraxel@redhat.com>; > > > > Thierry Reding <thierry.reding@gmail.com>; Eric Anholt <eric@anholt.net>; > > > > VMware Graphics <linux-graphics-maintainer@vmware.com>; Thomas > > > > Hellstrom <thellstrom@vmware.com> > > > > 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
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 +0000, Deucher, Alexander wrote: > > > [AMD Public Use] > > > > > > > -----Original Message----- > > > > From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > > Sent: Tuesday, December 15, 2020 9:15 PM > > > > To: Koenig, Christian <Christian.Koenig@amd.com> > > > > Cc: Daniel Vetter <daniel@ffwll.ch>; Laurent Pinchart > > > > <laurent.pinchart+renesas@ideasonboard.com>; dri- > > > > devel@lists.freedesktop.org; Dave Airlie <airlied@gmail.com>; Greg Kroah- > > > > Hartman <gregkh@linuxfoundation.org>; Thomas Gleixner > > > > <tglx@linutronix.de>; Deucher, Alexander <Alexander.Deucher@amd.com>; > > > > Rob Clark <robdclark@gmail.com>; Sean Paul <sean@poorly.run>; Ben > > > > Skeggs <bskeggs@redhat.com>; Gerd Hoffmann <kraxel@redhat.com>; > > > > Thierry Reding <thierry.reding@gmail.com>; Eric Anholt <eric@anholt.net>; > > > > VMware Graphics <linux-graphics-maintainer@vmware.com>; Thomas > > > > Hellstrom <thellstrom@vmware.com> > > > > 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 ?
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 <martin@valinux.com> * Gareth Hughes <gareth@valinux.com> 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 jhartmann@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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL - * VA LINUX SYSTEMS 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. - * * Authors: * Jeff Hartmann <jhartmann@valinux.com> * Keith Whitwell <keith@tungstengraphics.com> diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 0b85ed6a3710..189d1a7f7a7b 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -1,25 +1,7 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2013 Red Hat * Author: Rob Clark <robdclark@gmail.com> - * - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __MSM_DRM_H__ diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h index 853a327433d3..555283b49080 100644 --- a/include/uapi/drm/nouveau_drm.h +++ b/include/uapi/drm/nouveau_drm.h @@ -1,25 +1,7 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright 2005 Stephane Marchesin. * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL - * VA LINUX SYSTEMS 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 __NOUVEAU_DRM_H__ diff --git a/include/uapi/drm/qxl_drm.h b/include/uapi/drm/qxl_drm.h index 880999d2d863..9fbf97ad7272 100644 --- a/include/uapi/drm/qxl_drm.h +++ b/include/uapi/drm/qxl_drm.h @@ -1,25 +1,7 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright 2013 Red Hat * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS 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 QXL_DRM_H #define QXL_DRM_H diff --git a/include/uapi/drm/r128_drm.h b/include/uapi/drm/r128_drm.h index 690e9c62f510..c426e6a1c843 100644 --- a/include/uapi/drm/r128_drm.h +++ b/include/uapi/drm/r128_drm.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*- * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com */ @@ -6,25 +7,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 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL - * PRECISION INSIGHT 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. - * * Authors: * Gareth Hughes <gareth@valinux.com> * Kevin E. Martin <martin@valinux.com> diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h index 490a59cc4532..b5c4ef813a9e 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*- * * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. @@ -5,25 +6,6 @@ * Copyright 2002 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL - * PRECISION INSIGHT 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. - * * Authors: * Kevin E. Martin <martin@valinux.com> * Gareth Hughes <gareth@valinux.com> diff --git a/include/uapi/drm/savage_drm.h b/include/uapi/drm/savage_drm.h index 0f6eddef74aa..bd5e74348db4 100644 --- a/include/uapi/drm/savage_drm.h +++ b/include/uapi/drm/savage_drm.h @@ -1,26 +1,8 @@ +/* SPDX-License-Identifier: MIT */ /* savage_drm.h -- Public header for the savage driver * * Copyright 2004 Felix Kuehling * 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 FELIX KUEHLING 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 __SAVAGE_DRM_H__ diff --git a/include/uapi/drm/sis_drm.h b/include/uapi/drm/sis_drm.h index 3e3f7e989e0b..9f7eb13b1975 100644 --- a/include/uapi/drm/sis_drm.h +++ b/include/uapi/drm/sis_drm.h @@ -1,27 +1,8 @@ +/* SPDX-License-Identifier: MIT */ /* sis_drv.h -- Private header for sis driver -*- linux-c -*- */ /* * Copyright 2005 Eric Anholt * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS 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 __SIS_DRM_H__ diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h index c4df3c3668b3..98c2f17aa7de 100644 --- a/include/uapi/drm/tegra_drm.h +++ b/include/uapi/drm/tegra_drm.h @@ -1,23 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (c) 2012-2013, NVIDIA CORPORATION. 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, 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. */ #ifndef _UAPI_TEGRA_DRM_H_ diff --git a/include/uapi/drm/v3d_drm.h b/include/uapi/drm/v3d_drm.h index 1ce746e228d9..7895fb9bc018 100644 --- a/include/uapi/drm/v3d_drm.h +++ b/include/uapi/drm/v3d_drm.h @@ -1,24 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright © 2014-2018 Broadcom - * - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS 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 _V3D_DRM_H_ diff --git a/include/uapi/drm/vc4_drm.h b/include/uapi/drm/vc4_drm.h index 2cac6277a1d7..14b9a2186eae 100644 --- a/include/uapi/drm/vc4_drm.h +++ b/include/uapi/drm/vc4_drm.h @@ -1,24 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright © 2014-2015 Broadcom - * - * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS 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_VC4_DRM_H_ diff --git a/include/uapi/drm/vgem_drm.h b/include/uapi/drm/vgem_drm.h index bf66f5db6da8..965e1ad00dcb 100644 --- a/include/uapi/drm/vgem_drm.h +++ b/include/uapi/drm/vgem_drm.h @@ -1,27 +1,7 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright 2016 Intel Corporation * 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_VGEM_DRM_H_ diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h index a1e125d42208..d77a21e7eb70 100644 --- a/include/uapi/drm/via_drm.h +++ b/include/uapi/drm/via_drm.h @@ -1,25 +1,7 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. * Copyright 2001-2003 S3 Graphics, Inc. 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 - * VIA, S3 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 _VIA_DRM_H_ #define _VIA_DRM_H_ diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h index f06a789f34cd..cea0352bc319 100644 --- a/include/uapi/drm/virtgpu_drm.h +++ b/include/uapi/drm/virtgpu_drm.h @@ -1,25 +1,7 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright 2013 Red Hat * 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, 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS 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 VIRTGPU_DRM_H #define VIRTGPU_DRM_H diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h index 02e917507479..728e432f09a1 100644 --- a/include/uapi/drm/vmwgfx_drm.h +++ b/include/uapi/drm/vmwgfx_drm.h @@ -1,28 +1,9 @@ +/* SPDX-License-Identifier: MIT */ /************************************************************************** * * Copyright © 2009-2015 VMware, Inc., Palo Alto, CA., USA * 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 - * THE COPYRIGHT HOLDERS, AUTHORS 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 __VMWGFX_DRM_H__
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 <laurent.pinchart+renesas@ideasonboard.com> --- 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(-)