Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/vmwgfx: Update device headers for GL43

Update the headers for GL43 userspace works that landed in Mesa3D. Also
update the license headers to conform to the kernel guidelines.

For GL43 the virtual device got D3D11.1 support with some GL extensions.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Martin Krastev <krastevm@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211206172620.3139754-7-zack@kde.org

+41 -34
+3 -3
drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h
··· 1 - /********************************************************** 1 + /* SPDX-License-Identifier: GPL-2.0 OR MIT */ 2 + /* 2 3 * Copyright 2012-2021 VMware, Inc. 3 - * SPDX-License-Identifier: GPL-2.0 OR MIT 4 4 * 5 5 * Permission is hereby granted, free of charge, to any person 6 6 * obtaining a copy of this software and associated documentation ··· 22 22 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 23 23 * SOFTWARE. 24 24 * 25 - **********************************************************/ 25 + */ 26 26 27 27 /* 28 28 * svga3d_cmd.h --
+7 -3
drivers/gpu/drm/vmwgfx/device_include/svga3d_devcaps.h
··· 1 - /********************************************************** 1 + /* SPDX-License-Identifier: GPL-2.0 OR MIT */ 2 + /* 2 3 * Copyright 1998-2021 VMware, Inc. 3 - * SPDX-License-Identifier: GPL-2.0 OR MIT 4 4 * 5 5 * Permission is hereby granted, free of charge, to any person 6 6 * obtaining a copy of this software and associated documentation ··· 22 22 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 23 23 * SOFTWARE. 24 24 * 25 - **********************************************************/ 25 + */ 26 26 27 27 /* 28 28 * svga3d_devcaps.h -- ··· 346 346 347 347 #define SVGA3D_DEVCAP_SM5 258 348 348 #define SVGA3D_DEVCAP_MULTISAMPLE_8X 259 349 + 350 + #define SVGA3D_DEVCAP_MAX_FORCED_SAMPLE_COUNT 260 351 + 352 + #define SVGA3D_DEVCAP_GL43 261 349 353 350 354 #define SVGA3D_DEVCAP_MAX 262 351 355
+6 -6
drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h
··· 1 - /********************************************************** 1 + /* SPDX-License-Identifier: GPL-2.0 OR MIT */ 2 + /* 2 3 * Copyright 2012-2021 VMware, Inc. 3 - * SPDX-License-Identifier: GPL-2.0 OR MIT 4 4 * 5 5 * Permission is hereby granted, free of charge, to any person 6 6 * obtaining a copy of this software and associated documentation ··· 22 22 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 23 23 * SOFTWARE. 24 24 * 25 - **********************************************************/ 25 + */ 26 26 27 27 /* 28 28 * svga3d_dx.h -- ··· 508 508 #pragma pack(pop) 509 509 510 510 #pragma pack(push, 1) 511 - typedef struct MKS3dDXSOState { 511 + typedef struct SVGA3dDXSOState { 512 512 uint32 offset; 513 513 uint32 intOffset; 514 - uint32 vertexCount; 515 - uint32 dead; 514 + uint32 dead1; 515 + uint32 dead2; 516 516 } SVGA3dDXSOState; 517 517 #pragma pack(pop) 518 518
+5 -3
drivers/gpu/drm/vmwgfx/device_include/svga3d_limits.h
··· 1 - /********************************************************** 1 + /* SPDX-License-Identifier: GPL-2.0 OR MIT */ 2 + /* 2 3 * Copyright 2012-2021 VMware, Inc. 3 - * SPDX-License-Identifier: GPL-2.0 OR MIT 4 4 * 5 5 * Permission is hereby granted, free of charge, to any person 6 6 * obtaining a copy of this software and associated documentation ··· 22 22 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 23 23 * SOFTWARE. 24 24 * 25 - **********************************************************/ 25 + */ 26 26 27 27 /* 28 28 * svga3d_limits.h -- ··· 82 82 #define SVGA3D_MIN_SBX_DATA_SIZE (GBYTES_2_BYTES(1)) 83 83 #define SVGA3D_MAX_SBX_DATA_SIZE (GBYTES_2_BYTES(4)) 84 84 85 + #define SVGA3D_MIN_SBX_DATA_SIZE_DVM (MBYTES_2_BYTES(900)) 86 + #define SVGA3D_MAX_SBX_DATA_SIZE_DVM (MBYTES_2_BYTES(910)) 85 87 #endif
+3 -3
drivers/gpu/drm/vmwgfx/device_include/svga3d_reg.h
··· 1 - /********************************************************** 1 + /* SPDX-License-Identifier: GPL-2.0 OR MIT */ 2 + /* 2 3 * Copyright 1998-2015 VMware, Inc. 3 - * SPDX-License-Identifier: GPL-2.0 OR MIT 4 4 * 5 5 * Permission is hereby granted, free of charge, to any person 6 6 * obtaining a copy of this software and associated documentation ··· 22 22 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 23 23 * SOFTWARE. 24 24 * 25 - **********************************************************/ 25 + */ 26 26 27 27 /* 28 28 * svga3d_reg.h --
+3 -4
drivers/gpu/drm/vmwgfx/device_include/svga3d_types.h
··· 1 - /********************************************************** 1 + /* SPDX-License-Identifier: GPL-2.0 OR MIT */ 2 + /* 2 3 * Copyright 2012-2021 VMware, Inc. 3 - * SPDX-License-Identifier: GPL-2.0 OR MIT 4 4 * 5 5 * Permission is hereby granted, free of charge, to any person 6 6 * obtaining a copy of this software and associated documentation ··· 22 22 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 23 23 * SOFTWARE. 24 24 * 25 - **********************************************************/ 25 + */ 26 26 27 27 /* 28 28 * svga3d_types.h -- ··· 370 370 #define SVGA3D_SURFACE_TRANSFER_FROM_BUFFER (CONST64U(1) << 30) 371 371 372 372 #define SVGA3D_SURFACE_RESERVED1 (CONST64U(1) << 31) 373 - #define SVGA3D_SURFACE_VADECODE SVGA3D_SURFACE_RESERVED1 374 373 375 374 #define SVGA3D_SURFACE_MULTISAMPLE (CONST64U(1) << 32) 376 375
+3 -3
drivers/gpu/drm/vmwgfx/device_include/svga_escape.h
··· 1 - /********************************************************** 1 + /* SPDX-License-Identifier: GPL-2.0 OR MIT */ 2 + /* 2 3 * Copyright 2007,2020 VMware, Inc. 3 - * SPDX-License-Identifier: GPL-2.0 OR MIT 4 4 * 5 5 * Permission is hereby granted, free of charge, to any person 6 6 * obtaining a copy of this software and associated documentation ··· 22 22 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 23 23 * SOFTWARE. 24 24 * 25 - **********************************************************/ 25 + */ 26 26 27 27 /* 28 28 * svga_escape.h --
+3 -3
drivers/gpu/drm/vmwgfx/device_include/svga_overlay.h
··· 1 - /********************************************************** 1 + /* SPDX-License-Identifier: GPL-2.0 OR MIT */ 2 + /* 2 3 * Copyright 2007-2021 VMware, Inc. 3 - * SPDX-License-Identifier: GPL-2.0 OR MIT 4 4 * 5 5 * Permission is hereby granted, free of charge, to any person 6 6 * obtaining a copy of this software and associated documentation ··· 22 22 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 23 23 * SOFTWARE. 24 24 * 25 - **********************************************************/ 25 + */ 26 26 27 27 /* 28 28 * svga_overlay.h --
+8 -6
drivers/gpu/drm/vmwgfx/device_include/svga_reg.h
··· 1 - /********************************************************** 1 + /* SPDX-License-Identifier: GPL-2.0 OR MIT */ 2 + /* 2 3 * Copyright 1998-2021 VMware, Inc. 3 - * SPDX-License-Identifier: GPL-2.0 OR MIT 4 4 * 5 5 * Permission is hereby granted, free of charge, to any person 6 6 * obtaining a copy of this software and associated documentation ··· 22 22 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 23 23 * SOFTWARE. 24 24 * 25 - **********************************************************/ 25 + */ 26 26 27 27 /* 28 28 * svga_reg.h -- ··· 442 442 #define SVGA_CAP2_TRACE_FULL_FB 0x00002000 443 443 #define SVGA_CAP2_EXTRA_REGS 0x00004000 444 444 #define SVGA_CAP2_LO_STAGING 0x00008000 445 + #define SVGA_CAP2_VIDEO_BLT 0x00010000 445 446 #define SVGA_CAP2_RESERVED 0x80000000 446 447 447 448 typedef enum { ··· 451 450 SVGABackdoorCap3dHWVersion = 2, 452 451 SVGABackdoorCapDeviceCaps2 = 3, 453 452 SVGABackdoorCapDevelCaps = 4, 454 - SVGABackdoorDevelRenderer = 5, 455 - SVGABackdoorDevelUsingISB = 6, 456 - SVGABackdoorCapMax = 7, 453 + SVGABackdoorCapDevCaps = 5, 454 + SVGABackdoorDevelRenderer = 6, 455 + SVGABackdoorDevelUsingISB = 7, 456 + SVGABackdoorCapMax = 8, 457 457 } SVGABackdoorCapType; 458 458 459 459 enum {