aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/vmwgfx
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2014-01-16 15:20:21 -0500
committerThomas Hellstrom <thellstrom@vmware.com>2014-01-17 01:52:41 -0500
commit96b43626a54317233f3e2c9750967e085b8d2850 (patch)
tree539356f5b955404b4f6af3f7d094a0dda93cae04 /drivers/gpu/drm/vmwgfx
parentf2a0dcb1aa23eea8f186b4773a653e61d509b17a (diff)
drm/vmwgfx: Silence the device command verifier
The device and kernel module disagrees about the command length of some commands. More pack attributes might be needed. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
-rw-r--r--drivers/gpu/drm/vmwgfx/svga3d_reg.h30
1 files changed, 23 insertions, 7 deletions
diff --git a/drivers/gpu/drm/vmwgfx/svga3d_reg.h b/drivers/gpu/drm/vmwgfx/svga3d_reg.h
index b1e5d2c48339..d95335cb90bd 100644
--- a/drivers/gpu/drm/vmwgfx/svga3d_reg.h
+++ b/drivers/gpu/drm/vmwgfx/svga3d_reg.h
@@ -1973,7 +1973,9 @@ struct {
1973 uint32 sizeInBytes; 1973 uint32 sizeInBytes;
1974 uint32 validSizeInBytes; 1974 uint32 validSizeInBytes;
1975 SVGAMobFormat ptDepth; 1975 SVGAMobFormat ptDepth;
1976} SVGA3dCmdSetOTableBase; /* SVGA_3D_CMD_SET_OTABLE_BASE */ 1976}
1977__attribute__((__packed__))
1978SVGA3dCmdSetOTableBase; /* SVGA_3D_CMD_SET_OTABLE_BASE */
1977 1979
1978typedef 1980typedef
1979struct { 1981struct {
@@ -1982,12 +1984,16 @@ struct {
1982 uint32 sizeInBytes; 1984 uint32 sizeInBytes;
1983 uint32 validSizeInBytes; 1985 uint32 validSizeInBytes;
1984 SVGAMobFormat ptDepth; 1986 SVGAMobFormat ptDepth;
1985} SVGA3dCmdSetOTableBase64; /* SVGA_3D_CMD_SET_OTABLE_BASE64 */ 1987}
1988__attribute__((__packed__))
1989SVGA3dCmdSetOTableBase64; /* SVGA_3D_CMD_SET_OTABLE_BASE64 */
1986 1990
1987typedef 1991typedef
1988struct { 1992struct {
1989 SVGAOTableType type; 1993 SVGAOTableType type;
1990} SVGA3dCmdReadbackOTable; /* SVGA_3D_CMD_READBACK_OTABLE */ 1994}
1995__attribute__((__packed__))
1996SVGA3dCmdReadbackOTable; /* SVGA_3D_CMD_READBACK_OTABLE */
1991 1997
1992/* 1998/*
1993 * Define a memory object (Mob) in the OTable. 1999 * Define a memory object (Mob) in the OTable.
@@ -1999,7 +2005,9 @@ struct SVGA3dCmdDefineGBMob {
1999 SVGAMobFormat ptDepth; 2005 SVGAMobFormat ptDepth;
2000 PPN base; 2006 PPN base;
2001 uint32 sizeInBytes; 2007 uint32 sizeInBytes;
2002} SVGA3dCmdDefineGBMob; /* SVGA_3D_CMD_DEFINE_GB_MOB */ 2008}
2009__attribute__((__packed__))
2010SVGA3dCmdDefineGBMob; /* SVGA_3D_CMD_DEFINE_GB_MOB */
2003 2011
2004 2012
2005/* 2013/*
@@ -2009,7 +2017,9 @@ struct SVGA3dCmdDefineGBMob {
2009typedef 2017typedef
2010struct SVGA3dCmdDestroyGBMob { 2018struct SVGA3dCmdDestroyGBMob {
2011 SVGAMobId mobid; 2019 SVGAMobId mobid;
2012} SVGA3dCmdDestroyGBMob; /* SVGA_3D_CMD_DESTROY_GB_MOB */ 2020}
2021__attribute__((__packed__))
2022SVGA3dCmdDestroyGBMob; /* SVGA_3D_CMD_DESTROY_GB_MOB */
2013 2023
2014/* 2024/*
2015 * Redefine an object in the OTable. 2025 * Redefine an object in the OTable.
@@ -2021,7 +2031,9 @@ struct SVGA3dCmdRedefineGBMob {
2021 SVGAMobFormat ptDepth; 2031 SVGAMobFormat ptDepth;
2022 PPN base; 2032 PPN base;
2023 uint32 sizeInBytes; 2033 uint32 sizeInBytes;
2024} SVGA3dCmdRedefineGBMob; /* SVGA_3D_CMD_REDEFINE_GB_MOB */ 2034}
2035__attribute__((__packed__))
2036SVGA3dCmdRedefineGBMob; /* SVGA_3D_CMD_REDEFINE_GB_MOB */
2025 2037
2026/* 2038/*
2027 * Define a memory object (Mob) in the OTable with a PPN64 base. 2039 * Define a memory object (Mob) in the OTable with a PPN64 base.
@@ -2034,6 +2046,7 @@ struct SVGA3dCmdDefineGBMob64 {
2034 PPN64 base; 2046 PPN64 base;
2035 uint32 sizeInBytes; 2047 uint32 sizeInBytes;
2036} 2048}
2049__attribute__((__packed__))
2037SVGA3dCmdDefineGBMob64; /* SVGA_3D_CMD_DEFINE_GB_MOB64 */ 2050SVGA3dCmdDefineGBMob64; /* SVGA_3D_CMD_DEFINE_GB_MOB64 */
2038 2051
2039/* 2052/*
@@ -2047,6 +2060,7 @@ struct SVGA3dCmdRedefineGBMob64 {
2047 PPN64 base; 2060 PPN64 base;
2048 uint32 sizeInBytes; 2061 uint32 sizeInBytes;
2049} 2062}
2063__attribute__((__packed__))
2050SVGA3dCmdRedefineGBMob64; /* SVGA_3D_CMD_REDEFINE_GB_MOB64 */ 2064SVGA3dCmdRedefineGBMob64; /* SVGA_3D_CMD_REDEFINE_GB_MOB64 */
2051 2065
2052/* 2066/*
@@ -2056,7 +2070,9 @@ SVGA3dCmdRedefineGBMob64; /* SVGA_3D_CMD_REDEFINE_GB_MOB64 */
2056typedef 2070typedef
2057struct SVGA3dCmdUpdateGBMobMapping { 2071struct SVGA3dCmdUpdateGBMobMapping {
2058 SVGAMobId mobid; 2072 SVGAMobId mobid;
2059} SVGA3dCmdUpdateGBMobMapping; /* SVGA_3D_CMD_UPDATE_GB_MOB_MAPPING */ 2073}
2074__attribute__((__packed__))
2075SVGA3dCmdUpdateGBMobMapping; /* SVGA_3D_CMD_UPDATE_GB_MOB_MAPPING */
2060 2076
2061/* 2077/*
2062 * Define a guest-backed surface. 2078 * Define a guest-backed surface.