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 <robh@kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 11c94ace5e)

Change-Id: Ic5f4e3852fcd44af965d6a1cf784c38a34aee19e
Signed-off-by: Alistair Strachan <astrachan@google.com>
This commit is contained in:
Rob Herring
2016-01-13 15:52:07 -06:00
committed by Amit Pundir
parent 9bf5cde85e
commit 45da553009

View File

@@ -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 {