Merge drm/drm-fixes into drm-misc-fixes

[platform/kernel/linux-rpi.git] / drivers / gpu / drm / virtio / virtgpu_vq.c

diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index 208e943..1778a20 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -215,7 +215,7 @@ void virtio_gpu_dequeue_ctrl_func(struct work_struct *work)
        list_for_each_entry(entry, &reclaim_list, list) {
                resp = (struct virtio_gpu_ctrl_hdr *)entry->resp_buf;
 
-               trace_virtio_gpu_cmd_response(vgdev->ctrlq.vq, resp);
+               trace_virtio_gpu_cmd_response(vgdev->ctrlq.vq, resp, entry->seqno);
 
                if (resp->type != cpu_to_le32(VIRTIO_GPU_RESP_OK_NODATA)) {
                        if (le32_to_cpu(resp->type) >= VIRTIO_GPU_RESP_ERR_UNSPEC) {
@@ -261,6 +261,10 @@ void virtio_gpu_dequeue_cursor_func(struct work_struct *work)
        spin_unlock(&vgdev->cursorq.qlock);
 
        list_for_each_entry_safe(entry, tmp, &reclaim_list, list) {
+               struct virtio_gpu_ctrl_hdr *resp =
+                       (struct virtio_gpu_ctrl_hdr *)entry->resp_buf;
+
+               trace_virtio_gpu_cmd_response(vgdev->cursorq.vq, resp, entry->seqno);
                list_del(&entry->list);
                free_vbuf(vgdev, entry);
        }
@@ -353,7 +357,8 @@ again:
        ret = virtqueue_add_sgs(vq, sgs, outcnt, incnt, vbuf, GFP_ATOMIC);
        WARN_ON(ret);
 
-       trace_virtio_gpu_cmd_queue(vq, virtio_gpu_vbuf_ctrl_hdr(vbuf));
+       vbuf->seqno = ++vgdev->ctrlq.seqno;
+       trace_virtio_gpu_cmd_queue(vq, virtio_gpu_vbuf_ctrl_hdr(vbuf), vbuf->seqno);
 
        atomic_inc(&vgdev->pending_commands);
 
@@ -465,8 +470,10 @@ retry:
                spin_lock(&vgdev->cursorq.qlock);
                goto retry;
        } else {
+               vbuf->seqno = ++vgdev->cursorq.seqno;
                trace_virtio_gpu_cmd_queue(vq,
-                       virtio_gpu_vbuf_ctrl_hdr(vbuf));
+                       virtio_gpu_vbuf_ctrl_hdr(vbuf),
+                       vbuf->seqno);
 
                notify = virtqueue_kick_prepare(vq);
        }