Commit b05fa564 authored by Zack Rusin's avatar Zack Rusin
Browse files

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: default avatarZack Rusin <zackr@vmware.com>
Reviewed-by: default avatarMartin Krastev <krastevm@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211206172620.3139754-7-zack@kde.org
parent 24df43d9

drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h

+3 −3
Original line number Diff line number Diff line 
/**********************************************************

/* SPDX-License-Identifier: GPL-2.0 OR MIT */

/*

 * Copyright 2012-2021 VMware, Inc.

 * SPDX-License-Identifier: GPL-2.0 OR MIT

 *

 * Permission is hereby granted, free of charge, to any person

 * obtaining a copy of this software and associated documentation
@@ -22,7 +22,7 @@ 
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 *

 **********************************************************/

 */



/*

 * svga3d_cmd.h --

drivers/gpu/drm/vmwgfx/device_include/svga3d_devcaps.h

+7 −3
Original line number Diff line number Diff line 
/**********************************************************

/* SPDX-License-Identifier: GPL-2.0 OR MIT */

/*

 * Copyright 1998-2021 VMware, Inc.

 * SPDX-License-Identifier: GPL-2.0 OR MIT

 *

 * Permission is hereby granted, free of charge, to any person

 * obtaining a copy of this software and associated documentation
@@ -22,7 +22,7 @@ 
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 *

 **********************************************************/

 */



/*

 * svga3d_devcaps.h --
@@ -347,6 +347,10 @@ typedef uint32 SVGA3dDevCapIndex; 
#define SVGA3D_DEVCAP_SM5 258

#define SVGA3D_DEVCAP_MULTISAMPLE_8X 259



#define SVGA3D_DEVCAP_MAX_FORCED_SAMPLE_COUNT 260



#define SVGA3D_DEVCAP_GL43 261



#define SVGA3D_DEVCAP_MAX 262



#define SVGA3D_DXFMT_SUPPORTED (1 << 0)

drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h

+6 −6
Original line number Diff line number Diff line 
/**********************************************************

/* SPDX-License-Identifier: GPL-2.0 OR MIT */

/*

 * Copyright 2012-2021 VMware, Inc.

 * SPDX-License-Identifier: GPL-2.0 OR MIT

 *

 * Permission is hereby granted, free of charge, to any person

 * obtaining a copy of this software and associated documentation
@@ -22,7 +22,7 @@ 
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 *

 **********************************************************/

 */



/*

 * svga3d_dx.h --
@@ -508,11 +508,11 @@ typedef struct SVGA3dCmdDXSetPredication { 
#pragma pack(pop)



#pragma pack(push, 1)

typedef struct MKS3dDXSOState {

typedef struct SVGA3dDXSOState {

	uint32 offset;

	uint32 intOffset;

	uint32 vertexCount;

	uint32 dead;

	uint32 dead1;

	uint32 dead2;

} SVGA3dDXSOState;

#pragma pack(pop)

drivers/gpu/drm/vmwgfx/device_include/svga3d_limits.h

+5 −3
Original line number Diff line number Diff line 
/**********************************************************

/* SPDX-License-Identifier: GPL-2.0 OR MIT */

/*

 * Copyright 2012-2021 VMware, Inc.

 * SPDX-License-Identifier: GPL-2.0 OR MIT

 *

 * Permission is hereby granted, free of charge, to any person

 * obtaining a copy of this software and associated documentation
@@ -22,7 +22,7 @@ 
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 *

 **********************************************************/

 */



/*

 * svga3d_limits.h --
@@ -82,4 +82,6 @@ 
#define SVGA3D_MIN_SBX_DATA_SIZE (GBYTES_2_BYTES(1))

#define SVGA3D_MAX_SBX_DATA_SIZE (GBYTES_2_BYTES(4))



#define SVGA3D_MIN_SBX_DATA_SIZE_DVM (MBYTES_2_BYTES(900))

#define SVGA3D_MAX_SBX_DATA_SIZE_DVM (MBYTES_2_BYTES(910))

#endif

drivers/gpu/drm/vmwgfx/device_include/svga3d_reg.h

+3 −3
Original line number Diff line number Diff line 
/**********************************************************

/* SPDX-License-Identifier: GPL-2.0 OR MIT */

/*

 * Copyright 1998-2015 VMware, Inc.

 * SPDX-License-Identifier: GPL-2.0 OR MIT

 *

 * Permission is hereby granted, free of charge, to any person

 * obtaining a copy of this software and associated documentation
@@ -22,7 +22,7 @@ 
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 *

 **********************************************************/

 */



/*

 * svga3d_reg.h --