diff options
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c index c6ff0e40f201..be41484735b1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | |||
@@ -686,7 +686,7 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data, | |||
686 | int ret; | 686 | int ret; |
687 | void *user_cmd; | 687 | void *user_cmd; |
688 | void *cmd; | 688 | void *cmd; |
689 | uint32_t sequence; | 689 | uint32_t seqno; |
690 | struct vmw_sw_context *sw_context = &dev_priv->ctx; | 690 | struct vmw_sw_context *sw_context = &dev_priv->ctx; |
691 | struct vmw_master *vmaster = vmw_master(file_priv->master); | 691 | struct vmw_master *vmaster = vmw_master(file_priv->master); |
692 | 692 | ||
@@ -738,7 +738,7 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data, | |||
738 | vmw_apply_relocations(sw_context); | 738 | vmw_apply_relocations(sw_context); |
739 | 739 | ||
740 | if (arg->throttle_us) { | 740 | if (arg->throttle_us) { |
741 | ret = vmw_wait_lag(dev_priv, &dev_priv->fifo.fence_queue, | 741 | ret = vmw_wait_lag(dev_priv, &dev_priv->fifo.marker_queue, |
742 | arg->throttle_us); | 742 | arg->throttle_us); |
743 | 743 | ||
744 | if (unlikely(ret != 0)) | 744 | if (unlikely(ret != 0)) |
@@ -755,10 +755,10 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data, | |||
755 | memcpy(cmd, sw_context->cmd_bounce, arg->command_size); | 755 | memcpy(cmd, sw_context->cmd_bounce, arg->command_size); |
756 | vmw_fifo_commit(dev_priv, arg->command_size); | 756 | vmw_fifo_commit(dev_priv, arg->command_size); |
757 | 757 | ||
758 | ret = vmw_fifo_send_fence(dev_priv, &sequence); | 758 | ret = vmw_fifo_send_fence(dev_priv, &seqno); |
759 | 759 | ||
760 | ttm_eu_fence_buffer_objects(&sw_context->validate_nodes, | 760 | ttm_eu_fence_buffer_objects(&sw_context->validate_nodes, |
761 | (void *)(unsigned long) sequence); | 761 | (void *)(unsigned long) seqno); |
762 | vmw_clear_validations(sw_context); | 762 | vmw_clear_validations(sw_context); |
763 | mutex_unlock(&dev_priv->cmdbuf_mutex); | 763 | mutex_unlock(&dev_priv->cmdbuf_mutex); |
764 | 764 | ||
@@ -771,7 +771,7 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data, | |||
771 | DRM_ERROR("Fence submission error. Syncing.\n"); | 771 | DRM_ERROR("Fence submission error. Syncing.\n"); |
772 | 772 | ||
773 | fence_rep.error = ret; | 773 | fence_rep.error = ret; |
774 | fence_rep.fence_seq = (uint64_t) sequence; | 774 | fence_rep.fence_seq = (uint64_t) seqno; |
775 | fence_rep.pad64 = 0; | 775 | fence_rep.pad64 = 0; |
776 | 776 | ||
777 | user_fence_rep = (struct drm_vmw_fence_rep __user *) | 777 | user_fence_rep = (struct drm_vmw_fence_rep __user *) |