Skip to content

Commit 9745290

Browse files
kraxelkraxel
committed
drm/virtio: move remaining virtio_gpu_notify calls
Move all remaining virtio_gpu_notify() calls from virtio_gpu_cmd_* to the callers, for consistency reasons. Signed-off-by: Gerd Hoffmann <[email protected]> Reviewed-by: Chia-I Wu <[email protected]> Reviewed-by: Gurchetan Singh <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 234489e commit 9745290

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

‎drivers/gpu/drm/virtio/virtgpu_gem.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj,
123123

124124
virtio_gpu_cmd_context_attach_resource(vgdev, vfpriv->ctx_id,
125125
objs);
126+
virtio_gpu_notify(vgdev);
126127
return 0;
127128
}
128129

@@ -143,6 +144,7 @@ void virtio_gpu_gem_object_close(struct drm_gem_object *obj,
143144

144145
virtio_gpu_cmd_context_detach_resource(vgdev, vfpriv->ctx_id,
145146
objs);
147+
virtio_gpu_notify(vgdev);
146148
}
147149

148150
struct virtio_gpu_object_array *virtio_gpu_array_alloc(u32 nents)

‎drivers/gpu/drm/virtio/virtgpu_ioctl.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
158158

159159
virtio_gpu_cmd_submit(vgdev, buf, exbuf->size,
160160
vfpriv->ctx_id, buflist, out_fence);
161+
virtio_gpu_notify(vgdev);
161162
return 0;
162163

163164
out_unresv:
@@ -314,6 +315,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,
314315
(vgdev, vfpriv->ctx_id, offset, args->level,
315316
&args->box, objs, fence);
316317
dma_fence_put(&fence->f);
318+
virtio_gpu_notify(vgdev);
317319
return 0;
318320

319321
err_unlock:
@@ -446,6 +448,7 @@ static int virtio_gpu_get_caps_ioctl(struct drm_device *dev,
446448
/* not in cache - need to talk to hw */
447449
virtio_gpu_cmd_get_capset(vgdev, found_valid, args->cap_set_ver,
448450
&cache_ent);
451+
virtio_gpu_notify(vgdev);
449452

450453
copy_exit:
451454
ret = wait_event_timeout(vgdev->resp_wq,

‎drivers/gpu/drm/virtio/virtgpu_kms.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,15 @@ static int virtio_gpu_context_create(struct virtio_gpu_device *vgdev,
6161
return handle;
6262
handle += 1;
6363
virtio_gpu_cmd_context_create(vgdev, handle, nlen, name);
64+
virtio_gpu_notify(vgdev);
6465
return handle;
6566
}
6667

6768
static void virtio_gpu_context_destroy(struct virtio_gpu_device *vgdev,
6869
uint32_t ctx_id)
6970
{
7071
virtio_gpu_cmd_context_destroy(vgdev, ctx_id);
72+
virtio_gpu_notify(vgdev);
7173
ida_free(&vgdev->ctx_id_ida, ctx_id - 1);
7274
}
7375

@@ -93,6 +95,7 @@ static void virtio_gpu_get_capsets(struct virtio_gpu_device *vgdev,
9395
}
9496
for (i = 0; i < num_capsets; i++) {
9597
virtio_gpu_cmd_get_capset_info(vgdev, i);
98+
virtio_gpu_notify(vgdev);
9699
ret = wait_event_timeout(vgdev->resp_wq,
97100
vgdev->capsets[i].id > 0, 5 * HZ);
98101
if (ret == 0) {

‎drivers/gpu/drm/virtio/virtgpu_object.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ static void virtio_gpu_free_object(struct drm_gem_object *obj)
8888

8989
if (bo->created) {
9090
virtio_gpu_cmd_unref_resource(vgdev, bo);
91+
virtio_gpu_notify(vgdev);
9192
/* completion handler calls virtio_gpu_cleanup_object() */
9293
return;
9394
}

‎drivers/gpu/drm/virtio/virtgpu_vq.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,6 @@ void virtio_gpu_cmd_unref_resource(struct virtio_gpu_device *vgdev,
544544

545545
vbuf->resp_cb_data = bo;
546546
virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);
547-
virtio_gpu_notify(vgdev);
548547
}
549548

550549
void virtio_gpu_cmd_set_scanout(struct virtio_gpu_device *vgdev,
@@ -798,7 +797,6 @@ int virtio_gpu_cmd_get_capset_info(struct virtio_gpu_device *vgdev, int idx)
798797
cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_GET_CAPSET_INFO);
799798
cmd_p->capset_index = cpu_to_le32(idx);
800799
virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);
801-
virtio_gpu_notify(vgdev);
802800
return 0;
803801
}
804802

@@ -874,7 +872,6 @@ int virtio_gpu_cmd_get_capset(struct virtio_gpu_device *vgdev,
874872
cmd_p->capset_version = cpu_to_le32(version);
875873
*cache_p = cache_ent;
876874
virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);
877-
virtio_gpu_notify(vgdev);
878875

879876
return 0;
880877
}
@@ -922,7 +919,6 @@ void virtio_gpu_cmd_context_create(struct virtio_gpu_device *vgdev, uint32_t id,
922919
strncpy(cmd_p->debug_name, name, sizeof(cmd_p->debug_name) - 1);
923920
cmd_p->debug_name[sizeof(cmd_p->debug_name) - 1] = 0;
924921
virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);
925-
virtio_gpu_notify(vgdev);
926922
}
927923

928924
void virtio_gpu_cmd_context_destroy(struct virtio_gpu_device *vgdev,
@@ -937,7 +933,6 @@ void virtio_gpu_cmd_context_destroy(struct virtio_gpu_device *vgdev,
937933
cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_CTX_DESTROY);
938934
cmd_p->hdr.ctx_id = cpu_to_le32(id);
939935
virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);
940-
virtio_gpu_notify(vgdev);
941936
}
942937

943938
void virtio_gpu_cmd_context_attach_resource(struct virtio_gpu_device *vgdev,
@@ -956,7 +951,6 @@ void virtio_gpu_cmd_context_attach_resource(struct virtio_gpu_device *vgdev,
956951
cmd_p->hdr.ctx_id = cpu_to_le32(ctx_id);
957952
cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
958953
virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);
959-
virtio_gpu_notify(vgdev);
960954
}
961955

962956
void virtio_gpu_cmd_context_detach_resource(struct virtio_gpu_device *vgdev,
@@ -975,7 +969,6 @@ void virtio_gpu_cmd_context_detach_resource(struct virtio_gpu_device *vgdev,
975969
cmd_p->hdr.ctx_id = cpu_to_le32(ctx_id);
976970
cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
977971
virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);
978-
virtio_gpu_notify(vgdev);
979972
}
980973

981974
void
@@ -1067,7 +1060,6 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev,
10671060
cmd_p->level = cpu_to_le32(level);
10681061

10691062
virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence);
1070-
virtio_gpu_notify(vgdev);
10711063
}
10721064

10731065
void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev,
@@ -1091,7 +1083,6 @@ void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev,
10911083
cmd_p->size = cpu_to_le32(data_size);
10921084

10931085
virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence);
1094-
virtio_gpu_notify(vgdev);
10951086
}
10961087

10971088
int virtio_gpu_object_attach(struct virtio_gpu_device *vgdev,

0 commit comments

Comments
 (0)