From patchwork Fri Apr 28 16:48:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gurchetan Singh X-Patchwork-Id: 13226639 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 473D8C77B61 for ; Fri, 28 Apr 2023 16:49:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psRH3-0001E8-1Y; Fri, 28 Apr 2023 12:48:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psRH1-0001Dh-NV for qemu-devel@nongnu.org; Fri, 28 Apr 2023 12:48:43 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psRGn-0004pO-Ox for qemu-devel@nongnu.org; Fri, 28 Apr 2023 12:48:42 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1a66911f5faso1562935ad.0 for ; Fri, 28 Apr 2023 09:48:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1682700507; x=1685292507; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ofe78VJz1KgU8JMn3fn1DnDI773ILwJE1Lc1rT4KqcU=; b=EJnMOR0VgM+j9Isx1Ve864K4jKI2TDEKf36JXosOrjfaDGj8Pj9+VxPDCzKHWTU5mA M93G/bTw/tHCmQhG3pBDvdXByVwufMZUE3XnXLkaw7PEhqRTlKyaR89pl/0bJNcC8/OS XpR/nF8rKIttR+RT7zKTHQstpHv8e/++BAFVo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682700507; x=1685292507; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ofe78VJz1KgU8JMn3fn1DnDI773ILwJE1Lc1rT4KqcU=; b=INliDWOYpjkgAMNHfewmsJNB2aPV0/EPzVGjSOeKPk9zm7+0Tix9ib929J2MCqms9l Wxh4z71p3ZfZfdc4/iXuKUUo0j9JqufZkA1ukoHwANNtbEslUY0XUY5LZ8CUiBTlNqA9 XW2gZMdeDbUDoKQ5Q7R6sMgz/1VXZ34aWAE2UWxZ061T9/5+PG8dK0puhrCdg8lk2lKz P/v28VFUsuT8L89OKdFsY0P/YWSRrtBRiXQAgbM1VCrprgw0ls6FJWBL/tRRkcvxLq7K 7SkjmhViRRBp1mXX2I3Am5rhR31m5ZsSTikB9whv3ath2CS5amrl0wqy2hmlrDAhXSzX J9zg== X-Gm-Message-State: AC+VfDy1VOzZl29jKIyv0Rz4MzT4mHNhcQldDo/tdechwPpWxrJBAhnO ZwSnnQiXeXhwtKf1Gv04mh154ZnSAolH0QtLZA0= X-Google-Smtp-Source: ACHHUZ4/G1K3CyqhrvhbyHEaguj3X/PrEavGr5nEtFPHGDXpcF7RSRIdy7AkonQ/T1fspbtQcsuy7Q== X-Received: by 2002:a17:902:ec8d:b0:1a6:566b:dd73 with SMTP id x13-20020a170902ec8d00b001a6566bdd73mr7129726plg.60.1682700507564; Fri, 28 Apr 2023 09:48:27 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:a7:2:fdc4:a664:d93b:43db]) by smtp.gmail.com with ESMTPSA id jf19-20020a170903269300b001a2806ae2f7sm13566796plb.83.2023.04.28.09.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 09:48:27 -0700 (PDT) From: Gurchetan Singh X-Google-Original-From: Gurchetan Singh To: qemu-devel@nongnu.org Cc: philmd@linaro.org, kraxel@redhat.com, marcandre.lureau@redhat.com, akihiko.odaki@gmail.com, dmitry.osipenko@collabora.com, ray.huang@amd.com, alex.bennee@linaro.org Subject: [PATCH v2 2/5] hw/display/virtio-gpu-virgl: make GL device more library agnostic Date: Fri, 28 Apr 2023 09:48:20 -0700 Message-Id: <20230428164823.789-2-gurchetansingh@google.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20230428164823.789-1-gurchetansingh@google.com> References: <20230428164823.789-1-gurchetansingh@google.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=gurchetansingh@chromium.org; helo=mail-pl1-x62d.google.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Gurchetan Singh Rather than create a virtio-gpu-gfxstream device and it's associated variants (vga, pci), let's just extend the GL device. We need to: - Move all virgl functions to their own file - Only all needed class callbacks in the generic GL device Signed-off-by: Gurchetan Singh Reviewed-by: Philippe Mathieu-Daudé --- v2: - (Akihiko) Fix unnecessary line break hw/display/virtio-gpu-gl.c | 109 ------------------------------ hw/display/virtio-gpu-virgl.c | 118 +++++++++++++++++++++++++++++++-- include/hw/virtio/virtio-gpu.h | 11 +-- 3 files changed, 119 insertions(+), 119 deletions(-) diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c index 8573043b85..2d140e8792 100644 --- a/hw/display/virtio-gpu-gl.c +++ b/hw/display/virtio-gpu-gl.c @@ -15,121 +15,12 @@ #include "qemu/iov.h" #include "qemu/module.h" #include "qemu/error-report.h" -#include "qapi/error.h" -#include "sysemu/sysemu.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-gpu.h" #include "hw/virtio/virtio-gpu-bswap.h" #include "hw/virtio/virtio-gpu-pixman.h" #include "hw/qdev-properties.h" -#include - -static void virtio_gpu_virgl_update_cursor(VirtIOGPU *g, - struct virtio_gpu_scanout *s, - uint32_t resource_id) -{ - uint32_t width, height; - uint32_t pixels, *data; - - data = virgl_renderer_get_cursor_data(resource_id, &width, &height); - if (!data) { - return; - } - - if (width != s->current_cursor->width || - height != s->current_cursor->height) { - free(data); - return; - } - - pixels = s->current_cursor->width * s->current_cursor->height; - memcpy(s->current_cursor->data, data, pixels * sizeof(uint32_t)); - free(data); -} - -static void virtio_gpu_virgl_flushed(VirtIOGPUBase *b) -{ - VirtIOGPU *g = VIRTIO_GPU(b); - - virtio_gpu_process_cmdq(g); -} - -static void virtio_gpu_virgl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) -{ - VirtIOGPU *g = VIRTIO_GPU(vdev); - VirtIOGPUGL *gl = VIRTIO_GPU_GL(vdev); - struct virtio_gpu_ctrl_command *cmd; - - if (!virtio_queue_ready(vq)) { - return; - } - - if (!gl->renderer_inited) { - virtio_gpu_virgl_init(g); - gl->renderer_inited = true; - } - if (gl->renderer_reset) { - gl->renderer_reset = false; - virtio_gpu_virgl_reset_renderer(g); - } - - cmd = virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command)); - while (cmd) { - cmd->vq = vq; - cmd->error = 0; - cmd->finished = false; - QTAILQ_INSERT_TAIL(&g->cmdq, cmd, next); - cmd = virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command)); - } - - virtio_gpu_process_cmdq(g); - virtio_gpu_virgl_fence_poll(g); -} - -static void virtio_gpu_virgl_reset(VirtIODevice *vdev) -{ - VirtIOGPU *g = VIRTIO_GPU(vdev); - VirtIOGPUGL *gl = VIRTIO_GPU_GL(vdev); - - virtio_gpu_reset(vdev); - - /* - * GL functions must be called with the associated GL context in main - * thread, and when the renderer is unblocked. - */ - if (gl->renderer_inited && !gl->renderer_reset) { - virtio_gpu_virgl_reset_scanout(g); - gl->renderer_reset = true; - } -} - -static void virtio_gpu_virgl_device_realize(DeviceState *qdev, Error **errp) -{ - VirtIOGPU *g = VIRTIO_GPU(qdev); - -#if HOST_BIG_ENDIAN - error_setg(errp, "virgl is not supported on bigendian platforms"); - return; -#endif - - if (!object_resolve_path_type("", TYPE_VIRTIO_GPU_GL, NULL)) { - error_setg(errp, "at most one %s device is permitted", TYPE_VIRTIO_GPU_GL); - return; - } - - if (!display_opengl) { - error_setg(errp, "opengl is not available"); - return; - } - - g->parent_obj.conf.flags |= (1 << VIRTIO_GPU_FLAG_VIRGL_ENABLED); - VIRTIO_GPU_BASE(g)->virtio_config.num_capsets = - virtio_gpu_virgl_get_num_capsets(g); - - virtio_gpu_device_realize(qdev, errp); -} - static Property virtio_gpu_gl_properties[] = { DEFINE_PROP_BIT("stats", VirtIOGPU, parent_obj.conf.flags, VIRTIO_GPU_FLAG_STATS_ENABLED, false), diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index ffe4ec7f3d..786351446c 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -14,6 +14,8 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qemu/iov.h" +#include "qapi/error.h" +#include "sysemu/sysemu.h" #include "trace.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-gpu.h" @@ -584,12 +586,12 @@ static void virtio_gpu_fence_poll(void *opaque) } } -void virtio_gpu_virgl_fence_poll(VirtIOGPU *g) +static void virtio_gpu_virgl_fence_poll(VirtIOGPU *g) { virtio_gpu_fence_poll(g); } -void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g) +static void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g) { int i; @@ -599,12 +601,12 @@ void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g) } } -void virtio_gpu_virgl_reset_renderer(VirtIOGPU *g) +static void virtio_gpu_virgl_reset_renderer(VirtIOGPU *g) { virgl_renderer_reset(); } -int virtio_gpu_virgl_init(VirtIOGPU *g) +static int virtio_gpu_virgl_init(VirtIOGPU *g) { int ret; @@ -625,7 +627,7 @@ int virtio_gpu_virgl_init(VirtIOGPU *g) return 0; } -int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g) +static int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g) { uint32_t capset2_max_ver, capset2_max_size; virgl_renderer_get_cap_set(VIRTIO_GPU_CAPSET_VIRGL2, @@ -634,3 +636,109 @@ int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g) return capset2_max_ver ? 2 : 1; } + +void virtio_gpu_virgl_update_cursor(VirtIOGPU *g, + struct virtio_gpu_scanout *s, + uint32_t resource_id) +{ + uint32_t width, height; + uint32_t pixels, *data; + + data = virgl_renderer_get_cursor_data(resource_id, &width, &height); + if (!data) { + return; + } + + if (width != s->current_cursor->width || + height != s->current_cursor->height) { + free(data); + return; + } + + pixels = s->current_cursor->width * s->current_cursor->height; + memcpy(s->current_cursor->data, data, pixels * sizeof(uint32_t)); + free(data); +} + +void virtio_gpu_virgl_flushed(VirtIOGPUBase *b) +{ + VirtIOGPU *g = VIRTIO_GPU(b); + + virtio_gpu_process_cmdq(g); +} + +void virtio_gpu_virgl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) +{ + VirtIOGPU *g = VIRTIO_GPU(vdev); + VirtIOGPUGL *gl = VIRTIO_GPU_GL(vdev); + struct virtio_gpu_ctrl_command *cmd; + + if (!virtio_queue_ready(vq)) { + return; + } + + if (!gl->renderer_inited) { + virtio_gpu_virgl_init(g); + gl->renderer_inited = true; + } + if (gl->renderer_reset) { + gl->renderer_reset = false; + virtio_gpu_virgl_reset_renderer(g); + } + + cmd = virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command)); + while (cmd) { + cmd->vq = vq; + cmd->error = 0; + cmd->finished = false; + QTAILQ_INSERT_TAIL(&g->cmdq, cmd, next); + cmd = virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command)); + } + + virtio_gpu_process_cmdq(g); + virtio_gpu_virgl_fence_poll(g); +} + +void virtio_gpu_virgl_reset(VirtIODevice *vdev) +{ + VirtIOGPU *g = VIRTIO_GPU(vdev); + VirtIOGPUGL *gl = VIRTIO_GPU_GL(vdev); + + virtio_gpu_reset(vdev); + + /* + * GL functions must be called with the associated GL context in main + * thread, and when the renderer is unblocked. + */ + if (gl->renderer_inited && !gl->renderer_reset) { + virtio_gpu_virgl_reset_scanout(g); + gl->renderer_reset = true; + } +} + +void virtio_gpu_virgl_device_realize(DeviceState *qdev, Error **errp) +{ + VirtIOGPU *g = VIRTIO_GPU(qdev); + +#if HOST_BIG_ENDIAN + error_setg(errp, "virgl is not supported on bigendian platforms"); + return; +#endif + + if (!object_resolve_path_type("", TYPE_VIRTIO_GPU_GL, NULL)) { + error_setg(errp, "at most one %s device is permitted", + TYPE_VIRTIO_GPU_GL); + return; + } + + if (!display_opengl) { + error_setg(errp, "opengl is not available"); + return; + } + + g->parent_obj.conf.flags |= (1 << VIRTIO_GPU_FLAG_VIRGL_ENABLED); + VIRTIO_GPU_BASE(g)->virtio_config.num_capsets = + virtio_gpu_virgl_get_num_capsets(g); + + virtio_gpu_device_realize(qdev, errp); +} diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 21b0f55bc8..89ee133f07 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -279,10 +279,11 @@ int virtio_gpu_update_dmabuf(VirtIOGPU *g, /* virtio-gpu-3d.c */ 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_scanout(VirtIOGPU *g); -void virtio_gpu_virgl_reset_renderer(VirtIOGPU *g); -int virtio_gpu_virgl_init(VirtIOGPU *g); -int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g); +void virtio_gpu_virgl_update_cursor(VirtIOGPU *g, struct virtio_gpu_scanout *s, + uint32_t resource_id); +void virtio_gpu_virgl_flushed(VirtIOGPUBase *b); +void virtio_gpu_virgl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq); +void virtio_gpu_virgl_reset(VirtIODevice *vdev); +void virtio_gpu_virgl_device_realize(DeviceState *qdev, Error **errp); #endif