Skip to content

Commit 73f15a9

Browse files
committed
drm/virtio: Remove open-coded commit-tail function
Exactly matches the one in the helpers. This avoids me having to roll out dma-fence critical section annotations to this copy. Reviewed-by: Sam Ravnborg <[email protected]> Acked-by: Gerd Hoffmann <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Cc: David Airlie <[email protected]> Cc: Gerd Hoffmann <[email protected]> Cc: [email protected] Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent cb345de commit 73f15a9

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

drivers/gpu/drm/virtio/virtgpu_display.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -314,25 +314,6 @@ virtio_gpu_user_framebuffer_create(struct drm_device *dev,
314314
return &virtio_gpu_fb->base;
315315
}
316316

317-
static void vgdev_atomic_commit_tail(struct drm_atomic_state *state)
318-
{
319-
struct drm_device *dev = state->dev;
320-
321-
drm_atomic_helper_commit_modeset_disables(dev, state);
322-
drm_atomic_helper_commit_modeset_enables(dev, state);
323-
drm_atomic_helper_commit_planes(dev, state, 0);
324-
325-
drm_atomic_helper_fake_vblank(state);
326-
drm_atomic_helper_commit_hw_done(state);
327-
328-
drm_atomic_helper_wait_for_vblanks(dev, state);
329-
drm_atomic_helper_cleanup_planes(dev, state);
330-
}
331-
332-
static const struct drm_mode_config_helper_funcs virtio_mode_config_helpers = {
333-
.atomic_commit_tail = vgdev_atomic_commit_tail,
334-
};
335-
336317
static const struct drm_mode_config_funcs virtio_gpu_mode_funcs = {
337318
.fb_create = virtio_gpu_user_framebuffer_create,
338319
.atomic_check = drm_atomic_helper_check,
@@ -346,7 +327,6 @@ void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)
346327
drm_mode_config_init(vgdev->ddev);
347328
vgdev->ddev->mode_config.quirk_addfb_prefer_host_byte_order = true;
348329
vgdev->ddev->mode_config.funcs = &virtio_gpu_mode_funcs;
349-
vgdev->ddev->mode_config.helper_private = &virtio_mode_config_helpers;
350330

351331
/* modes will be validated against the framebuffer size */
352332
vgdev->ddev->mode_config.min_width = XRES_MIN;

0 commit comments

Comments
 (0)