Skip to content

Commit 3b485be

Browse files
committed
debug for vblank and fence timeout
Signed-off-by: Xue, Bosheng <bosheng.xue@intel.com>
1 parent 6a74e23 commit 3b485be

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

drivers/gpu/drm/virtio/virtgpu_display.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,12 @@ virtio_gpu_wait_for_vblanks(struct drm_device *dev,
497497
(vgdev->has_vblank && vgdev->has_flip_sequence ?
498498
atomic64_read(&vgdev->flip_sequence[i]) :
499499
drm_crtc_vblank_count(crtc)),
500-
msecs_to_jiffies(100));
500+
msecs_to_jiffies(500));
501501

502-
WARN(!ret, "[CRTC:%d:%s] vblank wait timed out\n",
503-
crtc->base.id, crtc->name);
502+
// WARN(!ret, "[CRTC:%d:%s] vblank wait timed out\n",
503+
// crtc->base.id, crtc->name);
504+
if (ret == 0)
505+
pr_err("bosheng wait vblank timeout\n");
504506

505507
drm_crtc_vblank_put(crtc);
506508
}

drivers/gpu/drm/virtio/virtgpu_plane.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ static void virtio_gpu_resource_flush(struct drm_plane *plane,
349349
struct virtio_gpu_framebuffer *vgfb;
350350
struct virtio_gpu_plane_state *vgplane_st;
351351
struct virtio_gpu_object *bo;
352+
int ret = 0;
352353

353354
vgfb = to_virtio_gpu_framebuffer(plane->state->fb);
354355
vgplane_st = to_virtio_gpu_plane_state(plane->state);
@@ -365,8 +366,10 @@ static void virtio_gpu_resource_flush(struct drm_plane *plane,
365366
width, height, objs,
366367
vgplane_st->fence);
367368
virtio_gpu_notify(vgdev);
368-
dma_fence_wait_timeout(&vgplane_st->fence->f, true,
369+
ret = dma_fence_wait_timeout(&vgplane_st->fence->f, true,
369370
msecs_to_jiffies(50));
371+
if (ret <= 0)
372+
printk("bosheng resource flush timeout ret:%d\n", ret);
370373
} else {
371374
virtio_gpu_cmd_resource_flush(vgdev, bo->hw_res_handle, x, y,
372375
width, height, NULL, NULL);

0 commit comments

Comments
 (0)