diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-09 18:06:32 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-10 10:52:12 -0400 |
| commit | 5e84c2690b805caeff3b4c6c9564c7b8de54742d (patch) | |
| tree | 2bf5c46d66e98b6da46ba6bb28596bd428028d73 /drivers/gpu/drm/virtio | |
| parent | f706974a69b6e2be8f69fb4dc89158a6297338f9 (diff) | |
drm/atomic-helper: Massage swap_state signature somewhat
- dev is redundant, we have state->atomic
- add stall parameter, which must be set when swapping needs to stall
for preceeding commits to stop looking at ->state pointers. Currently
all drivers need this to be, just prep work for a glorious future.
v2: Rebased on top of
commit e7cf0963f816fa44190caaf51aeffaa614c340c6
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue May 31 08:50:47 2016 +0200
virtio-gpu: add atomic_commit function
Cc: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465509992-19284-1-git-send-email-daniel.vetter@ffwll.ch
Link: http://patchwork.freedesktop.org/patch/msgid/1465388359-8070-2-git-send-email-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/virtio')
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c index d82ae1cddfcf..3d0fa049b34c 100644 --- a/drivers/gpu/drm/virtio/virtgpu_display.c +++ b/drivers/gpu/drm/virtio/virtgpu_display.c | |||
| @@ -395,7 +395,7 @@ static int vgdev_atomic_commit(struct drm_device *dev, | |||
| 395 | if (nonblock) | 395 | if (nonblock) |
| 396 | return -EBUSY; | 396 | return -EBUSY; |
| 397 | 397 | ||
| 398 | drm_atomic_helper_swap_state(dev, state); | 398 | drm_atomic_helper_swap_state(state, true); |
| 399 | drm_atomic_helper_wait_for_fences(dev, state); | 399 | drm_atomic_helper_wait_for_fences(dev, state); |
| 400 | 400 | ||
| 401 | drm_atomic_helper_commit_modeset_disables(dev, state); | 401 | drm_atomic_helper_commit_modeset_disables(dev, state); |
