Commit acfc4846 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Gerd Hoffmann
Browse files

virtio-gpu: use VIRTIO_GPU_MAX_SCANOUTS 



The value is defined in virtio_gpu.h already (changing from 4 to 16).

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 1463653560-26958-6-git-send-email-marcandre.lureau@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 2fe76055

hw/display/virtio-gpu.c

+2 −2
Original line number Diff line number Diff line
@@ -929,8 +929,8 @@ static void virtio_gpu_device_realize(DeviceState *qdev, Error **errp) 
    bool have_virgl;

    int i;



    if (g->conf.max_outputs > VIRTIO_GPU_MAX_SCANOUT) {

        error_setg(errp, "invalid max_outputs > %d", VIRTIO_GPU_MAX_SCANOUT);

    if (g->conf.max_outputs > VIRTIO_GPU_MAX_SCANOUTS) {

        error_setg(errp, "invalid max_outputs > %d", VIRTIO_GPU_MAX_SCANOUTS);

        return;

    }

include/hw/virtio/virtio-gpu.h

+2 −4
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 


#define VIRTIO_ID_GPU 16



#define VIRTIO_GPU_MAX_SCANOUT 4



struct virtio_gpu_simple_resource {

    uint32_t resource_id;

    uint32_t width;
@@ -98,8 +96,8 @@ typedef struct VirtIOGPU { 
    QTAILQ_HEAD(, virtio_gpu_ctrl_command) cmdq;

    QTAILQ_HEAD(, virtio_gpu_ctrl_command) fenceq;



    struct virtio_gpu_scanout scanout[VIRTIO_GPU_MAX_SCANOUT];

    struct virtio_gpu_requested_state req_state[VIRTIO_GPU_MAX_SCANOUT];

    struct virtio_gpu_scanout scanout[VIRTIO_GPU_MAX_SCANOUTS];

    struct virtio_gpu_requested_state req_state[VIRTIO_GPU_MAX_SCANOUTS];



    struct virtio_gpu_conf conf;

    int enabled_output_bitmask;