Commit 384d9d55 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'kraxel/tags/pull-ui-20170512-1' into staging 



ui: add egl-headless
ui: some vnc cleanups
ui: absolute events for input-linux

# gpg: Signature made Fri 12 May 2017 12:50:07 PM BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* kraxel/tags/pull-ui-20170512-1:
  vnc: replace hweight_long() with ctpopl()
  vnc: simple clean up
  opengl: add egl-headless display
  egl: explicitly ask for core context
  egl-helpers: add missing error check
  egl-helpers: fix display init for x11
  egl-helpers: drop support for gles and debug logging
  virtio-gpu: move virtio_gpu_gl_block
  ui: input-linux: Add absolute event support
  ui: Support non-zero minimum values for absolute input axes

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents ba9915e1 7c9209e7

hw/display/virtio-gpu-3d.c

+16 −0
Original line number Diff line number Diff line
@@ -600,6 +600,22 @@ void virtio_gpu_virgl_reset(VirtIOGPU *g) 
    }

}



void virtio_gpu_gl_block(void *opaque, bool block)

{

    VirtIOGPU *g = opaque;



    if (block) {

        g->renderer_blocked++;

    } else {

        g->renderer_blocked--;

    }

    assert(g->renderer_blocked >= 0);



    if (g->renderer_blocked == 0) {

        virtio_gpu_process_cmdq(g);

    }

}



int virtio_gpu_virgl_init(VirtIOGPU *g)

{

    int ret;

hw/display/virtio-gpu.c

+2 −16
Original line number Diff line number Diff line
@@ -929,28 +929,14 @@ static int virtio_gpu_ui_info(void *opaque, uint32_t idx, QemuUIInfo *info) 
    return 0;

}



static void virtio_gpu_gl_block(void *opaque, bool block)

{

    VirtIOGPU *g = opaque;



    if (block) {

        g->renderer_blocked++;

    } else {

        g->renderer_blocked--;

    }

    assert(g->renderer_blocked >= 0);



    if (g->renderer_blocked == 0) {

        virtio_gpu_process_cmdq(g);

    }

}



const GraphicHwOps virtio_gpu_ops = {

    .invalidate = virtio_gpu_invalidate_display,

    .gfx_update = virtio_gpu_update_display,

    .text_update = virtio_gpu_text_update,

    .ui_info = virtio_gpu_ui_info,

#ifdef CONFIG_VIRGL

    .gl_block = virtio_gpu_gl_block,

#endif

};



static const VMStateDescription vmstate_virtio_gpu_scanout = {

hw/input/virtio-input-hid.c

+4 −2
Original line number Diff line number Diff line
@@ -484,12 +484,14 @@ static struct virtio_input_config virtio_tablet_config[] = { 
        .select    = VIRTIO_INPUT_CFG_ABS_INFO,

        .subsel    = ABS_X,

        .size      = sizeof(virtio_input_absinfo),

        .u.abs.max = const_le32(INPUT_EVENT_ABS_SIZE - 1),

        .u.abs.min = const_le32(INPUT_EVENT_ABS_MIN),

        .u.abs.max = const_le32(INPUT_EVENT_ABS_MAX),

    },{

        .select    = VIRTIO_INPUT_CFG_ABS_INFO,

        .subsel    = ABS_Y,

        .size      = sizeof(virtio_input_absinfo),

        .u.abs.max = const_le32(INPUT_EVENT_ABS_SIZE - 1),

        .u.abs.min = const_le32(INPUT_EVENT_ABS_MIN),

        .u.abs.max = const_le32(INPUT_EVENT_ABS_MAX),

    },

    { /* end of list */ },

};

include/hw/virtio/virtio-gpu.h

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, 
                                  struct virtio_gpu_ctrl_command *cmd);

void virtio_gpu_virgl_fence_poll(VirtIOGPU *g);

void virtio_gpu_virgl_reset(VirtIOGPU *g);

void virtio_gpu_gl_block(void *opaque, bool block);

int virtio_gpu_virgl_init(VirtIOGPU *g);



#endif

include/qemu/bitops.h

+0 −10
Original line number Diff line number Diff line
@@ -201,16 +201,6 @@ static inline unsigned long find_first_zero_bit(const unsigned long *addr, 
    return find_next_zero_bit(addr, size, 0);

}



static inline unsigned long hweight_long(unsigned long w)

{

    unsigned long count;



    for (count = 0; w; w >>= 1) {

        count += w & 1;

    }

    return count;

}



/**

 * rol8 - rotate an 8-bit value left

 * @word: value to rotate