Re: [PATCH v2 01/10] drm: uapi: Use SPDX in DRM core uAPI headers
On Wed, Dec 16, 2020 at 04:12:14PM +0100, Daniel Vetter wrote: > On Wed, Dec 16, 2020 at 05:03:25PM +0200, Laurent Pinchart wrote: > > On Wed, Dec 16, 2020 at 03:34:35PM +0100, Daniel Vetter wrote: > > > On Wed, Dec 16, 2020 at 04:43:50AM +0200, Laurent Pinchart wrote: > > > > The DRM core uAPI headers are licensed under the MIT license, and carry > > > > copies of the license with slight variations. Replace them with SPDX > > > > headers. > > > > > > > > Following a discussion with Daniel Vetter on this topic, add a > > > > clarification in the drm-uapi.rst file that independent closed-source > > > > userspace implementations of software using the DRM uAPI are accepted, > > > > as allowed by the MIT license. > > > > > > > > Signed-off-by: Laurent Pinchart > > > > > > > > Reviewed-by: Greg Kroah-Hartman > > > > Reviewed-by: Thomas Gleixner > > > > Reviewed-by: Daniel Vetter > > > > > > Maybe get and ack from Alex and Dave on this too, just to make sure > > > everyone's happy. > > > > CC'ing Dave. Which Alex are you talking about ? > > The amd one, they're one of the big ones having closed userspace running > on top of the upstream drm/amdgpu driver. cc'ed. AMD legal seems to have nack'ed the previous version. I'll drop the AMD driver change (02/20) from v2, but I want to keep 01/10. > > > > --- > > > > Documentation/gpu/drm-uapi.rst | 4 > > > > include/uapi/drm/drm.h | 20 +--- > > > > include/uapi/drm/drm_fourcc.h | 20 +--- > > > > include/uapi/drm/drm_mode.h| 19 +-- > > > > include/uapi/drm/drm_sarea.h | 20 +--- > > > > 5 files changed, 8 insertions(+), 75 deletions(-) > > > > > > > > diff --git a/Documentation/gpu/drm-uapi.rst > > > > b/Documentation/gpu/drm-uapi.rst > > > > index 7dce175f6d75..96ea55200f04 100644 > > > > --- a/Documentation/gpu/drm-uapi.rst > > > > +++ b/Documentation/gpu/drm-uapi.rst > > > > @@ -109,6 +109,10 @@ is already rather painful for the DRM subsystem, > > > > with multiple different uAPIs > > > > for the same thing co-existing. If we add a few more complete mistakes > > > > into the > > > > mix every year it would be entirely unmanageable. > > > > > > > > +The DRM subsystem has however no concern with independent closed-source > > > > +userspace implementations. To officialize that position, the DRM uAPI > > > > headers > > > > +are covered by the MIT license. > > > > + > > > > .. _drm_render_node: > > > > > > > > Render nodes > > > > diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h > > > > index 808b48a93330..14d57361e580 100644 > > > > --- a/include/uapi/drm/drm.h > > > > +++ b/include/uapi/drm/drm.h > > > > @@ -1,3 +1,4 @@ > > > > +/* SPDX-License-Identifier: MIT */ > > > > /** > > > > * \file drm.h > > > > * Header for the Direct Rendering Manager > > > > @@ -12,25 +13,6 @@ > > > > * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. > > > > * 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. > > > > */ > > > > > > > > #ifndef _DRM_H_ > > > > diff --git a/include/uapi/drm/drm_fourcc.h > > > > b/include/uapi/drm/drm_fourcc.h > > > > index 723c8e23ca87..51e2c8a825a3 100644 > > > > --- a/include/uapi/drm/drm_fourcc.h > > > > +++ b/include/uapi/drm/drm_fourcc.h > > > > @@ -1,24 +1,6 @@ > > > > +/* SPDX-License-Identifier: MIT */ > > > > /* > > > > * Copyright 2011 Intel Corporation > > > > - * > > > > - * Permission is hereby granted, free of charge, to any person > > > > obtaining a > > > > - * copy of
Re: [PATCH v2 01/10] drm: uapi: Use SPDX in DRM core uAPI headers
On Wed, Dec 16, 2020 at 05:03:25PM +0200, Laurent Pinchart wrote: > Hi Daniel, > > On Wed, Dec 16, 2020 at 03:34:35PM +0100, Daniel Vetter wrote: > > On Wed, Dec 16, 2020 at 04:43:50AM +0200, Laurent Pinchart wrote: > > > The DRM core uAPI headers are licensed under the MIT license, and carry > > > copies of the license with slight variations. Replace them with SPDX > > > headers. > > > > > > Following a discussion with Daniel Vetter on this topic, add a > > > clarification in the drm-uapi.rst file that independent closed-source > > > userspace implementations of software using the DRM uAPI are accepted, > > > as allowed by the MIT license. > > > > > > Signed-off-by: Laurent Pinchart > > > > > > Reviewed-by: Greg Kroah-Hartman > > > Reviewed-by: Thomas Gleixner > > > Reviewed-by: Daniel Vetter > > > > Maybe get and ack from Alex and Dave on this too, just to make sure > > everyone's happy. > > CC'ing Dave. Which Alex are you talking about ? The amd one, they're one of the big ones having closed userspace running on top of the upstream drm/amdgpu driver. cc'ed. -Daniel > > > > --- > > > Documentation/gpu/drm-uapi.rst | 4 > > > include/uapi/drm/drm.h | 20 +--- > > > include/uapi/drm/drm_fourcc.h | 20 +--- > > > include/uapi/drm/drm_mode.h| 19 +-- > > > include/uapi/drm/drm_sarea.h | 20 +--- > > > 5 files changed, 8 insertions(+), 75 deletions(-) > > > > > > diff --git a/Documentation/gpu/drm-uapi.rst > > > b/Documentation/gpu/drm-uapi.rst > > > index 7dce175f6d75..96ea55200f04 100644 > > > --- a/Documentation/gpu/drm-uapi.rst > > > +++ b/Documentation/gpu/drm-uapi.rst > > > @@ -109,6 +109,10 @@ is already rather painful for the DRM subsystem, > > > with multiple different uAPIs > > > for the same thing co-existing. If we add a few more complete mistakes > > > into the > > > mix every year it would be entirely unmanageable. > > > > > > +The DRM subsystem has however no concern with independent closed-source > > > +userspace implementations. To officialize that position, the DRM uAPI > > > headers > > > +are covered by the MIT license. > > > + > > > .. _drm_render_node: > > > > > > Render nodes > > > diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h > > > index 808b48a93330..14d57361e580 100644 > > > --- a/include/uapi/drm/drm.h > > > +++ b/include/uapi/drm/drm.h > > > @@ -1,3 +1,4 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /** > > > * \file drm.h > > > * Header for the Direct Rendering Manager > > > @@ -12,25 +13,6 @@ > > > * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. > > > * 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. > > > */ > > > > > > #ifndef _DRM_H_ > > > diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h > > > index 723c8e23ca87..51e2c8a825a3 100644 > > > --- a/include/uapi/drm/drm_fourcc.h > > > +++ b/include/uapi/drm/drm_fourcc.h > > > @@ -1,24 +1,6 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > /* > > > * Copyright 2011 Intel Corporation > > > - * > > > - * 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: > > >
Re: [PATCH v2 01/10] drm: uapi: Use SPDX in DRM core uAPI headers
Hi Daniel, On Wed, Dec 16, 2020 at 03:34:35PM +0100, Daniel Vetter wrote: > On Wed, Dec 16, 2020 at 04:43:50AM +0200, Laurent Pinchart wrote: > > The DRM core uAPI headers are licensed under the MIT license, and carry > > copies of the license with slight variations. Replace them with SPDX > > headers. > > > > Following a discussion with Daniel Vetter on this topic, add a > > clarification in the drm-uapi.rst file that independent closed-source > > userspace implementations of software using the DRM uAPI are accepted, > > as allowed by the MIT license. > > > > Signed-off-by: Laurent Pinchart > > Reviewed-by: Greg Kroah-Hartman > > Reviewed-by: Thomas Gleixner > > Reviewed-by: Daniel Vetter > > Maybe get and ack from Alex and Dave on this too, just to make sure > everyone's happy. CC'ing Dave. Which Alex are you talking about ? > > --- > > Documentation/gpu/drm-uapi.rst | 4 > > include/uapi/drm/drm.h | 20 +--- > > include/uapi/drm/drm_fourcc.h | 20 +--- > > include/uapi/drm/drm_mode.h| 19 +-- > > include/uapi/drm/drm_sarea.h | 20 +--- > > 5 files changed, 8 insertions(+), 75 deletions(-) > > > > diff --git a/Documentation/gpu/drm-uapi.rst b/Documentation/gpu/drm-uapi.rst > > index 7dce175f6d75..96ea55200f04 100644 > > --- a/Documentation/gpu/drm-uapi.rst > > +++ b/Documentation/gpu/drm-uapi.rst > > @@ -109,6 +109,10 @@ is already rather painful for the DRM subsystem, with > > multiple different uAPIs > > for the same thing co-existing. If we add a few more complete mistakes > > into the > > mix every year it would be entirely unmanageable. > > > > +The DRM subsystem has however no concern with independent closed-source > > +userspace implementations. To officialize that position, the DRM uAPI > > headers > > +are covered by the MIT license. > > + > > .. _drm_render_node: > > > > Render nodes > > diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h > > index 808b48a93330..14d57361e580 100644 > > --- a/include/uapi/drm/drm.h > > +++ b/include/uapi/drm/drm.h > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: MIT */ > > /** > > * \file drm.h > > * Header for the Direct Rendering Manager > > @@ -12,25 +13,6 @@ > > * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. > > * 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. > > */ > > > > #ifndef _DRM_H_ > > diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h > > index 723c8e23ca87..51e2c8a825a3 100644 > > --- a/include/uapi/drm/drm_fourcc.h > > +++ b/include/uapi/drm/drm_fourcc.h > > @@ -1,24 +1,6 @@ > > +/* SPDX-License-Identifier: MIT */ > > /* > > * Copyright 2011 Intel Corporation > > - * > > - * 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
Re: [PATCH v2 01/10] drm: uapi: Use SPDX in DRM core uAPI headers
On Wed, Dec 16, 2020 at 04:43:50AM +0200, Laurent Pinchart wrote: > The DRM core uAPI headers are licensed under the MIT license, and carry > copies of the license with slight variations. Replace them with SPDX > headers. > > Following a discussion with Daniel Vetter on this topic, add a > clarification in the drm-uapi.rst file that independent closed-source > userspace implementations of software using the DRM uAPI are accepted, > as allowed by the MIT license. > > Signed-off-by: Laurent Pinchart > Reviewed-by: Greg Kroah-Hartman > Reviewed-by: Thomas Gleixner > Reviewed-by: Daniel Vetter Maybe get and ack from Alex and Dave on this too, just to make sure everyone's happy. -Daniel > --- > Documentation/gpu/drm-uapi.rst | 4 > include/uapi/drm/drm.h | 20 +--- > include/uapi/drm/drm_fourcc.h | 20 +--- > include/uapi/drm/drm_mode.h| 19 +-- > include/uapi/drm/drm_sarea.h | 20 +--- > 5 files changed, 8 insertions(+), 75 deletions(-) > > diff --git a/Documentation/gpu/drm-uapi.rst b/Documentation/gpu/drm-uapi.rst > index 7dce175f6d75..96ea55200f04 100644 > --- a/Documentation/gpu/drm-uapi.rst > +++ b/Documentation/gpu/drm-uapi.rst > @@ -109,6 +109,10 @@ is already rather painful for the DRM subsystem, with > multiple different uAPIs > for the same thing co-existing. If we add a few more complete mistakes into > the > mix every year it would be entirely unmanageable. > > +The DRM subsystem has however no concern with independent closed-source > +userspace implementations. To officialize that position, the DRM uAPI headers > +are covered by the MIT license. > + > .. _drm_render_node: > > Render nodes > diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h > index 808b48a93330..14d57361e580 100644 > --- a/include/uapi/drm/drm.h > +++ b/include/uapi/drm/drm.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: MIT */ > /** > * \file drm.h > * Header for the Direct Rendering Manager > @@ -12,25 +13,6 @@ > * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. > * 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. > */ > > #ifndef _DRM_H_ > diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h > index 723c8e23ca87..51e2c8a825a3 100644 > --- a/include/uapi/drm/drm_fourcc.h > +++ b/include/uapi/drm/drm_fourcc.h > @@ -1,24 +1,6 @@ > +/* SPDX-License-Identifier: MIT */ > /* > * Copyright 2011 Intel Corporation > - * > - * 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 DRM_FOURCC_H > diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h > index
[PATCH v2 01/10] drm: uapi: Use SPDX in DRM core uAPI headers
The DRM core uAPI headers are licensed under the MIT license, and carry copies of the license with slight variations. Replace them with SPDX headers. Following a discussion with Daniel Vetter on this topic, add a clarification in the drm-uapi.rst file that independent closed-source userspace implementations of software using the DRM uAPI are accepted, as allowed by the MIT license. Signed-off-by: Laurent Pinchart Reviewed-by: Greg Kroah-Hartman Reviewed-by: Thomas Gleixner Reviewed-by: Daniel Vetter --- Documentation/gpu/drm-uapi.rst | 4 include/uapi/drm/drm.h | 20 +--- include/uapi/drm/drm_fourcc.h | 20 +--- include/uapi/drm/drm_mode.h| 19 +-- include/uapi/drm/drm_sarea.h | 20 +--- 5 files changed, 8 insertions(+), 75 deletions(-) diff --git a/Documentation/gpu/drm-uapi.rst b/Documentation/gpu/drm-uapi.rst index 7dce175f6d75..96ea55200f04 100644 --- a/Documentation/gpu/drm-uapi.rst +++ b/Documentation/gpu/drm-uapi.rst @@ -109,6 +109,10 @@ is already rather painful for the DRM subsystem, with multiple different uAPIs for the same thing co-existing. If we add a few more complete mistakes into the mix every year it would be entirely unmanageable. +The DRM subsystem has however no concern with independent closed-source +userspace implementations. To officialize that position, the DRM uAPI headers +are covered by the MIT license. + .. _drm_render_node: Render nodes diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 808b48a93330..14d57361e580 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /** * \file drm.h * Header for the Direct Rendering Manager @@ -12,25 +13,6 @@ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * 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. */ #ifndef _DRM_H_ diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index 723c8e23ca87..51e2c8a825a3 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -1,24 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright 2011 Intel Corporation - * - * 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 DRM_FOURCC_H diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index b49fbf2bdc40..21dfec63b338 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -1,27 +1,10 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (c) 2007 Dave Airlie * Copyright (c) 2007 Jakob Bornecrantz * Copyright (c) 2008 Red Hat Inc. * Copyright (c) 2007-2008 Tungsten Graphics, Inc., Cedar Park, TX., USA * Copyright (c) 2007-2008