From: Rob Herring Date: Wed, 13 Jan 2016 21:52:07 +0000 (-0600) Subject: drm: virtio-gpu: get the fb from the plane state for atomic updates X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=11c94ace5e25a1b6d12184b1a6f54ef4dc75aa62;p=openwrt%2Fstaging%2Fblogic.git 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 --- diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c index 572fb351feab..cad1ca49ad31 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 {