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

Commit d3767d49 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

virtio-gpu: fix output lookup 



Needed for multihead setups where we can have disabled
outputs and therefore plane->crtc can be NULL.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent af8c34ce

drivers/gpu/drm/virtio/virtgpu_plane.c

+7 −1
Original line number Diff line number Diff line
@@ -63,11 +63,17 @@ static void virtio_gpu_plane_atomic_update(struct drm_plane *plane, 
{

	struct drm_device *dev = plane->dev;

	struct virtio_gpu_device *vgdev = dev->dev_private;

	struct virtio_gpu_output *output = drm_crtc_to_virtio_gpu_output(plane->crtc);

	struct virtio_gpu_output *output = NULL;

	struct virtio_gpu_framebuffer *vgfb;

	struct virtio_gpu_object *bo;

	uint32_t handle;



	if (plane->state->crtc)

		output = drm_crtc_to_virtio_gpu_output(plane->state->crtc);

	if (old_state->crtc)

		output = drm_crtc_to_virtio_gpu_output(old_state->crtc);

	WARN_ON(!output);



	if (plane->state->fb) {

		vgfb = to_virtio_gpu_framebuffer(plane->state->fb);

		bo = gem_to_virtio_gpu_obj(vgfb->obj);