[PATCH 7/8] drm/vmwgfx: add SPDX idenitifier and clarify license

Fri May 4 06:18:09 UTC 2018

Hi, Dirk,

On 05/04/2018 12:15 AM, Dirk Hohndel (VMware) wrote:
> This is licensed under GPL-2.0.
>
> Signed-off-by: Dirk Hohndel (VMware) <dirk at hohndel.org>
> ---
>   drivers/gpu/drm/vmwgfx/Kconfig                |  1 +
>   .../vmwgfx/device_include/vmware_pack_begin.h | 25 +------------------
>   .../vmwgfx/device_include/vmware_pack_end.h   | 25 +------------------
>   drivers/gpu/drm/vmwgfx/vmwgfx_msg.h           | 14 ++---------
>   4 files changed, 5 insertions(+), 60 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/Kconfig b/drivers/gpu/drm/vmwgfx/Kconfig
> index 8c308dac99c5..6b28a326f8bb 100644
> --- a/drivers/gpu/drm/vmwgfx/Kconfig
> +++ b/drivers/gpu/drm/vmwgfx/Kconfig
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
>   config DRM_VMWGFX
>   	tristate "DRM driver for VMware Virtual GPU"
>   	depends on DRM && PCI && X86 && MMU
> diff --git a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h
> index 7e7b0ce34aa2..75308bd0d970 100644
> --- a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h
> +++ b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h
> @@ -1,25 +1,2 @@
> -/**********************************************************
> - * Copyright 2015 VMware, 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, 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 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.
> - *
> - **********************************************************/
> +/* SPDX-License-Identifier: GPL-2.0 */
>   #include <linux/compiler.h>
> diff --git a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h
> index e2e440ed3d44..e93d6f28b68c 100644
> --- a/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h
> +++ b/drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h
> @@ -1,25 +1,2 @@
> -/**********************************************************
> - * Copyright 2015 VMware, 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, 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 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.
> - *
> - **********************************************************/
> +/* SPDX-License-Identifier: GPL-2.0 */
>   __packed
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.h b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.h
> index 557a033fb610..f1589964be65 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.h
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.h
> @@ -1,16 +1,6 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
>   /*
> - * Copyright (C) 2016, VMware, Inc.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful, but
> - * WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
> - * NON INFRINGEMENT.  See the GNU General Public License for more
> - * details.
> + * Copyright 2016, VMware, Inc.
>    *
>    * Based on code from vmware.c and vmmouse.c.
>    * Author:

The intention of the whole vmwgfx module is to be dual GPL-2 OR MIT 
licensed whenever possible. It looks like the vmware_pack* files have a 
MIT-style license already?

The vmwgfx_msg.h file is GPL, but I think that's based on an earlier 
version of the file that has now been completely replaced by code that's 
copied from an already MIT-licenced file in the mesa project.

Since we hold the copyright to that file and AFAICT there are no other 
contributors, we should re-licence that file to GPL-2 / MIT.

/Thomas