UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/virtio: Use appropriate atomic state in virtio_gpu_plane_cleanup_fb() 

Make virtio_gpu_plane_cleanup_fb() to clean the state which DRM core
wants to clean up and not the current plane's state. Normally the older
atomic state is cleaned up, but the newer state could also be cleaned up
in case of aborted commits.

Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20220630200726.1884320-6-dmitry.osipenko@collabora.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Dmitry Osipenko 2022-06-30 23:07:22 +03:00 committed by Gerd Hoffmann
parent 0f877398d3
commit 4656b3a26a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/virtio/virtgpu_plane.c
View File

@ -266,14 +266,14 @@ static int virtio_gpu_plane_prepare_fb(struct drm_plane *plane,
} }
static void virtio_gpu_plane_cleanup_fb(struct drm_plane *plane, static void virtio_gpu_plane_cleanup_fb(struct drm_plane *plane,
struct drm_plane_state *old_state) struct drm_plane_state *state)
{ {
struct virtio_gpu_framebuffer *vgfb; struct virtio_gpu_framebuffer *vgfb;
if (!plane->state->fb) if (!state->fb)
return; return;
vgfb = to_virtio_gpu_framebuffer(plane->state->fb); vgfb = to_virtio_gpu_framebuffer(state->fb);
if (vgfb->fence) { if (vgfb->fence) {
dma_fence_put(&vgfb->fence->f); dma_fence_put(&vgfb->fence->f);
vgfb->fence = NULL; vgfb->fence = NULL;