summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2013-10-08 02:25:35 -0700
committerThomas Hellstrom <thellstrom@vmware.com>2014-01-17 07:52:34 +0100
commit8ba07315d3ffcb7dfbb5143a3be03fe4af079969 (patch)
tree01496e4037f36a21baabd422377f25f461497444 /drivers/gpu
parent311474dbdc6ab0ad366fbec040dbe669edd30a35 (diff)
downloadop-kernel-dev-8ba07315d3ffcb7dfbb5143a3be03fe4af079969.zip
op-kernel-dev-8ba07315d3ffcb7dfbb5143a3be03fe4af079969.tar.gz
drm/vmwgfx: Block the BIND_SHADERCONSTS command
It's been deprecated. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c36
1 files changed, 2 insertions, 34 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index b14adae..dd5a9a2 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -1470,38 +1470,6 @@ static int vmw_cmd_bind_gb_shader(struct vmw_private *dev_priv,
cmd->body.offsetInBytes);
}
-/**
- * vmw_cmd_bind_gb_shader_consts - Validate an SVGA_3D_CMD_BIND_SHADER_CONSTS
- * command
- *
- * @dev_priv: Pointer to a device private struct.
- * @sw_context: The software context being used for this batch.
- * @header: Pointer to the command header in the command stream.
- */
-static int vmw_cmd_bind_gb_shader_consts(struct vmw_private *dev_priv,
- struct vmw_sw_context *sw_context,
- SVGA3dCmdHeader *header)
-{
- struct vmw_bind_gb_sc_cmd {
- SVGA3dCmdHeader header;
- SVGA3dCmdBindGBShaderConsts body;
- } *cmd;
- int ret;
-
- cmd = container_of(header, struct vmw_bind_gb_sc_cmd,
- header);
-
- ret = vmw_cmd_res_check(dev_priv, sw_context, vmw_res_context,
- user_context_converter,
- &cmd->body.cid, NULL);
- if (unlikely(ret != 0))
- return ret;
-
- return vmw_cmd_res_check(dev_priv, sw_context, vmw_res_surface,
- user_surface_converter,
- &cmd->body.sid, NULL);
-}
-
static int vmw_cmd_check_not_3d(struct vmw_private *dev_priv,
struct vmw_sw_context *sw_context,
void *buf, uint32_t *size)
@@ -1680,8 +1648,8 @@ static const struct vmw_cmd_entry const vmw_cmd_entries[SVGA_3D_CMD_MAX] = {
true, false, true),
VMW_CMD_DEF(SVGA_3D_CMD_DESTROY_GB_SHADER, &vmw_cmd_invalid,
false, false, true),
- VMW_CMD_DEF(SVGA_3D_CMD_BIND_SHADERCONSTS,
- &vmw_cmd_bind_gb_shader_consts, true, false, true),
+ VMW_CMD_DEF(SVGA_3D_CMD_BIND_SHADERCONSTS, &vmw_cmd_invalid,
+ false, false, false),
VMW_CMD_DEF(SVGA_3D_CMD_BEGIN_GB_QUERY, &vmw_cmd_begin_gb_query,
true, false, true),
VMW_CMD_DEF(SVGA_3D_CMD_END_GB_QUERY, &vmw_cmd_end_gb_query,
OpenPOWER on IntegriCloud