summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/virtio/virtgpu_plane.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2016-01-13 22:52:07 +0100
committerDave Airlie <airlied@redhat.com>2016-02-10 23:56:21 +0100
commit11c94ace5e25a1b6d12184b1a6f54ef4dc75aa62 (patch)
tree9d7894fbe310bccca55e437aaf8c3991a5da9757 /drivers/gpu/drm/virtio/virtgpu_plane.c
parentMerge git://linux-arm.org/linux-ld into drm-next (diff)
downloadlinux-11c94ace5e25a1b6d12184b1a6f54ef4dc75aa62.tar.xz
linux-11c94ace5e25a1b6d12184b1a6f54ef4dc75aa62.zip
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 <robh@kernel.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/virtio/virtgpu_plane.c')
-rw-r--r--drivers/gpu/drm/virtio/virtgpu_plane.c4
1 files changed, 2 insertions, 2 deletions
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 {