From patchwork Thu Mar 21 10:06:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 781544 Delivered-To: patch@linaro.org Received: by 2002:adf:cf01:0:b0:33e:7753:30bd with SMTP id o1csp741389wrj; Thu, 21 Mar 2024 03:07:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUzxFZlo/XUtBCyuCg3bP6jxlI1qQTjgmkl1lPt0OqNGATaRrzRGQacO+TZc4meNSamRNYscRKTKHO3khdckfsB X-Google-Smtp-Source: AGHT+IFmoAzYapLiSDRuVu9WTgwBsL5ihELRD+3CaJxNc1p5AEqcbEb90szub7i5chV//EGz33zn X-Received: by 2002:a05:620a:4411:b0:788:672d:594b with SMTP id v17-20020a05620a441100b00788672d594bmr6067966qkp.29.1711015650207; Thu, 21 Mar 2024 03:07:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711015650; cv=none; d=google.com; s=arc-20160816; b=YxNezc5K2zqMmi+qecwLOJwNMfcCw8fAqLe7VAW0WJbtXAygAsedMCjG31JlWT2kzv P5S88U06hlpha5b2sAGYTiCBR5aOcRRedeRqBzVuVeJZwegeSyuCOSWmlpY3XvSWuMZH AsAu65ybbVu1PalUrFVtRkrPvR7m4vJ5NZERUrZqOkSI2uCfLg0OXnoK4yFRmrn3q0tn RRlwHpCEXKKErPIVHN4tSuf11AcfWbn81PshePC91rG3Iq4eODaUvOjMFYZyLnuoAa4L YDjsE8Zb0ZcMfiPv/cEx166k4e2HZJi57+ThaNd6J/0uChUCIad/GVnIGkCrfFfz+V6D /K+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=A2dvM+euMDE0v28D1xjaFlsbAEAYgdfmVYQj+HIsXyM=; fh=UB8E64C3jpKLUKUvigzWzwsOf4dD1/jl9U/Q+q3DB+w=; b=Vxb/eb1yhz02lJi3ptr1T5Ha6WcC+DZLe+o3iPjgeLuPTG+60UzTnvcrrhtP8rlXfW uKhVZPfRKvSM4uy0paW2ePHCpyHiQUlDw2F9ukOf6CJkPJTgJpHyb6lOw+PbH0zUK9jw 8/dzqWlhysfgZ232tePjMuYHXdaK1Qxr9iS5OVQxUA4XlfJ7h/LLaOifYzbxqJJ/+MqP 1Pg1MbLCxbnH3K9YHRSHrBTFYnPsYTgXj+zNWCiaVaVu1zUGRF9awHKGf/vLsKUXC4VJ CJw6xt1TM5i3pO/bVk4/XglO7FNLeYMcxjNrIr0KR0WJy0BV8+C//anYAU4WY4Hox0jE jqPg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wD7fkTGS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id vq22-20020a05620a559600b00789f0372eb2si10597405qkn.154.2024.03.21.03.07.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Mar 2024 03:07:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wD7fkTGS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnFK1-0002kY-VO; Thu, 21 Mar 2024 06:06:54 -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 1rnFJz-0002WM-Ts for qemu-devel@nongnu.org; Thu, 21 Mar 2024 06:06:51 -0400 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rnFJy-0007yO-7T for qemu-devel@nongnu.org; Thu, 21 Mar 2024 06:06:51 -0400 Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2d220e39907so11242871fa.1 for ; Thu, 21 Mar 2024 03:06:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711015608; x=1711620408; darn=nongnu.org; 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=A2dvM+euMDE0v28D1xjaFlsbAEAYgdfmVYQj+HIsXyM=; b=wD7fkTGSyL1WMoaiQ78jb40GiGEEoBFYzNxfpRvELPg0smw4W1/V9H+e3+7XB5QH1w ceQIkhu7WNwcAPLCZZhySqm3e0X6WKa4PEO7BDdtETvean+lRnJVdVngE2qC6dWlrWPc FqdW4QIYAy84s0hzKLMybu3jP4cnPROyHrvG646RmF7+ic0TYAgNhbwEQ7BQsxT8aHml s9kbiwtj/tlvArmUJYIEXCqe8HUokVpjqejr8X+UQnCfdRAs95eRmTnZ0qFXjbW8p24m +wvumGd9i5d0mJOaGlWUvpsmPJ0N2qt+bv/haB5hiWuPzNXXuqKeLQQ8vX+AgbyNI1QE ucgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711015608; x=1711620408; 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=A2dvM+euMDE0v28D1xjaFlsbAEAYgdfmVYQj+HIsXyM=; b=hp7K82qbPZkfxmfWKw5g9Z97b8K96d8lePjyZUJx87KCYz3znlWWWTTZCxCKh4Eaic pOcnBNA/Kf0sBGjq6DF/zhHm5YP7YAJ8oIjG/46zYwqxVCAxa2keE4EqBKc0kl3o6wWG cHP/q9iFrRiiL+P5J8cmXbHA6YNaTIxhE+zXEZw2gghhtAx5MesepQOZg+O4Uh5RqUuX zvRtHDx/10zv3grUgL1VttFzVa7cNVej4uuRDe5na8qZWKoYCkGQzP60bFKlCwhJQ4JU fauQrvqXPWCPgt/WFPDX0yBNYdHr6fG+Lddr7ysIc+bjMHztFoitCw0lHw3eeirqJCOc WS3g== X-Forwarded-Encrypted: i=1; AJvYcCX03Ay6twpGkhB08gPmUK5mzMjE173ck98SVTj8LogAgl1aY83nUplguruMr5KIvCxr69/tXMK2ovB5XO+dzEwHKBHdC8Q= X-Gm-Message-State: AOJu0YyEPh8BlZbxpxX0l05UPTejr6v+eBE2Vk7FvfKfheEFCV5H3ESL PfVplvGhVS7q3/zaoiOPbpbvQ8u2QRwqPKefe+xrIVYMmNCH55CH85kVs+Qry/s= X-Received: by 2002:a2e:8187:0:b0:2d4:5d56:e559 with SMTP id e7-20020a2e8187000000b002d45d56e559mr14298577ljg.47.1711015608437; Thu, 21 Mar 2024 03:06:48 -0700 (PDT) Received: from localhost.localdomain (10.red-88-29-188.dynamicip.rima-tde.net. [88.29.188.10]) by smtp.gmail.com with ESMTPSA id g14-20020a5d540e000000b0033e95bf4796sm16765659wrv.27.2024.03.21.03.06.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 21 Mar 2024 03:06:47 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Dongwon Kim , qemu-devel@nongnu.org Cc: Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Vivek Kasireddy , "Michael S. Tsirkin" , Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/3] ui/console: Introduce dpy_gl_dmabuf_get_height/width() helpers Date: Thu, 21 Mar 2024 11:06:33 +0100 Message-ID: <20240321100635.64950-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240321100635.64950-1-philmd@linaro.org> References: <20240321100635.64950-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::230; envelope-from=philmd@linaro.org; helo=mail-lj1-x230.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Dongwon Kim Signed-off-by: Dongwon Kim Message-Id: <20240320034229.3347130-1-dongwon.kim@intel.com> [PMD: Split patch in 3, part 1/3] Signed-off-by: Philippe Mathieu-Daudé --- include/ui/console.h | 2 ++ hw/display/virtio-gpu-udmabuf.c | 8 +++++--- hw/vfio/display.c | 9 ++++++--- ui/console.c | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index a4a49ffc64..a7f6cef26d 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -358,6 +358,8 @@ void dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf, bool have_hot, uint32_t hot_x, uint32_t hot_y); void dpy_gl_cursor_position(QemuConsole *con, uint32_t pos_x, uint32_t pos_y); +uint32_t dpy_gl_dmabuf_get_width(QemuDmaBuf *dmabuf); +uint32_t dpy_gl_dmabuf_get_height(QemuDmaBuf *dmabuf); void dpy_gl_release_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf); void dpy_gl_update(QemuConsole *con, diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c index d51184d658..d680e871c1 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-udmabuf.c @@ -206,20 +206,22 @@ int virtio_gpu_update_dmabuf(VirtIOGPU *g, { struct virtio_gpu_scanout *scanout = &g->parent_obj.scanout[scanout_id]; VGPUDMABuf *new_primary, *old_primary = NULL; + uint32_t width, height; new_primary = virtio_gpu_create_dmabuf(g, scanout_id, res, fb, r); if (!new_primary) { return -EINVAL; } + width = dpy_gl_dmabuf_get_width(&new_primary->buf); + height = dpy_gl_dmabuf_get_height(&new_primary->buf); + if (g->dmabuf.primary[scanout_id]) { old_primary = g->dmabuf.primary[scanout_id]; } g->dmabuf.primary[scanout_id] = new_primary; - qemu_console_resize(scanout->con, - new_primary->buf.width, - new_primary->buf.height); + qemu_console_resize(scanout->con, width, height); dpy_gl_scanout_dmabuf(scanout->con, &new_primary->buf); if (old_primary) { diff --git a/hw/vfio/display.c b/hw/vfio/display.c index 1aa440c663..c962e5f88f 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -286,6 +286,7 @@ static void vfio_display_dmabuf_update(void *opaque) VFIOPCIDevice *vdev = opaque; VFIODisplay *dpy = vdev->dpy; VFIODMABuf *primary, *cursor; + uint32_t width, height; bool free_bufs = false, new_cursor = false; primary = vfio_display_get_dmabuf(vdev, DRM_PLANE_TYPE_PRIMARY); @@ -296,10 +297,12 @@ static void vfio_display_dmabuf_update(void *opaque) return; } + width = dpy_gl_dmabuf_get_width(&primary->buf); + height = dpy_gl_dmabuf_get_height(&primary->buf); + if (dpy->dmabuf.primary != primary) { dpy->dmabuf.primary = primary; - qemu_console_resize(dpy->con, - primary->buf.width, primary->buf.height); + qemu_console_resize(dpy->con, width, height); dpy_gl_scanout_dmabuf(dpy->con, &primary->buf); free_bufs = true; } @@ -328,7 +331,7 @@ static void vfio_display_dmabuf_update(void *opaque) cursor->pos_updates = 0; } - dpy_gl_update(dpy->con, 0, 0, primary->buf.width, primary->buf.height); + dpy_gl_update(dpy->con, 0, 0, width, height); if (free_bufs) { vfio_display_free_dmabufs(vdev); diff --git a/ui/console.c b/ui/console.c index 832055675c..edabad64c0 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1190,6 +1190,24 @@ void dpy_gl_cursor_position(QemuConsole *con, } } +uint32_t dpy_gl_dmabuf_get_width(QemuDmaBuf *dmabuf) +{ + if (dmabuf) { + return dmabuf->width; + } + + return 0; +} + +uint32_t dpy_gl_dmabuf_get_height(QemuDmaBuf *dmabuf) +{ + if (dmabuf) { + return dmabuf->height; + } + + return 0; +} + void dpy_gl_release_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf) {