204ff2b8bb
Using "-device virtio-gpu,blob=true" currently does not work on big endian hosts (like s390x). The guest kernel prints an error message like: [drm:virtio_gpu_dequeue_ctrl_func [virtio_gpu]] *ERROR* response 0x1200 (command 0x10c) and the display stays black. When running QEMU with "-d guest_errors", it shows an error message like this: virtio_gpu_create_mapping_iov: nr_entries is too big (83886080 > 16384) which indicates that this value has not been properly byte-swapped. And indeed, the virtio_gpu_create_blob_bswap() function (that should swap the fields in the related structure) fails to swap some of the entries. After correctly swapping all missing values here, too, the virtio-gpu device is now also working with blob=true on s390x hosts. Fixes:e0933d91b1("virtio-gpu: Add virtio_gpu_resource_create_blob") Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2230469 Message-Id: <20230815122007.928049-1-thuth@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> (cherry picked from commitd194362910) Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
81 lines
1.9 KiB
C
81 lines
1.9 KiB
C
/*
|
|
* Virtio GPU Device
|
|
*
|
|
* Copyright Red Hat, Inc. 2013-2014
|
|
*
|
|
* Authors:
|
|
* Dave Airlie <airlied@redhat.com>
|
|
* Gerd Hoffmann <kraxel@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#ifndef HW_VIRTIO_GPU_BSWAP_H
|
|
#define HW_VIRTIO_GPU_BSWAP_H
|
|
|
|
#include "qemu/bswap.h"
|
|
#include "standard-headers/linux/virtio_gpu.h"
|
|
|
|
static inline void
|
|
virtio_gpu_ctrl_hdr_bswap(struct virtio_gpu_ctrl_hdr *hdr)
|
|
{
|
|
le32_to_cpus(&hdr->type);
|
|
le32_to_cpus(&hdr->flags);
|
|
le64_to_cpus(&hdr->fence_id);
|
|
le32_to_cpus(&hdr->ctx_id);
|
|
}
|
|
|
|
static inline void
|
|
virtio_gpu_bswap_32(void *ptr, size_t size)
|
|
{
|
|
#if HOST_BIG_ENDIAN
|
|
|
|
size_t i;
|
|
struct virtio_gpu_ctrl_hdr *hdr = (struct virtio_gpu_ctrl_hdr *) ptr;
|
|
|
|
virtio_gpu_ctrl_hdr_bswap(hdr);
|
|
|
|
i = sizeof(struct virtio_gpu_ctrl_hdr);
|
|
while (i < size) {
|
|
le32_to_cpus((uint32_t *)(ptr + i));
|
|
i = i + sizeof(uint32_t);
|
|
}
|
|
|
|
#endif
|
|
}
|
|
|
|
static inline void
|
|
virtio_gpu_t2d_bswap(struct virtio_gpu_transfer_to_host_2d *t2d)
|
|
{
|
|
virtio_gpu_ctrl_hdr_bswap(&t2d->hdr);
|
|
le32_to_cpus(&t2d->r.x);
|
|
le32_to_cpus(&t2d->r.y);
|
|
le32_to_cpus(&t2d->r.width);
|
|
le32_to_cpus(&t2d->r.height);
|
|
le64_to_cpus(&t2d->offset);
|
|
le32_to_cpus(&t2d->resource_id);
|
|
le32_to_cpus(&t2d->padding);
|
|
}
|
|
|
|
static inline void
|
|
virtio_gpu_create_blob_bswap(struct virtio_gpu_resource_create_blob *cblob)
|
|
{
|
|
virtio_gpu_ctrl_hdr_bswap(&cblob->hdr);
|
|
le32_to_cpus(&cblob->resource_id);
|
|
le32_to_cpus(&cblob->blob_mem);
|
|
le32_to_cpus(&cblob->blob_flags);
|
|
le32_to_cpus(&cblob->nr_entries);
|
|
le64_to_cpus(&cblob->blob_id);
|
|
le64_to_cpus(&cblob->size);
|
|
}
|
|
|
|
static inline void
|
|
virtio_gpu_scanout_blob_bswap(struct virtio_gpu_set_scanout_blob *ssb)
|
|
{
|
|
virtio_gpu_bswap_32(ssb, sizeof(*ssb) - sizeof(ssb->offsets[3]));
|
|
le32_to_cpus(&ssb->offsets[3]);
|
|
}
|
|
|
|
#endif
|