aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2012-02-09 10:56:43 -0500
committerDave Airlie <airlied@redhat.com>2012-02-13 07:01:33 -0500
commitbb1bd2f43ee15386a1c3f96cbcbb9302a9994443 (patch)
tree0ac02905936728ea596a768c3b8c97b406e789fd /drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
parent6b82ef50d8617f3fcd51dda9d89d973fe3bc65b8 (diff)
vmwgfx: Make it possible to get fence from execbuf
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_kms.c')
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_kms.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index b66ef0e3cde1..12619c33953b 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -547,7 +547,7 @@ static int do_surface_dirty_sou(struct vmw_private *dev_priv,
547 fifo_size = sizeof(*cmd) + sizeof(SVGASignedRect) * num; 547 fifo_size = sizeof(*cmd) + sizeof(SVGASignedRect) * num;
548 cmd->header.size = cpu_to_le32(fifo_size - sizeof(cmd->header)); 548 cmd->header.size = cpu_to_le32(fifo_size - sizeof(cmd->header));
549 ret = vmw_execbuf_process(file_priv, dev_priv, NULL, cmd, 549 ret = vmw_execbuf_process(file_priv, dev_priv, NULL, cmd,
550 fifo_size, 0, NULL); 550 fifo_size, 0, NULL, NULL);
551 551
552 if (unlikely(ret != 0)) 552 if (unlikely(ret != 0))
553 break; 553 break;
@@ -809,7 +809,7 @@ static int do_dmabuf_define_gmrfb(struct drm_file *file_priv,
809 cmd->body.ptr.offset = 0; 809 cmd->body.ptr.offset = 0;
810 810
811 ret = vmw_execbuf_process(file_priv, dev_priv, NULL, cmd, 811 ret = vmw_execbuf_process(file_priv, dev_priv, NULL, cmd,
812 fifo_size, 0, NULL); 812 fifo_size, 0, NULL, NULL);
813 813
814 kfree(cmd); 814 kfree(cmd);
815 815
@@ -896,7 +896,7 @@ static int do_dmabuf_dirty_sou(struct drm_file *file_priv,
896 896
897 fifo_size = sizeof(*blits) * hit_num; 897 fifo_size = sizeof(*blits) * hit_num;
898 ret = vmw_execbuf_process(file_priv, dev_priv, NULL, blits, 898 ret = vmw_execbuf_process(file_priv, dev_priv, NULL, blits,
899 fifo_size, 0, NULL); 899 fifo_size, 0, NULL, NULL);
900 900
901 if (unlikely(ret != 0)) 901 if (unlikely(ret != 0))
902 break; 902 break;
@@ -1296,7 +1296,7 @@ int vmw_kms_present(struct vmw_private *dev_priv,
1296 fifo_size = sizeof(*cmd) + sizeof(SVGASignedRect) * num; 1296 fifo_size = sizeof(*cmd) + sizeof(SVGASignedRect) * num;
1297 cmd->header.size = cpu_to_le32(fifo_size - sizeof(cmd->header)); 1297 cmd->header.size = cpu_to_le32(fifo_size - sizeof(cmd->header));
1298 ret = vmw_execbuf_process(file_priv, dev_priv, NULL, cmd, 1298 ret = vmw_execbuf_process(file_priv, dev_priv, NULL, cmd,
1299 fifo_size, 0, NULL); 1299 fifo_size, 0, NULL, NULL);
1300 1300
1301 if (unlikely(ret != 0)) 1301 if (unlikely(ret != 0))
1302 break; 1302 break;
@@ -1409,7 +1409,7 @@ int vmw_kms_readback(struct vmw_private *dev_priv,
1409 fifo_size = sizeof(*cmd) + sizeof(*blits) * blits_pos; 1409 fifo_size = sizeof(*cmd) + sizeof(*blits) * blits_pos;
1410 1410
1411 ret = vmw_execbuf_process(file_priv, dev_priv, NULL, cmd, fifo_size, 1411 ret = vmw_execbuf_process(file_priv, dev_priv, NULL, cmd, fifo_size,
1412 0, user_fence_rep); 1412 0, user_fence_rep, NULL);
1413 1413
1414 kfree(cmd); 1414 kfree(cmd);
1415 1415