From d9e0aa6379fbea7736f135fc2ca34e9e40e27fdf Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 13 Jan 2016 15:52:07 -0600 Subject: [PATCH] UPSTREAM: drm: virtio-gpu: get the fb from the plane state for atomic updates When using the atomic API, plane->fb is not set when calling virtio_gpu_plane_atomic_update. Use plane->state->fb instead. Signed-off-by: Rob Herring Signed-off-by: Dave Airlie (cherry picked from commit 11c94ace5e25a1b6d12184b1a6f54ef4dc75aa62) Change-Id: Ic5f4e3852fcd44af965d6a1cf784c38a34aee19e Signed-off-by: Alistair Strachan --- drivers/gpu/drm/virtio/virtgpu_plane.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c index 4a74129c5708..6b9ad59c643f 100644 --- a/drivers/gpu/drm/virtio/virtgpu_plane.c +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c @@ -68,8 +68,8 @@ static void virtio_gpu_plane_atomic_update(struct drm_plane *plane, struct virtio_gpu_object *bo; uint32_t handle; - if (plane->fb) { - vgfb = to_virtio_gpu_framebuffer(plane->fb); + if (plane->state->fb) { + vgfb = to_virtio_gpu_framebuffer(plane->state->fb); bo = gem_to_virtio_gpu_obj(vgfb->obj); handle = bo->hw_res_handle; } else {