Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9e0aa63 authored by Rob Herring's avatar Rob Herring Committed by Alistair Strachan
Browse files

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

Change-Id: Ic5f4e3852fcd44af965d6a1cf784c38a34aee19e
Signed-off-by: default avatarAlistair Strachan <astrachan@google.com>
parent 38f41ec1

drivers/gpu/drm/virtio/virtgpu_plane.c

+2 −2
Original line number Diff line number Diff line
@@ -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 {