Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion drivers/gpu/drm/virtio/virtgpu_plane.c
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,11 @@ static void virtio_gpu_resource_flush(struct drm_plane *plane,

vgfb = to_virtio_gpu_framebuffer(plane->state->fb);
bo = gem_to_virtio_gpu_obj(vgfb->base.obj[0]);
if (vgdev->has_multi_plane) {
virtio_gpu_cmd_resource_flush(vgdev, bo->hw_res_handle, x, y,
width, height, NULL, NULL);
return;
}
fence = virtio_gpu_fence_alloc(vgdev, vgdev->fence_drv.context, 0);

if (fence) {
Expand Down Expand Up @@ -394,9 +399,14 @@ static void virtio_gpu_resource_flush_sprite(struct drm_plane *plane, int indx,
int i, cnt=0;
int plane_index = 0;

if (vgdev->has_multi_plane) {
plane_index = plane->index - vgdev->outputs[indx].plane_idx_offset;
virtio_gpu_cmd_resource_flush_sprite(vgdev, indx, plane_index, fb,
resource_id, cnt, x, y, width, height, NULL, NULL);
return;
}
vgfb = to_virtio_gpu_framebuffer(plane->state->fb);
fence = virtio_gpu_fence_alloc(vgdev, vgdev->fence_drv.context, 0);

if (fence) {
objs = virtio_gpu_array_alloc(1);
if (!objs) {
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/virtio/virtgpu_vq.c
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,7 @@ static int virtio_gpu_queue_ctrl_sgs(struct virtio_gpu_device *vgdev,
if (vq->num_free < elemcnt) {
spin_unlock(&vgdev->ctrlq.qlock);
virtio_gpu_notify(vgdev);
DRM_WARN("vq free slot is not enough\n");
wait_event(vgdev->ctrlq.ack_queue, vq->num_free >= elemcnt);
goto again;
}
Expand Down