diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2010-11-17 07:28:31 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-11-21 22:25:21 -0500 |
commit | 65705962025df490d13df59ec57c5329d1bd0a16 (patch) | |
tree | aa9d40bbd1a842aaada664d9d0fa6a317ec1755f /drivers/gpu/drm/vmwgfx | |
parent | 95762c2b34069bf4adb7929969f1f5f5fc8a38df (diff) |
drm/ttm/vmwgfx: Have TTM manage the validation sequence.
Rather than having the driver supply the validation sequence, leave that
responsibility to TTM. This saves some confusion and a function argument.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index e7a58d055041..10fc01f69c40 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |||
@@ -264,7 +264,6 @@ struct vmw_private { | |||
264 | */ | 264 | */ |
265 | 265 | ||
266 | struct vmw_sw_context ctx; | 266 | struct vmw_sw_context ctx; |
267 | uint32_t val_seq; | ||
268 | struct mutex cmdbuf_mutex; | 267 | struct mutex cmdbuf_mutex; |
269 | 268 | ||
270 | /** | 269 | /** |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c index 76954e3528c1..41b95ed6dbcd 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | |||
@@ -653,8 +653,7 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data, | |||
653 | ret = vmw_cmd_check_all(dev_priv, sw_context, cmd, arg->command_size); | 653 | ret = vmw_cmd_check_all(dev_priv, sw_context, cmd, arg->command_size); |
654 | if (unlikely(ret != 0)) | 654 | if (unlikely(ret != 0)) |
655 | goto out_err; | 655 | goto out_err; |
656 | ret = ttm_eu_reserve_buffers(&sw_context->validate_nodes, | 656 | ret = ttm_eu_reserve_buffers(&sw_context->validate_nodes); |
657 | dev_priv->val_seq++); | ||
658 | if (unlikely(ret != 0)) | 657 | if (unlikely(ret != 0)) |
659 | goto out_err; | 658 | goto out_err; |
660 | 659 | ||