From nobody Fri May 17 07:08:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=chromium.org ARC-Seal: i=1; a=rsa-sha256; t=1696018522; cv=none; d=zohomail.com; s=zohoarc; b=mdWALazCDF4oCsVaFDCtYQIb0eSnFQnjqndFoXsHsREB+Kai/Vca+9kkclTrwwrlKkd3WpbU+yN7UnyVU+uBzPHwZyKzPLxpnhXNHBKSuF2ZnMnh/20hg7Dq+ofHOZqs0m8RWl8FXxvyYVg62rkpv9ru+GdSbkcI/g2b8YSaSJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696018522; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mLrky0Wzql+31hWr7YqeUz9asOXoxt2QiJxurTegr48=; b=VjgWOv19HHHUpZr3wCJd9TcFVRrjt9bYFYjDyNyU9nuloxFWYjPWIADInsPxEV59CdiZYG5YvTWntdrryuqI3FLOmCMqPtIvsX5Rqq+/ax0YSs7dT659r48vjaAHIEpjEDqSb2FWEKOzjtjFowQQ4ibQDSxvDRpj+XKWczbC0fE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696018522054759.363810522015; Fri, 29 Sep 2023 13:15:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmJs2-0007aR-48; Fri, 29 Sep 2023 16:13: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 1qmJs0-0007ZC-Dk for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:13:52 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qmJrx-0004Im-F8 for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:13:52 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-692ada71d79so10572179b3a.1 for ; Fri, 29 Sep 2023 13:13:49 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:a7:2:18fe:3fb1:d86b:1e68]) by smtp.gmail.com with ESMTPSA id t12-20020aa7938c000000b00686236718d8sm15267033pfe.41.2023.09.29.13.13.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 13:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696018426; x=1696623226; 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=mLrky0Wzql+31hWr7YqeUz9asOXoxt2QiJxurTegr48=; b=EPGBpWs8GtXhX1nD3r6XNwCZYhVJWcmPnlY/4d5Yv4Kax9KG5gtd5h1gZg5K/l9hpw jAsBzdnJN0sijklCwQSJ7a73LrSQO1gcbdWeTM5+lYnCRliiLQ2LrrEjhZr3T/oMnr7P YFgyNXlUW9GcQc2ouoQLjU9T0lmfRoyzNWxl4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696018426; x=1696623226; 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=mLrky0Wzql+31hWr7YqeUz9asOXoxt2QiJxurTegr48=; b=i0jxNq4LaARWDGzZzRQSCT2ZjPmRcbH3XVnkVYyMvmtOtn3vQ1q11D4HaiYESSTf3H D6UivPPYR4mdB99QXOsiZ9DBrTtjdbGyo/pfZLWVZUIKa2a9JmKWYYwKDWeVwX6lW35A W4KqvhyLnzFNRrLqGYWOEclzwaJmnGH3X4VumdF9kPCRgnPksCtP5ZyCKzNqMK+jCCxM RQaGBWgEZf9r4AxQNHEOy6n7683Anl6akQvd/+kB27PP9zifJGXQaRF4HnczlXesI5jx A19ZZGyGJjZBI1qa7G0Zhoo2DYKMoojk8atsNx+tUrDvJBM/E9Oravva+nVqjFpwmsKB Rpog== X-Gm-Message-State: AOJu0Yy3buc/6Y9lz45okhUnBDq2AYk1YTvvSUJJdJ8Zybk7e77cBk9e 0ce/g7N7a8g5wWCNbcDVKbDcMDUyibSF5HWTkRs= X-Google-Smtp-Source: AGHT+IG0n+tH2InT5BccFKE3dmsnV1yHUwC9iOhc993LTK2QRojdhSOq65KR+gjlwFXlOSIi9Q+Riw== X-Received: by 2002:a05:6a00:190d:b0:68e:2ef2:3379 with SMTP id y13-20020a056a00190d00b0068e2ef23379mr5186043pfi.15.1696018426307; Fri, 29 Sep 2023 13:13:46 -0700 (PDT) From: Gurchetan Singh To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, akihiko.odaki@gmail.com, ray.huang@amd.com, alex.bennee@linaro.org, shentey@gmail.com, hi@alyssa.is, ernunes@redhat.com, manos.pitsidianakis@linaro.org, philmd@linaro.org, mark.cave-ayland@ilande.co.uk Subject: [PATCH v14 1/9] virtio: Add shared memory capability Date: Fri, 29 Sep 2023 13:13:33 -0700 Message-Id: <20230929201341.332-2-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20230929201341.332-1-gurchetansingh@chromium.org> References: <20230929201341.332-1-gurchetansingh@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=gurchetansingh@chromium.org; helo=mail-pf1-x436.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, DKIMWL_WL_HIGH=-0.001, 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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @chromium.org) X-ZM-MESSAGEID: 1696018522613100003 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Define a new capability type 'VIRTIO_PCI_CAP_SHARED_MEMORY_CFG' to allow defining shared memory regions with sizes and offsets of 2^32 and more. Multiple instances of the capability are allowed and distinguished by a device-specific 'id'. Signed-off-by: Dr. David Alan Gilbert Signed-off-by: Antonio Caggiano Signed-off-by: Gurchetan Singh Tested-by: Alyssa Ross Tested-by: Huang Rui Tested-by: Akihiko Odaki Acked-by: Huang Rui Reviewed-by: Gurchetan Singh Reviewed-by: Akihiko Odaki --- hw/virtio/virtio-pci.c | 18 ++++++++++++++++++ include/hw/virtio/virtio-pci.h | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index edbc0daa18..da8c9ea12d 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1435,6 +1435,24 @@ static int virtio_pci_add_mem_cap(VirtIOPCIProxy *pr= oxy, return offset; } =20 +int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy, + uint8_t bar, uint64_t offset, uint64_t length, + uint8_t id) +{ + struct virtio_pci_cap64 cap =3D { + .cap.cap_len =3D sizeof cap, + .cap.cfg_type =3D VIRTIO_PCI_CAP_SHARED_MEMORY_CFG, + }; + + cap.cap.bar =3D bar; + cap.cap.length =3D cpu_to_le32(length); + cap.length_hi =3D cpu_to_le32(length >> 32); + cap.cap.offset =3D cpu_to_le32(offset); + cap.offset_hi =3D cpu_to_le32(offset >> 32); + cap.cap.id =3D id; + return virtio_pci_add_mem_cap(proxy, &cap.cap); +} + static uint64_t virtio_pci_common_read(void *opaque, hwaddr addr, unsigned size) { diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index ab2051b64b..5a3f182f99 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -264,4 +264,8 @@ unsigned virtio_pci_optimal_num_queues(unsigned fixed_q= ueues); void virtio_pci_set_guest_notifier_fd_handler(VirtIODevice *vdev, VirtQueu= e *vq, int n, bool assign, bool with_irqfd); + +int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy, uint8_t bar, uint64_t of= fset, + uint64_t length, uint8_t id); + #endif --=20 2.42.0.582.g8ccd20d70d-goog From nobody Fri May 17 07:08:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=chromium.org ARC-Seal: i=1; a=rsa-sha256; t=1696018476; cv=none; d=zohomail.com; s=zohoarc; b=j85jBcT23DrzWo8vmMTaHEt4JDOjg6xJtqRiFqqX7ke9t3RjktMTgJIzQjo5CXW/cC06NG5y4h9IUlFnsFrJ5qyeGtwEn7HmnobZOvv8jXFZ9CSkThwliXO1qYa25NBKOtQPmbDe36Zd5od4f+nba6oHqvVMvu2ftyvg+QVt8V0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696018476; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gnAgBdZxEHcM2Wv5r12p9/EnZfi2baiMmkJIhgiWfNY=; b=how4HWG/0CFz2shM3DbSOSv3TcTQWhIkeGwAYh6SlZuPR/vWu+xu9pqfiuZtA/ll9Dthl2HzrWKJta5Fv3fIr0Ga9cFJ8XIpoXQdA2AE8eAd3u0R8HNGYeK8EODkkjaRVpURWlhCZgEzckLZnTYKZFBHg8modG76EVNeevVWjiU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696018476727358.674834641236; Fri, 29 Sep 2023 13:14:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmJs0-0007ZG-J7; Fri, 29 Sep 2023 16:13:52 -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 1qmJry-0007Yr-VC for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:13:51 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qmJrx-0004Iu-BT for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:13:50 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-692c70bc440so9242220b3a.3 for ; Fri, 29 Sep 2023 13:13:49 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:a7:2:18fe:3fb1:d86b:1e68]) by smtp.gmail.com with ESMTPSA id t12-20020aa7938c000000b00686236718d8sm15267033pfe.41.2023.09.29.13.13.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 13:13:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696018427; x=1696623227; 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=gnAgBdZxEHcM2Wv5r12p9/EnZfi2baiMmkJIhgiWfNY=; b=HGrq1y9JTFTj3QrfB5VTkIFn3w4nx5UGPxd7W8oiAKVrX++/ya9X8loRmfO71H9KxU nJQhMLr8dmB5uCEJPAyH6AvTR9o1giPa+bcXhXyNRyhKuudBGJpKIKJxxSUcRWHGg/Ih hoRZdLCmy6iT4usR1mdM3fkBXNUL5aLh7tCx0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696018427; x=1696623227; 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=gnAgBdZxEHcM2Wv5r12p9/EnZfi2baiMmkJIhgiWfNY=; b=VoOnIrj5Y8Du/qCdkKBsW6nxFHpkrFzfy6xakacHKWU4/4QX7S59zKdULkWuvDI9kz GtIHrFkepoXY4020p+xh1vr8mfxQ0uDHVimlTeZuEO9XrELbprmcBSMTsu49Dsgl3uj6 V20XB/Ln0xLd++lfO8fzMDo6TSWgEkq7FssWUpN6QrPtjrqN+bT27EHsE1ZTcweB1f0u h4E1aOYAOqRVNsRR9U0B2lBmyje7YzjILlC/wo1sXv24ZRqV9xvs0j8l5HnJyFl7I4/q Ag4pMbdRw/vQ+zUKKMrL30LxFy7iPMA9VpWJREXjo4JqLofavjn7hWJtA8jS7aFpDFDy sD5A== X-Gm-Message-State: AOJu0YyvXuJUUU+onBcuywdBq9wMqllJKpAHB9vlxvDnWcjlm4/FB6MR psVRC0R3w+vEl2iw2jnhuKUhDLwrogtpwMd9RB4= X-Google-Smtp-Source: AGHT+IH5onPPD+nVyxernlkaoP7D3MdzPg4uas0iiD6N6xiYhTqVM+TAfiK6SUgawe4l/zD2APqiRg== X-Received: by 2002:a05:6a00:4143:b0:68f:d35d:217e with SMTP id bv3-20020a056a00414300b0068fd35d217emr4723432pfb.2.1696018427535; Fri, 29 Sep 2023 13:13:47 -0700 (PDT) From: Gurchetan Singh To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, akihiko.odaki@gmail.com, ray.huang@amd.com, alex.bennee@linaro.org, shentey@gmail.com, hi@alyssa.is, ernunes@redhat.com, manos.pitsidianakis@linaro.org, philmd@linaro.org, mark.cave-ayland@ilande.co.uk Subject: [PATCH v14 2/9] virtio-gpu: CONTEXT_INIT feature Date: Fri, 29 Sep 2023 13:13:34 -0700 Message-Id: <20230929201341.332-3-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20230929201341.332-1-gurchetansingh@chromium.org> References: <20230929201341.332-1-gurchetansingh@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=gurchetansingh@chromium.org; helo=mail-pf1-x429.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, DKIMWL_WL_HIGH=-0.001, 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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @chromium.org) X-ZM-MESSAGEID: 1696018478418100001 From: Antonio Caggiano The feature can be enabled when a backend wants it. Signed-off-by: Antonio Caggiano Signed-off-by: Gurchetan Singh Tested-by: Alyssa Ross Tested-by: Akihiko Odaki Tested-by: Huang Rui Acked-by: Huang Rui Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Akihiko Odaki --- hw/display/virtio-gpu-base.c | 3 +++ include/hw/virtio/virtio-gpu.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c index ca1fb7b16f..4f2b0ba1f3 100644 --- a/hw/display/virtio-gpu-base.c +++ b/hw/display/virtio-gpu-base.c @@ -232,6 +232,9 @@ virtio_gpu_base_get_features(VirtIODevice *vdev, uint64= _t features, if (virtio_gpu_blob_enabled(g->conf)) { features |=3D (1 << VIRTIO_GPU_F_RESOURCE_BLOB); } + if (virtio_gpu_context_init_enabled(g->conf)) { + features |=3D (1 << VIRTIO_GPU_F_CONTEXT_INIT); + } =20 return features; } diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 390c4642b8..8377c365ef 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -93,6 +93,7 @@ enum virtio_gpu_base_conf_flags { VIRTIO_GPU_FLAG_EDID_ENABLED, VIRTIO_GPU_FLAG_DMABUF_ENABLED, VIRTIO_GPU_FLAG_BLOB_ENABLED, + VIRTIO_GPU_FLAG_CONTEXT_INIT_ENABLED, }; =20 #define virtio_gpu_virgl_enabled(_cfg) \ @@ -105,6 +106,8 @@ enum virtio_gpu_base_conf_flags { (_cfg.flags & (1 << VIRTIO_GPU_FLAG_DMABUF_ENABLED)) #define virtio_gpu_blob_enabled(_cfg) \ (_cfg.flags & (1 << VIRTIO_GPU_FLAG_BLOB_ENABLED)) +#define virtio_gpu_context_init_enabled(_cfg) \ + (_cfg.flags & (1 << VIRTIO_GPU_FLAG_CONTEXT_INIT_ENABLED)) =20 struct virtio_gpu_base_conf { uint32_t max_outputs; --=20 2.42.0.582.g8ccd20d70d-goog From nobody Fri May 17 07:08:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=chromium.org ARC-Seal: i=1; a=rsa-sha256; t=1696018550; cv=none; d=zohomail.com; s=zohoarc; b=OyKCZcfR1POmlt7vKaIvWQDr4RwyCHUv94ig5TXY7PcKEpXirfP7VPCwMA/HdNXE5UuwlkiKDuvAcVWhsbU6141on0RyMjFU1LQBAC13CcH94cTwDWThOZnL1f0vLlHjRk+oPFqtuxjHMoh/Jvx6b1AligYa+vuYyQb3c4IluWs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696018550; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IR9BQG2wxNDQ3y7IH88opVdp9fuZFvMZziomIldGb6w=; b=GNrwbL5Bt1mk1QOkdNBiYvlUieFb0Aqxq30Rip4BaUh+uzRGHEnmGilwMQHFVWJLorg/T16umwewObMcwCtHW+DiLgFnnKz1tzLj6eIXVYHdmWIRvybxw93WeZYmdewBKceTRNsBUJ8AGmfJZsJ+bNY5cp6igyrZQgsX3X6gsNc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696018550441175.2870897774941; Fri, 29 Sep 2023 13:15:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmJs2-0007ac-Ih; Fri, 29 Sep 2023 16:13: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 1qmJs0-0007ZF-HB for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:13:52 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qmJry-0004J7-Fv for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:13:52 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-690d2441b95so818489b3a.1 for ; Fri, 29 Sep 2023 13:13:50 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:a7:2:18fe:3fb1:d86b:1e68]) by smtp.gmail.com with ESMTPSA id t12-20020aa7938c000000b00686236718d8sm15267033pfe.41.2023.09.29.13.13.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 13:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696018429; x=1696623229; 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=IR9BQG2wxNDQ3y7IH88opVdp9fuZFvMZziomIldGb6w=; b=fVLkB56m8nL/xWCvfZV3/HikM1ZrdgOjm/m9MNSB57BcIaTaHBEvHGcTglfRtAUcbF KxpFfGu25HD+WMLqVpo7722iWxlrZvv354slma5KIETb8aupWAKu8VN2pvlp5XopNMsM 4M0qUL/pZYP83TaXiOTXG7HY+c0MP5JPD8AW0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696018429; x=1696623229; 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=IR9BQG2wxNDQ3y7IH88opVdp9fuZFvMZziomIldGb6w=; b=IN0Yi6+nEWmOiYb+y30ZNPD2HrhWfDUEsEhri6CkGVJwfQ6nhUlul70K3rzytcXlMA wY0FhdAExeBSeVIs6KbtSWu6Gwqjou/XdN55p8+9EQaKIzzl6OJvdlfktZKYHkqiapDQ 8wcRpdjP2dRcGLHEoQoY9ZJXny+xJy/lzilzgn8oWhUc27+TodhuloiuPSoZUO90mwgT OBtaRuDrRgnP4gb2HTCROx96S/mjuMfjljtiY7PqHdzGKTuEnGE7n0CMGpGhXG3+lMs8 izBJSrNZrVrUVFxcdOnyxjYfnH0oSjkbrr8CFZgz1hDkJHmHF4tUpLYZe5cUrS87pv5g IEXg== X-Gm-Message-State: AOJu0YzvRTVRCiPNEWypUnGG6gnW6bMmBcY+8OaSJWCsrrYCDOBHm3Sh 9EymHYBnHr2HKUTCfljpZEYIh5vPOewg77BGhS4= X-Google-Smtp-Source: AGHT+IFS4o2L8Yk1nsrUHN1/LjaoaYRg21lZFt7qEMwDmsTYtTGQ8SmELZyZZ8oFydtSvyIK6CPdUg== X-Received: by 2002:a05:6a00:8c4:b0:68f:d44c:22f8 with SMTP id s4-20020a056a0008c400b0068fd44c22f8mr8581526pfu.1.1696018428790; Fri, 29 Sep 2023 13:13:48 -0700 (PDT) From: Gurchetan Singh To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, akihiko.odaki@gmail.com, ray.huang@amd.com, alex.bennee@linaro.org, shentey@gmail.com, hi@alyssa.is, ernunes@redhat.com, manos.pitsidianakis@linaro.org, philmd@linaro.org, mark.cave-ayland@ilande.co.uk Subject: [PATCH v14 3/9] virtio-gpu: hostmem Date: Fri, 29 Sep 2023 13:13:35 -0700 Message-Id: <20230929201341.332-4-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20230929201341.332-1-gurchetansingh@chromium.org> References: <20230929201341.332-1-gurchetansingh@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=gurchetansingh@chromium.org; helo=mail-pf1-x429.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, DKIMWL_WL_HIGH=-0.001, 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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @chromium.org) X-ZM-MESSAGEID: 1696018551585100003 Content-Type: text/plain; charset="utf-8" From: Gerd Hoffmann Use VIRTIO_GPU_SHM_ID_HOST_VISIBLE as id for virtio-gpu. Signed-off-by: Antonio Caggiano Tested-by: Alyssa Ross Tested-by: Akihiko Odaki Tested-by: Huang Rui Acked-by: Huang Rui Acked-by: Michael S. Tsirkin Reviewed-by: Akihiko Odaki --- hw/display/virtio-gpu-pci.c | 14 ++++++++++++++ hw/display/virtio-gpu.c | 1 + hw/display/virtio-vga.c | 33 ++++++++++++++++++++++++--------- include/hw/virtio/virtio-gpu.h | 5 +++++ 4 files changed, 44 insertions(+), 9 deletions(-) diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c index 93f214ff58..da6a99f038 100644 --- a/hw/display/virtio-gpu-pci.c +++ b/hw/display/virtio-gpu-pci.c @@ -33,6 +33,20 @@ static void virtio_gpu_pci_base_realize(VirtIOPCIProxy *= vpci_dev, Error **errp) DeviceState *vdev =3D DEVICE(g); int i; =20 + if (virtio_gpu_hostmem_enabled(g->conf)) { + vpci_dev->msix_bar_idx =3D 1; + vpci_dev->modern_mem_bar_idx =3D 2; + memory_region_init(&g->hostmem, OBJECT(g), "virtio-gpu-hostmem", + g->conf.hostmem); + pci_register_bar(&vpci_dev->pci_dev, 4, + PCI_BASE_ADDRESS_SPACE_MEMORY | + PCI_BASE_ADDRESS_MEM_PREFETCH | + PCI_BASE_ADDRESS_MEM_TYPE_64, + &g->hostmem); + virtio_pci_add_shm_cap(vpci_dev, 4, 0, g->conf.hostmem, + VIRTIO_GPU_SHM_ID_HOST_VISIBLE); + } + virtio_pci_force_virtio_1(vpci_dev); if (!qdev_realize(vdev, BUS(&vpci_dev->bus), errp)) { return; diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 93857ad523..5585558855 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1511,6 +1511,7 @@ static Property virtio_gpu_properties[] =3D { 256 * MiB), DEFINE_PROP_BIT("blob", VirtIOGPU, parent_obj.conf.flags, VIRTIO_GPU_FLAG_BLOB_ENABLED, false), + DEFINE_PROP_SIZE("hostmem", VirtIOGPU, parent_obj.conf.hostmem, 0), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index e6fb0aa876..c8552ff760 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -115,17 +115,32 @@ static void virtio_vga_base_realize(VirtIOPCIProxy *v= pci_dev, Error **errp) pci_register_bar(&vpci_dev->pci_dev, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, &vga->vram); =20 - /* - * Configure virtio bar and regions - * - * We use bar #2 for the mmio regions, to be compatible with stdvga. - * virtio regions are moved to the end of bar #2, to make room for - * the stdvga mmio registers at the start of bar #2. - */ - vpci_dev->modern_mem_bar_idx =3D 2; - vpci_dev->msix_bar_idx =3D 4; vpci_dev->modern_io_bar_idx =3D 5; =20 + if (!virtio_gpu_hostmem_enabled(g->conf)) { + /* + * Configure virtio bar and regions + * + * We use bar #2 for the mmio regions, to be compatible with stdvg= a. + * virtio regions are moved to the end of bar #2, to make room for + * the stdvga mmio registers at the start of bar #2. + */ + vpci_dev->modern_mem_bar_idx =3D 2; + vpci_dev->msix_bar_idx =3D 4; + } else { + vpci_dev->msix_bar_idx =3D 1; + vpci_dev->modern_mem_bar_idx =3D 2; + memory_region_init(&g->hostmem, OBJECT(g), "virtio-gpu-hostmem", + g->conf.hostmem); + pci_register_bar(&vpci_dev->pci_dev, 4, + PCI_BASE_ADDRESS_SPACE_MEMORY | + PCI_BASE_ADDRESS_MEM_PREFETCH | + PCI_BASE_ADDRESS_MEM_TYPE_64, + &g->hostmem); + virtio_pci_add_shm_cap(vpci_dev, 4, 0, g->conf.hostmem, + VIRTIO_GPU_SHM_ID_HOST_VISIBLE); + } + if (!(vpci_dev->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ)) { /* * with page-per-vq=3Doff there is no padding space we can use diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 8377c365ef..de4f624e94 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -108,12 +108,15 @@ enum virtio_gpu_base_conf_flags { (_cfg.flags & (1 << VIRTIO_GPU_FLAG_BLOB_ENABLED)) #define virtio_gpu_context_init_enabled(_cfg) \ (_cfg.flags & (1 << VIRTIO_GPU_FLAG_CONTEXT_INIT_ENABLED)) +#define virtio_gpu_hostmem_enabled(_cfg) \ + (_cfg.hostmem > 0) =20 struct virtio_gpu_base_conf { uint32_t max_outputs; uint32_t flags; uint32_t xres; uint32_t yres; + uint64_t hostmem; }; =20 struct virtio_gpu_ctrl_command { @@ -137,6 +140,8 @@ struct VirtIOGPUBase { int renderer_blocked; int enable; =20 + MemoryRegion hostmem; + struct virtio_gpu_scanout scanout[VIRTIO_GPU_MAX_SCANOUTS]; =20 int enabled_output_bitmask; --=20 2.42.0.582.g8ccd20d70d-goog From nobody Fri May 17 07:08:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=chromium.org ARC-Seal: i=1; a=rsa-sha256; t=1696018502; cv=none; d=zohomail.com; s=zohoarc; b=S0B4szIW/dsAwrZjpXnSjIr16dygZsEMSWrtI3cmV/hPdyx5Osra5jCXfHhAAx/B8pwt6CcfkmvCa+X+sNst/h/E4B86z4xPTilG4/5/siujQ+RyPZpUfekuPbPpc+xygk7pQn7Ue7srPymLcZxWAFHz4jY/gkpcG8wcTTpiyHI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696018502; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dsUxJ0JWKiJRP+qUHF8H3oEkrNI9IRqJMBnZ6+APuxc=; b=MtUviMBgiVNYqFSxseJJjYA2StigRvwRyK23aWQPGshb9//bKXRyhDFWlu77pURGwEJUTCLlbP3hBAHdO9fEy9O+w7O48ClPcogKmdp9EVp5jt8KRpLqdf6dgBQuQOxRzotxQrbMUq+1xyrrTf43CF1v0pev6Xo4WjKvjfQCB+w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696018502414230.14884648089537; Fri, 29 Sep 2023 13:15:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmJsH-0007fR-R3; Fri, 29 Sep 2023 16:14:09 -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 1qmJsE-0007ew-OA for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:14:06 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qmJrz-0004JX-Uq for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:14:06 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-69335ddbe16so4074950b3a.1 for ; Fri, 29 Sep 2023 13:13:51 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:a7:2:18fe:3fb1:d86b:1e68]) by smtp.gmail.com with ESMTPSA id t12-20020aa7938c000000b00686236718d8sm15267033pfe.41.2023.09.29.13.13.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 13:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696018430; x=1696623230; 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=dsUxJ0JWKiJRP+qUHF8H3oEkrNI9IRqJMBnZ6+APuxc=; b=gEr48jIznNf4qXjBQgEhY2IFcoB0kM7MTIEGYYZ0L4HneHCP0fvooS9sMAUL+bDrDJ 8GbFC3wz6w8ro4XEcSageBd7E0kt6j92hzpuxQK/eTFze+T7Z9GY9XUOEjTQ5h8K5F0z 2Edt8qKElgLcRmDBO63kdmEum4y0cm3CPdcJ4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696018430; x=1696623230; 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=dsUxJ0JWKiJRP+qUHF8H3oEkrNI9IRqJMBnZ6+APuxc=; b=pwZD/4AzU9aGGsFT8LGMcDC8/agzUhqpoPDuS3BkfGndpjlwAczyZxxs/8/+nHtUwz VTLceiITlQo/bSHYIzZuv681fsAqdUziFXhP/UN+0TUXnzDoipBuYpRvbgWYGFGlCXn6 SK7gEutSxSRSeBM/gC9xBWoErNsx0FrYJ+33OJTuApDnop1H64nspUzBDGC++kGkHlDn aNevN/1eTCtLV4uFgiIu0CzYIfUGGeFx1s/rvPCN1nFIRfism6VzcVyf1Cm1766pwY8R xll00GcjwxyuG1z83NyNXFazQk/c0NOehMa/eEk4rY5NnncC+/E3tTygahipTDNZZEvJ yPng== X-Gm-Message-State: AOJu0YyaNdxr4ZzpqTr2AY22pVkFjpVvoKJgQIjcbxvpIP5ABFmZolKf 03RSPAbgPzwkSNIraY0nryrYpGiRM0mWNjm0EL8= X-Google-Smtp-Source: AGHT+IGONHlKvRNueeU9+kpmTNSQ1eYewY0UU6FiHWQ3gJ+e4QXyegvMl9ubqmHTD828bRXNaJHEUQ== X-Received: by 2002:a05:6a21:60f:b0:153:73ec:fe70 with SMTP id ll15-20020a056a21060f00b0015373ecfe70mr4704187pzb.13.1696018430026; Fri, 29 Sep 2023 13:13:50 -0700 (PDT) From: Gurchetan Singh To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, akihiko.odaki@gmail.com, ray.huang@amd.com, alex.bennee@linaro.org, shentey@gmail.com, hi@alyssa.is, ernunes@redhat.com, manos.pitsidianakis@linaro.org, philmd@linaro.org, mark.cave-ayland@ilande.co.uk Subject: [PATCH v14 4/9] virtio-gpu: blob prep Date: Fri, 29 Sep 2023 13:13:36 -0700 Message-Id: <20230929201341.332-5-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20230929201341.332-1-gurchetansingh@chromium.org> References: <20230929201341.332-1-gurchetansingh@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=gurchetansingh@chromium.org; helo=mail-pf1-x42c.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, DKIMWL_WL_HIGH=-0.001, 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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @chromium.org) X-ZM-MESSAGEID: 1696018503449100001 Content-Type: text/plain; charset="utf-8" From: Antonio Caggiano This adds preparatory functions needed to: - decode blob cmds - tracking iovecs Signed-off-by: Antonio Caggiano Signed-off-by: Dmitry Osipenko Signed-off-by: Gurchetan Singh Tested-by: Alyssa Ross Tested-by: Emmanouil Pitsidianakis Tested-by: Akihiko Odaki Tested-by: Huang Rui Acked-by: Huang Rui Reviewed-by: Emmanouil Pitsidianakis Reviewed-by: Akihiko Odaki --- hw/display/virtio-gpu.c | 10 +++------- include/hw/virtio/virtio-gpu-bswap.h | 15 +++++++++++++++ include/hw/virtio/virtio-gpu.h | 5 +++++ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 5585558855..be16efbd38 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -33,15 +33,11 @@ =20 #define VIRTIO_GPU_VM_VERSION 1 =20 -static struct virtio_gpu_simple_resource* -virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id); static struct virtio_gpu_simple_resource * virtio_gpu_find_check_resource(VirtIOGPU *g, uint32_t resource_id, bool require_backing, const char *caller, uint32_t *error); =20 -static void virtio_gpu_cleanup_mapping(VirtIOGPU *g, - struct virtio_gpu_simple_resource *= res); static void virtio_gpu_reset_bh(void *opaque); =20 void virtio_gpu_update_cursor_data(VirtIOGPU *g, @@ -116,7 +112,7 @@ static void update_cursor(VirtIOGPU *g, struct virtio_g= pu_update_cursor *cursor) cursor->resource_id ? 1 : 0); } =20 -static struct virtio_gpu_simple_resource * +struct virtio_gpu_simple_resource * virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id) { struct virtio_gpu_simple_resource *res; @@ -904,8 +900,8 @@ void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g, g_free(iov); } =20 -static void virtio_gpu_cleanup_mapping(VirtIOGPU *g, - struct virtio_gpu_simple_resource *= res) +void virtio_gpu_cleanup_mapping(VirtIOGPU *g, + struct virtio_gpu_simple_resource *res) { virtio_gpu_cleanup_mapping_iov(g, res->iov, res->iov_cnt); res->iov =3D NULL; diff --git a/include/hw/virtio/virtio-gpu-bswap.h b/include/hw/virtio/virti= o-gpu-bswap.h index 637a0585d0..dd1975e2d4 100644 --- a/include/hw/virtio/virtio-gpu-bswap.h +++ b/include/hw/virtio/virtio-gpu-bswap.h @@ -70,6 +70,21 @@ virtio_gpu_create_blob_bswap(struct virtio_gpu_resource_= create_blob *cblob) le64_to_cpus(&cblob->size); } =20 +static inline void +virtio_gpu_map_blob_bswap(struct virtio_gpu_resource_map_blob *mblob) +{ + virtio_gpu_ctrl_hdr_bswap(&mblob->hdr); + le32_to_cpus(&mblob->resource_id); + le64_to_cpus(&mblob->offset); +} + +static inline void +virtio_gpu_unmap_blob_bswap(struct virtio_gpu_resource_unmap_blob *ublob) +{ + virtio_gpu_ctrl_hdr_bswap(&ublob->hdr); + le32_to_cpus(&ublob->resource_id); +} + static inline void virtio_gpu_scanout_blob_bswap(struct virtio_gpu_set_scanout_blob *ssb) { diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index de4f624e94..55973e112f 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -257,6 +257,9 @@ void virtio_gpu_base_fill_display_info(VirtIOGPUBase *g, void virtio_gpu_base_generate_edid(VirtIOGPUBase *g, int scanout, struct virtio_gpu_resp_edid *edid); /* virtio-gpu.c */ +struct virtio_gpu_simple_resource * +virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id); + void virtio_gpu_ctrl_response(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd, struct virtio_gpu_ctrl_hdr *resp, @@ -275,6 +278,8 @@ int virtio_gpu_create_mapping_iov(VirtIOGPU *g, uint32_t *niov); void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g, struct iovec *iov, uint32_t count); +void virtio_gpu_cleanup_mapping(VirtIOGPU *g, + struct virtio_gpu_simple_resource *res); void virtio_gpu_process_cmdq(VirtIOGPU *g); void virtio_gpu_device_realize(DeviceState *qdev, Error **errp); void virtio_gpu_reset(VirtIODevice *vdev); --=20 2.42.0.582.g8ccd20d70d-goog From nobody Fri May 17 07:08:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=chromium.org ARC-Seal: i=1; a=rsa-sha256; t=1696018476; cv=none; d=zohomail.com; s=zohoarc; b=caBf47yYIHGEx+ddbj6dYy5gT/Be49s7SMUgEN+Xuc3iIeF7af9sF4YCILSguafxP6C8O3DmENcqiNpzjRIIF0sbtuibid4qLXVcX/nykZjvLelVSqAJrLJhcF6/DYFIkEvUYxNqzEDuhBCw2FnfC/xI/qs1o6s0T+Z+wyxbR7g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696018476; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=se6fWVUXglAfgn2bx9AjYw+O1pSmlqb6dDvvl8grVio=; b=P5hrhoXS8MzMJanbzUMR72NHHJSJy+BlR109uEy1cLm/E5PYgj4PyvEXbXZhHVBzxj6W0+Y6AV4xPHplzW0B/YiT70gdHJKGRlOS0Bw+cauSeSzNiodwmIvX2zwr2dPuSrFisGCXaa3aC9cIPCazI3K21oBMKu4VSl8kYJVvX1U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169601847677258.46883561337211; Fri, 29 Sep 2023 13:14:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmJs9-0007bw-Mt; Fri, 29 Sep 2023 16:14:01 -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 1qmJs8-0007bZ-Sa for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:14:00 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qmJs0-0004Jo-UX for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:14:00 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6934202b8bdso3372559b3a.1 for ; Fri, 29 Sep 2023 13:13:52 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:a7:2:18fe:3fb1:d86b:1e68]) by smtp.gmail.com with ESMTPSA id t12-20020aa7938c000000b00686236718d8sm15267033pfe.41.2023.09.29.13.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 13:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696018431; x=1696623231; 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=se6fWVUXglAfgn2bx9AjYw+O1pSmlqb6dDvvl8grVio=; b=Jz/cMjnt0CbeNnUz284ikR+wBlVPRRm4L59cO6liM8pk+qy0sK4TTkqj9FFqMEUErM fXfR4W04/69BMYvgg+2Ae/4p/eHtS0rWYdE2Pe0dpNm1IGC6G/HEmO9owhAbfsPIEJBw jUnWimHpqo9sAVZXXUKY9Svs5SKOQwmDOryd8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696018431; x=1696623231; 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=se6fWVUXglAfgn2bx9AjYw+O1pSmlqb6dDvvl8grVio=; b=fOn5/xGVHQ3BCLcEGVJPcj6L9ctChupcvgaYjGRlzKPkpdp2FzFlrlQquS94w7mu8/ i0B8vJnx7mawCqOo6aW8VovQ12WP+KKoGzvWb8Liycw57n+lzJ991d1Iv4eMcDp0kHLi YdoighV6eegO8GvlO65K076PlTkiUvm0GQnKoSZTRuIUpkPWXVQo0IZC3GnTPtMFI8eC 6NKM2bNSs276S2Gfg+kanBvVkfd9nhAHwWzqNaeug7DTVSf6AbegkoxJGtAbBdHGaz27 m3PbLyAmwcJw1bjV2TMC3fFR5Ul/63kg9FE4YwIcvgI3KH50VxGD/RkZhMxEJ3G1ogK6 R2gg== X-Gm-Message-State: AOJu0YwXjB4jAFWzl2IjBV9OLkS6VKCBW3JZRYj3B6xC4dtI7fqDMwOI vhnW8WaBd9kBzQJEA83SDm1ZccTJIj8dYsAdOR4= X-Google-Smtp-Source: AGHT+IF4f7ly0e/A79NXgPpIVb3E/HbhrSvs+tByMdYWsSx6XcdyEU2C8Wme1w5JujPMaT0w4ylrdQ== X-Received: by 2002:a05:6a21:9984:b0:159:beec:79ba with SMTP id ve4-20020a056a21998400b00159beec79bamr6109064pzb.2.1696018431249; Fri, 29 Sep 2023 13:13:51 -0700 (PDT) From: Gurchetan Singh To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, akihiko.odaki@gmail.com, ray.huang@amd.com, alex.bennee@linaro.org, shentey@gmail.com, hi@alyssa.is, ernunes@redhat.com, manos.pitsidianakis@linaro.org, philmd@linaro.org, mark.cave-ayland@ilande.co.uk Subject: [PATCH v14 5/9] gfxstream + rutabaga prep: added need defintions, fields, and options Date: Fri, 29 Sep 2023 13:13:37 -0700 Message-Id: <20230929201341.332-6-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20230929201341.332-1-gurchetansingh@chromium.org> References: <20230929201341.332-1-gurchetansingh@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=gurchetansingh@chromium.org; helo=mail-pf1-x431.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, DKIMWL_WL_HIGH=-0.001, 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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @chromium.org) X-ZM-MESSAGEID: 1696018478453100003 Content-Type: text/plain; charset="utf-8" This modifies the common virtio-gpu.h file have the fields and defintions needed by gfxstream/rutabaga, by VirtioGpuRutabaga. Signed-off-by: Gurchetan Singh Tested-by: Alyssa Ross Tested-by: Emmanouil Pitsidianakis Tested-by: Akihiko Odaki Reviewed-by: Emmanouil Pitsidianakis Reviewed-by: Antonio Caggiano Reviewed-by: Akihiko Odaki --- include/hw/virtio/virtio-gpu.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 55973e112f..39018377d2 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -38,6 +38,9 @@ OBJECT_DECLARE_SIMPLE_TYPE(VirtIOGPUGL, VIRTIO_GPU_GL) #define TYPE_VHOST_USER_GPU "vhost-user-gpu" OBJECT_DECLARE_SIMPLE_TYPE(VhostUserGPU, VHOST_USER_GPU) =20 +#define TYPE_VIRTIO_GPU_RUTABAGA "virtio-gpu-rutabaga-device" +OBJECT_DECLARE_SIMPLE_TYPE(VirtIOGPURutabaga, VIRTIO_GPU_RUTABAGA) + struct virtio_gpu_simple_resource { uint32_t resource_id; uint32_t width; @@ -94,6 +97,7 @@ enum virtio_gpu_base_conf_flags { VIRTIO_GPU_FLAG_DMABUF_ENABLED, VIRTIO_GPU_FLAG_BLOB_ENABLED, VIRTIO_GPU_FLAG_CONTEXT_INIT_ENABLED, + VIRTIO_GPU_FLAG_RUTABAGA_ENABLED, }; =20 #define virtio_gpu_virgl_enabled(_cfg) \ @@ -108,6 +112,8 @@ enum virtio_gpu_base_conf_flags { (_cfg.flags & (1 << VIRTIO_GPU_FLAG_BLOB_ENABLED)) #define virtio_gpu_context_init_enabled(_cfg) \ (_cfg.flags & (1 << VIRTIO_GPU_FLAG_CONTEXT_INIT_ENABLED)) +#define virtio_gpu_rutabaga_enabled(_cfg) \ + (_cfg.flags & (1 << VIRTIO_GPU_FLAG_RUTABAGA_ENABLED)) #define virtio_gpu_hostmem_enabled(_cfg) \ (_cfg.hostmem > 0) =20 @@ -232,6 +238,27 @@ struct VhostUserGPU { bool backend_blocked; }; =20 +#define MAX_SLOTS 4096 + +struct MemoryRegionInfo { + int used; + MemoryRegion mr; + uint32_t resource_id; +}; + +struct rutabaga; + +struct VirtIOGPURutabaga { + VirtIOGPU parent_obj; + struct MemoryRegionInfo memory_regions[MAX_SLOTS]; + uint64_t capset_mask; + char *wayland_socket_path; + char *wsi; + bool headless; + uint32_t num_capsets; + struct rutabaga *rutabaga; +}; + #define VIRTIO_GPU_FILL_CMD(out) do { \ size_t s; \ s =3D iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, 0, \ --=20 2.42.0.582.g8ccd20d70d-goog From nobody Fri May 17 07:08:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=chromium.org ARC-Seal: i=1; a=rsa-sha256; t=1696018476; cv=none; d=zohomail.com; s=zohoarc; b=g6yR+/8l5QJqkaRHo0oOCAICoc8Vh4SDpQ0gtcQnCj4JDwbNgGoU9DkzHp1unxUFfdCpUDnEz5fqe5wFh7xB5jJZ66bFKVFUFDfw4SFyrr0BA+uI45Io18U2Vzt+Xxn1eliNtCy0HotlsParBBXnmSWWgKmDsix3HIP58n0Ue8Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696018476; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mVmJd2wKpGqumt5HoBL44gvI+3rXVqW9cYrJR7zddHY=; b=XFnUpl0PsI0lKVtjzQWHbGXyeFQtOhki5hwbOOcNYYufTiQKddnXT/29WU9syI8D7hEpacQwta7N5Fpp7XXer3RYTcxXwElvoVOPcdsBbXj3dySyJYeMrXbtDP6iSjb6gpR9uHy3q/7gzQWkkwWLkmrDq24FUWNVZTSBa1HVypA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696018476976926.1290247922833; Fri, 29 Sep 2023 13:14:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmJsB-0007cK-3v; Fri, 29 Sep 2023 16:14:03 -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 1qmJs9-0007bv-K7 for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:14:01 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qmJs2-0004Kl-Ts for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:14:00 -0400 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-5859b06509cso1067131a12.2 for ; Fri, 29 Sep 2023 13:13:54 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:a7:2:18fe:3fb1:d86b:1e68]) by smtp.gmail.com with ESMTPSA id t12-20020aa7938c000000b00686236718d8sm15267033pfe.41.2023.09.29.13.13.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 13:13:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696018433; x=1696623233; 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=mVmJd2wKpGqumt5HoBL44gvI+3rXVqW9cYrJR7zddHY=; b=BYdqk523UCuwjs5HppiYpEF8XdcvyUhv0L5SSLeQCNd6IV//2KIhbbizkcgmLOL+0S DHLI0bSWMwvfdIJMxXeajzgTRExwZOlyGQY9vv7SH37IXB9dUe1umG1S6qLFtuwltbbq j51umN/JZftdC5XD2IG66HwwlZw6/YXWpWGPc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696018433; x=1696623233; 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=mVmJd2wKpGqumt5HoBL44gvI+3rXVqW9cYrJR7zddHY=; b=eYqp5TLtHTk1N0Qlpzyk86n9gWtG5fOaIuWkQljizWOhMqiokajkxx0mMjJAV5ZSSq x4BNBbTc6jLidczSznCz2W4PJcJgcJc9fmYB94grN7zN6X6c0RHzNq7yLziIA+eYNge1 YkvrDQ391EfF/gyaSFDgVbdxKpj0lz9aHoDOBqYCj+mHcUAN0RYa/jbaFWAA0o8DnyP+ pBzTWuRwmPYBWOWdVxoIkibW+wEO9qaiJkYGWWEa7Qsda0kvkgQEMHa0b89SWjG80QR0 uBQFXPH2HAyTuS9w3jONFUD08lU2hyOejFZ6dySjPIxRhnRvFdoHWa1foquYFVkZIh+N DRHQ== X-Gm-Message-State: AOJu0YwrXhsEf4PSN5XMZQQauaohtBe+MHjXHurQNia/bMfWIVJ+o9xc ABismoM+ZuJifScpDEhpj2JRI56thykdfxnef04= X-Google-Smtp-Source: AGHT+IGyc12/8D9AScs0c36E23+Pgy/qjQvhzKr+tgTZirJmDzVtMtWlnHvKnanK+ekkH/mPneAg0g== X-Received: by 2002:a05:6a20:3d90:b0:15f:faab:1bd3 with SMTP id s16-20020a056a203d9000b0015ffaab1bd3mr6033962pzi.19.1696018432583; Fri, 29 Sep 2023 13:13:52 -0700 (PDT) From: Gurchetan Singh To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, akihiko.odaki@gmail.com, ray.huang@amd.com, alex.bennee@linaro.org, shentey@gmail.com, hi@alyssa.is, ernunes@redhat.com, manos.pitsidianakis@linaro.org, philmd@linaro.org, mark.cave-ayland@ilande.co.uk Subject: [PATCH v14 6/9] gfxstream + rutabaga: add initial support for gfxstream Date: Fri, 29 Sep 2023 13:13:38 -0700 Message-Id: <20230929201341.332-7-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20230929201341.332-1-gurchetansingh@chromium.org> References: <20230929201341.332-1-gurchetansingh@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::533; envelope-from=gurchetansingh@chromium.org; helo=mail-pg1-x533.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, DKIMWL_WL_HIGH=-0.001, 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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @chromium.org) X-ZM-MESSAGEID: 1696018478487100010 Content-Type: text/plain; charset="utf-8" This adds initial support for gfxstream and cross-domain. Both features rely on virtio-gpu blob resources and context types, which are also implemented in this patch. gfxstream has a long and illustrious history in Android graphics paravirtualization. It has been powering graphics in the Android Studio Emulator for more than a decade, which is the main developer platform. Originally conceived by Jesse Hall, it was first known as "EmuGL" [a]. The key design characteristic was a 1:1 threading model and auto-generation, which fit nicely with the OpenGLES spec. It also allowed easy layering with ANGLE on the host, which provides the GLES implementations on Windows or MacOS enviroments. gfxstream has traditionally been maintained by a single engineer, and between 2015 to 2021, the goldfish throne passed to Frank Yang. Historians often remark this glorious reign ("pax gfxstreama" is the academic term) was comparable to that of Augustus and both Queen Elizabeths. Just to name a few accomplishments in a resplendent panoply: higher versions of GLES, address space graphics, snapshot support and CTS compliant Vulkan [b]. One major drawback was the use of out-of-tree goldfish drivers. Android engineers didn't know much about DRM/KMS and especially TTM so a simple guest to host pipe was conceived. Luckily, virtio-gpu 3D started to emerge in 2016 due to the work of the Mesa/virglrenderer communities. In 2018, the initial virtio-gpu port of gfxstream was done by Cuttlefish enthusiast Alistair Delva. It was a symbol compatible replacement of virglrenderer [c] and named "AVDVirglrenderer". This implementation forms the basis of the current gfxstream host implementation still in use today. cross-domain support follows a similar arc. Originally conceived by Wayland aficionado David Reveman and crosvm enjoyer Zach Reizner in 2018, it initially relied on the downstream "virtio-wl" device. In 2020 and 2021, virtio-gpu was extended to include blob resources and multiple timelines by yours truly, features gfxstream/cross-domain both require to function correctly. Right now, we stand at the precipice of a truly fantastic possibility: the Android Emulator powered by upstream QEMU and upstream Linux kernel. gfxstream will then be packaged properfully, and app developers can even fix gfxstream bugs on their own if they encounter them. It's been quite the ride, my friends. Where will gfxstream head next, nobody really knows. I wouldn't be surprised if it's around for another decade, maintained by a new generation of Android graphics enthusiasts. Technical details: - Very simple initial display integration: just used Pixman - Largely, 1:1 mapping of virtio-gpu hypercalls to rutabaga function calls Next steps for Android VMs: - The next step would be improving display integration and UI interfaces with the goal of the QEMU upstream graphics being in an emulator release [d]. Next steps for Linux VMs for display virtualization: - For widespread distribution, someone needs to package Sommelier or the wayland-proxy-virtwl [e] ideally into Debian main. In addition, newer versions of the Linux kernel come with DRM_VIRTIO_GPU_KMS option, which allows disabling KMS hypercalls. If anyone cares enough, it'll probably be possible to build a custom VM variant that uses this display virtualization strategy. [a] https://android-review.googlesource.com/c/platform/development/+/34470 [b] https://android-review.googlesource.com/q/topic:%22vulkan-hostconnectio= n-start%22 [c] https://android-review.googlesource.com/c/device/generic/goldfish-openg= l/+/761927 [d] https://developer.android.com/studio/releases/emulator [e] https://github.com/talex5/wayland-proxy-virtwl Signed-off-by: Gurchetan Singh Tested-by: Alyssa Ross Tested-by: Emmanouil Pitsidianakis Tested-by: Akihiko Odaki Reviewed-by: Emmanouil Pitsidianakis Reviewed-by: Antonio Caggiano Reviewed-by: Akihiko Odaki --- hw/display/virtio-gpu-pci-rutabaga.c | 47 ++ hw/display/virtio-gpu-rutabaga.c | 1127 ++++++++++++++++++++++++++ hw/display/virtio-vga-rutabaga.c | 50 ++ 3 files changed, 1224 insertions(+) create mode 100644 hw/display/virtio-gpu-pci-rutabaga.c create mode 100644 hw/display/virtio-gpu-rutabaga.c create mode 100644 hw/display/virtio-vga-rutabaga.c diff --git a/hw/display/virtio-gpu-pci-rutabaga.c b/hw/display/virtio-gpu-p= ci-rutabaga.c new file mode 100644 index 0000000000..c96729e198 --- /dev/null +++ b/hw/display/virtio-gpu-pci-rutabaga.c @@ -0,0 +1,47 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/module.h" +#include "hw/pci/pci.h" +#include "hw/qdev-properties.h" +#include "hw/virtio/virtio.h" +#include "hw/virtio/virtio-bus.h" +#include "hw/virtio/virtio-gpu-pci.h" +#include "qom/object.h" + +#define TYPE_VIRTIO_GPU_RUTABAGA_PCI "virtio-gpu-rutabaga-pci" +OBJECT_DECLARE_SIMPLE_TYPE(VirtIOGPURutabagaPCI, VIRTIO_GPU_RUTABAGA_PCI) + +struct VirtIOGPURutabagaPCI { + VirtIOGPUPCIBase parent_obj; + + VirtIOGPURutabaga vdev; +}; + +static void virtio_gpu_rutabaga_initfn(Object *obj) +{ + VirtIOGPURutabagaPCI *dev =3D VIRTIO_GPU_RUTABAGA_PCI(obj); + + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), + TYPE_VIRTIO_GPU_RUTABAGA); + VIRTIO_GPU_PCI_BASE(obj)->vgpu =3D VIRTIO_GPU_BASE(&dev->vdev); +} + +static const TypeInfo virtio_gpu_rutabaga_pci_info[] =3D { + { + .name =3D TYPE_VIRTIO_GPU_RUTABAGA_PCI, + .parent =3D TYPE_VIRTIO_GPU_PCI_BASE, + .instance_size =3D sizeof(VirtIOGPURutabagaPCI), + .instance_init =3D virtio_gpu_rutabaga_initfn, + .interfaces =3D (InterfaceInfo[]) { + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + } + }, +}; + +DEFINE_TYPES(virtio_gpu_rutabaga_pci_info) + +module_obj(TYPE_VIRTIO_GPU_RUTABAGA_PCI); +module_kconfig(VIRTIO_PCI); +module_dep("hw-display-virtio-gpu-pci"); diff --git a/hw/display/virtio-gpu-rutabaga.c b/hw/display/virtio-gpu-rutab= aga.c new file mode 100644 index 0000000000..7772d61e83 --- /dev/null +++ b/hw/display/virtio-gpu-rutabaga.c @@ -0,0 +1,1127 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "qemu/iov.h" +#include "trace.h" +#include "hw/virtio/virtio.h" +#include "hw/virtio/virtio-gpu.h" +#include "hw/virtio/virtio-gpu-pixman.h" +#include "hw/virtio/virtio-iommu.h" + +#include +#include + +#define CHECK(condition, cmd) = \ + do { = \ + if (!(condition)) { = \ + error_report("CHECK failed in %s() %s:" "%d", __func__, = \ + __FILE__, __LINE__); = \ + (cmd)->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; = \ + return; = \ + } = \ + } while (0) + +/* + * This is the size of the char array in struct sock_addr_un. No Wayland s= ocket + * can be created with a path longer than this, including the null termina= tor. + */ +#define UNIX_PATH_MAX sizeof((struct sockaddr_un) {} .sun_path) + +struct rutabaga_aio_data { + struct VirtIOGPURutabaga *vr; + struct rutabaga_fence fence; +}; + +static void +virtio_gpu_rutabaga_update_cursor(VirtIOGPU *g, struct virtio_gpu_scanout = *s, + uint32_t resource_id) +{ + struct virtio_gpu_simple_resource *res; + struct rutabaga_transfer transfer =3D { 0 }; + struct iovec transfer_iovec; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + res =3D virtio_gpu_find_resource(g, resource_id); + if (!res) { + return; + } + + if (res->width !=3D s->current_cursor->width || + res->height !=3D s->current_cursor->height) { + return; + } + + transfer.x =3D 0; + transfer.y =3D 0; + transfer.z =3D 0; + transfer.w =3D res->width; + transfer.h =3D res->height; + transfer.d =3D 1; + + transfer_iovec.iov_base =3D s->current_cursor->data; + transfer_iovec.iov_len =3D res->width * res->height * 4; + + rutabaga_resource_transfer_read(vr->rutabaga, 0, + resource_id, &transfer, + &transfer_iovec); +} + +static void +virtio_gpu_rutabaga_gl_flushed(VirtIOGPUBase *b) +{ + VirtIOGPU *g =3D VIRTIO_GPU(b); + virtio_gpu_process_cmdq(g); +} + +static void +rutabaga_cmd_create_resource_2d(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + struct rutabaga_create_3d rc_3d =3D { 0 }; + struct virtio_gpu_simple_resource *res; + struct virtio_gpu_resource_create_2d c2d; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(c2d); + trace_virtio_gpu_cmd_res_create_2d(c2d.resource_id, c2d.format, + c2d.width, c2d.height); + + rc_3d.target =3D 2; + rc_3d.format =3D c2d.format; + rc_3d.bind =3D (1 << 1); + rc_3d.width =3D c2d.width; + rc_3d.height =3D c2d.height; + rc_3d.depth =3D 1; + rc_3d.array_size =3D 1; + rc_3d.last_level =3D 0; + rc_3d.nr_samples =3D 0; + rc_3d.flags =3D VIRTIO_GPU_RESOURCE_FLAG_Y_0_TOP; + + result =3D rutabaga_resource_create_3d(vr->rutabaga, c2d.resource_id, = &rc_3d); + CHECK(!result, cmd); + + res =3D g_new0(struct virtio_gpu_simple_resource, 1); + res->width =3D c2d.width; + res->height =3D c2d.height; + res->format =3D c2d.format; + res->resource_id =3D c2d.resource_id; + + QTAILQ_INSERT_HEAD(&g->reslist, res, next); +} + +static void +rutabaga_cmd_create_resource_3d(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + struct rutabaga_create_3d rc_3d =3D { 0 }; + struct virtio_gpu_simple_resource *res; + struct virtio_gpu_resource_create_3d c3d; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(c3d); + + trace_virtio_gpu_cmd_res_create_3d(c3d.resource_id, c3d.format, + c3d.width, c3d.height, c3d.depth); + + rc_3d.target =3D c3d.target; + rc_3d.format =3D c3d.format; + rc_3d.bind =3D c3d.bind; + rc_3d.width =3D c3d.width; + rc_3d.height =3D c3d.height; + rc_3d.depth =3D c3d.depth; + rc_3d.array_size =3D c3d.array_size; + rc_3d.last_level =3D c3d.last_level; + rc_3d.nr_samples =3D c3d.nr_samples; + rc_3d.flags =3D c3d.flags; + + result =3D rutabaga_resource_create_3d(vr->rutabaga, c3d.resource_id, = &rc_3d); + CHECK(!result, cmd); + + res =3D g_new0(struct virtio_gpu_simple_resource, 1); + res->width =3D c3d.width; + res->height =3D c3d.height; + res->format =3D c3d.format; + res->resource_id =3D c3d.resource_id; + + QTAILQ_INSERT_HEAD(&g->reslist, res, next); +} + +static void +rutabaga_cmd_resource_unref(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + struct virtio_gpu_simple_resource *res; + struct virtio_gpu_resource_unref unref; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(unref); + + trace_virtio_gpu_cmd_res_unref(unref.resource_id); + + res =3D virtio_gpu_find_resource(g, unref.resource_id); + CHECK(res, cmd); + + result =3D rutabaga_resource_unref(vr->rutabaga, unref.resource_id); + CHECK(!result, cmd); + + if (res->image) { + pixman_image_unref(res->image); + } + + QTAILQ_REMOVE(&g->reslist, res, next); + g_free(res); +} + +static void +rutabaga_cmd_context_create(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + struct virtio_gpu_ctx_create cc; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(cc); + trace_virtio_gpu_cmd_ctx_create(cc.hdr.ctx_id, + cc.debug_name); + + result =3D rutabaga_context_create(vr->rutabaga, cc.hdr.ctx_id, + cc.context_init, cc.debug_name, cc.nl= en); + CHECK(!result, cmd); +} + +static void +rutabaga_cmd_context_destroy(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + struct virtio_gpu_ctx_destroy cd; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(cd); + trace_virtio_gpu_cmd_ctx_destroy(cd.hdr.ctx_id); + + result =3D rutabaga_context_destroy(vr->rutabaga, cd.hdr.ctx_id); + CHECK(!result, cmd); +} + +static void +rutabaga_cmd_resource_flush(VirtIOGPU *g, struct virtio_gpu_ctrl_command *= cmd) +{ + int32_t result, i; + struct virtio_gpu_scanout *scanout =3D NULL; + struct virtio_gpu_simple_resource *res; + struct rutabaga_transfer transfer =3D { 0 }; + struct iovec transfer_iovec; + struct virtio_gpu_resource_flush rf; + bool found =3D false; + + VirtIOGPUBase *vb =3D VIRTIO_GPU_BASE(g); + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + if (vr->headless) { + return; + } + + VIRTIO_GPU_FILL_CMD(rf); + trace_virtio_gpu_cmd_res_flush(rf.resource_id, + rf.r.width, rf.r.height, rf.r.x, rf.r.y= ); + + res =3D virtio_gpu_find_resource(g, rf.resource_id); + CHECK(res, cmd); + + for (i =3D 0; i < vb->conf.max_outputs; i++) { + scanout =3D &vb->scanout[i]; + if (i =3D=3D res->scanout_bitmask) { + found =3D true; + break; + } + } + + if (!found) { + return; + } + + transfer.x =3D 0; + transfer.y =3D 0; + transfer.z =3D 0; + transfer.w =3D res->width; + transfer.h =3D res->height; + transfer.d =3D 1; + + transfer_iovec.iov_base =3D pixman_image_get_data(res->image); + transfer_iovec.iov_len =3D res->width * res->height * 4; + + result =3D rutabaga_resource_transfer_read(vr->rutabaga, 0, + rf.resource_id, &transfer, + &transfer_iovec); + CHECK(!result, cmd); + dpy_gfx_update_full(scanout->con); +} + +static void +rutabaga_cmd_set_scanout(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd) +{ + struct virtio_gpu_simple_resource *res; + struct virtio_gpu_scanout *scanout =3D NULL; + struct virtio_gpu_set_scanout ss; + + VirtIOGPUBase *vb =3D VIRTIO_GPU_BASE(g); + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + if (vr->headless) { + return; + } + + VIRTIO_GPU_FILL_CMD(ss); + trace_virtio_gpu_cmd_set_scanout(ss.scanout_id, ss.resource_id, + ss.r.width, ss.r.height, ss.r.x, ss.r= .y); + + CHECK(ss.scanout_id < VIRTIO_GPU_MAX_SCANOUTS, cmd); + scanout =3D &vb->scanout[ss.scanout_id]; + + if (ss.resource_id =3D=3D 0) { + dpy_gfx_replace_surface(scanout->con, NULL); + dpy_gl_scanout_disable(scanout->con); + return; + } + + res =3D virtio_gpu_find_resource(g, ss.resource_id); + CHECK(res, cmd); + + if (!res->image) { + pixman_format_code_t pformat; + pformat =3D virtio_gpu_get_pixman_format(res->format); + CHECK(pformat, cmd); + + res->image =3D pixman_image_create_bits(pformat, + res->width, + res->height, + NULL, 0); + CHECK(res->image, cmd); + pixman_image_ref(res->image); + } + + vb->enable =3D 1; + + /* realloc the surface ptr */ + scanout->ds =3D qemu_create_displaysurface_pixman(res->image); + dpy_gfx_replace_surface(scanout->con, NULL); + dpy_gfx_replace_surface(scanout->con, scanout->ds); + res->scanout_bitmask =3D ss.scanout_id; +} + +static void +rutabaga_cmd_submit_3d(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + struct virtio_gpu_cmd_submit cs; + struct rutabaga_command rutabaga_cmd =3D { 0 }; + g_autofree uint8_t *buf =3D NULL; + size_t s; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(cs); + trace_virtio_gpu_cmd_ctx_submit(cs.hdr.ctx_id, cs.size); + + buf =3D g_new0(uint8_t, cs.size); + s =3D iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, + sizeof(cs), buf, cs.size); + CHECK(s =3D=3D cs.size, cmd); + + rutabaga_cmd.ctx_id =3D cs.hdr.ctx_id; + rutabaga_cmd.cmd =3D buf; + rutabaga_cmd.cmd_size =3D cs.size; + + result =3D rutabaga_submit_command(vr->rutabaga, &rutabaga_cmd); + CHECK(!result, cmd); +} + +static void +rutabaga_cmd_transfer_to_host_2d(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + struct rutabaga_transfer transfer =3D { 0 }; + struct virtio_gpu_transfer_to_host_2d t2d; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(t2d); + trace_virtio_gpu_cmd_res_xfer_toh_2d(t2d.resource_id); + + transfer.x =3D t2d.r.x; + transfer.y =3D t2d.r.y; + transfer.z =3D 0; + transfer.w =3D t2d.r.width; + transfer.h =3D t2d.r.height; + transfer.d =3D 1; + + result =3D rutabaga_resource_transfer_write(vr->rutabaga, 0, t2d.resou= rce_id, + &transfer); + CHECK(!result, cmd); +} + +static void +rutabaga_cmd_transfer_to_host_3d(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + struct rutabaga_transfer transfer =3D { 0 }; + struct virtio_gpu_transfer_host_3d t3d; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(t3d); + trace_virtio_gpu_cmd_res_xfer_toh_3d(t3d.resource_id); + + transfer.x =3D t3d.box.x; + transfer.y =3D t3d.box.y; + transfer.z =3D t3d.box.z; + transfer.w =3D t3d.box.w; + transfer.h =3D t3d.box.h; + transfer.d =3D t3d.box.d; + transfer.level =3D t3d.level; + transfer.stride =3D t3d.stride; + transfer.layer_stride =3D t3d.layer_stride; + transfer.offset =3D t3d.offset; + + result =3D rutabaga_resource_transfer_write(vr->rutabaga, t3d.hdr.ctx_= id, + t3d.resource_id, &transfer); + CHECK(!result, cmd); +} + +static void +rutabaga_cmd_transfer_from_host_3d(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + struct rutabaga_transfer transfer =3D { 0 }; + struct virtio_gpu_transfer_host_3d t3d; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(t3d); + trace_virtio_gpu_cmd_res_xfer_fromh_3d(t3d.resource_id); + + transfer.x =3D t3d.box.x; + transfer.y =3D t3d.box.y; + transfer.z =3D t3d.box.z; + transfer.w =3D t3d.box.w; + transfer.h =3D t3d.box.h; + transfer.d =3D t3d.box.d; + transfer.level =3D t3d.level; + transfer.stride =3D t3d.stride; + transfer.layer_stride =3D t3d.layer_stride; + transfer.offset =3D t3d.offset; + + result =3D rutabaga_resource_transfer_read(vr->rutabaga, t3d.hdr.ctx_i= d, + t3d.resource_id, &transfer, N= ULL); + CHECK(!result, cmd); +} + +static void +rutabaga_cmd_attach_backing(VirtIOGPU *g, struct virtio_gpu_ctrl_command *= cmd) +{ + struct rutabaga_iovecs vecs =3D { 0 }; + struct virtio_gpu_simple_resource *res; + struct virtio_gpu_resource_attach_backing att_rb; + int ret; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(att_rb); + trace_virtio_gpu_cmd_res_back_attach(att_rb.resource_id); + + res =3D virtio_gpu_find_resource(g, att_rb.resource_id); + CHECK(res, cmd); + CHECK(!res->iov, cmd); + + ret =3D virtio_gpu_create_mapping_iov(g, att_rb.nr_entries, sizeof(att= _rb), + cmd, NULL, &res->iov, &res->iov_cn= t); + CHECK(!ret, cmd); + + vecs.iovecs =3D res->iov; + vecs.num_iovecs =3D res->iov_cnt; + + ret =3D rutabaga_resource_attach_backing(vr->rutabaga, att_rb.resource= _id, + &vecs); + if (ret !=3D 0) { + virtio_gpu_cleanup_mapping(g, res); + } + + CHECK(!ret, cmd); +} + +static void +rutabaga_cmd_detach_backing(VirtIOGPU *g, struct virtio_gpu_ctrl_command *= cmd) +{ + struct virtio_gpu_simple_resource *res; + struct virtio_gpu_resource_detach_backing detach_rb; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(detach_rb); + trace_virtio_gpu_cmd_res_back_detach(detach_rb.resource_id); + + res =3D virtio_gpu_find_resource(g, detach_rb.resource_id); + CHECK(res, cmd); + + rutabaga_resource_detach_backing(vr->rutabaga, + detach_rb.resource_id); + + virtio_gpu_cleanup_mapping(g, res); +} + +static void +rutabaga_cmd_ctx_attach_resource(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + struct virtio_gpu_ctx_resource att_res; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(att_res); + trace_virtio_gpu_cmd_ctx_res_attach(att_res.hdr.ctx_id, + att_res.resource_id); + + result =3D rutabaga_context_attach_resource(vr->rutabaga, att_res.hdr.= ctx_id, + att_res.resource_id); + CHECK(!result, cmd); +} + +static void +rutabaga_cmd_ctx_detach_resource(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + struct virtio_gpu_ctx_resource det_res; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(det_res); + trace_virtio_gpu_cmd_ctx_res_detach(det_res.hdr.ctx_id, + det_res.resource_id); + + result =3D rutabaga_context_detach_resource(vr->rutabaga, det_res.hdr.= ctx_id, + det_res.resource_id); + CHECK(!result, cmd); +} + +static void +rutabaga_cmd_get_capset_info(VirtIOGPU *g, struct virtio_gpu_ctrl_command = *cmd) +{ + int32_t result; + struct virtio_gpu_get_capset_info info; + struct virtio_gpu_resp_capset_info resp; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(info); + + result =3D rutabaga_get_capset_info(vr->rutabaga, info.capset_index, + &resp.capset_id, &resp.capset_max_ve= rsion, + &resp.capset_max_size); + CHECK(!result, cmd); + + resp.hdr.type =3D VIRTIO_GPU_RESP_OK_CAPSET_INFO; + virtio_gpu_ctrl_response(g, cmd, &resp.hdr, sizeof(resp)); +} + +static void +rutabaga_cmd_get_capset(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + struct virtio_gpu_get_capset gc; + struct virtio_gpu_resp_capset *resp; + uint32_t capset_size, capset_version; + uint32_t current_id, i; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(gc); + for (i =3D 0; i < vr->num_capsets; i++) { + result =3D rutabaga_get_capset_info(vr->rutabaga, i, + ¤t_id, &capset_version, + &capset_size); + CHECK(!result, cmd); + + if (current_id =3D=3D gc.capset_id) { + break; + } + } + + CHECK(i < vr->num_capsets, cmd); + + resp =3D g_malloc0(sizeof(*resp) + capset_size); + resp->hdr.type =3D VIRTIO_GPU_RESP_OK_CAPSET; + rutabaga_get_capset(vr->rutabaga, gc.capset_id, gc.capset_version, + resp->capset_data, capset_size); + + virtio_gpu_ctrl_response(g, cmd, &resp->hdr, sizeof(*resp) + capset_si= ze); + g_free(resp); +} + +static void +rutabaga_cmd_resource_create_blob(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int result; + struct rutabaga_iovecs vecs =3D { 0 }; + g_autofree struct virtio_gpu_simple_resource *res =3D NULL; + struct virtio_gpu_resource_create_blob cblob; + struct rutabaga_create_blob rc_blob =3D { 0 }; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(cblob); + trace_virtio_gpu_cmd_res_create_blob(cblob.resource_id, cblob.size); + + CHECK(cblob.resource_id !=3D 0, cmd); + + res =3D g_new0(struct virtio_gpu_simple_resource, 1); + + res->resource_id =3D cblob.resource_id; + res->blob_size =3D cblob.size; + + if (cblob.blob_mem !=3D VIRTIO_GPU_BLOB_MEM_HOST3D) { + result =3D virtio_gpu_create_mapping_iov(g, cblob.nr_entries, + sizeof(cblob), cmd, &res->a= ddrs, + &res->iov, &res->iov_cnt); + CHECK(!result, cmd); + } + + rc_blob.blob_id =3D cblob.blob_id; + rc_blob.blob_mem =3D cblob.blob_mem; + rc_blob.blob_flags =3D cblob.blob_flags; + rc_blob.size =3D cblob.size; + + vecs.iovecs =3D res->iov; + vecs.num_iovecs =3D res->iov_cnt; + + result =3D rutabaga_resource_create_blob(vr->rutabaga, cblob.hdr.ctx_i= d, + cblob.resource_id, &rc_blob, &v= ecs, + NULL); + + if (result && cblob.blob_mem !=3D VIRTIO_GPU_BLOB_MEM_HOST3D) { + virtio_gpu_cleanup_mapping(g, res); + } + + CHECK(!result, cmd); + + QTAILQ_INSERT_HEAD(&g->reslist, res, next); + res =3D NULL; +} + +static void +rutabaga_cmd_resource_map_blob(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + uint32_t map_info =3D 0; + uint32_t slot =3D 0; + struct virtio_gpu_simple_resource *res; + struct rutabaga_mapping mapping =3D { 0 }; + struct virtio_gpu_resource_map_blob mblob; + struct virtio_gpu_resp_map_info resp =3D { 0 }; + + VirtIOGPUBase *vb =3D VIRTIO_GPU_BASE(g); + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(mblob); + + CHECK(mblob.resource_id !=3D 0, cmd); + + res =3D virtio_gpu_find_resource(g, mblob.resource_id); + CHECK(res, cmd); + + result =3D rutabaga_resource_map_info(vr->rutabaga, mblob.resource_id, + &map_info); + CHECK(!result, cmd); + + /* + * RUTABAGA_MAP_ACCESS_* flags are not part of the virtio-gpu spec, bu= t do + * exist to potentially allow the hypervisor to restrict write access = to + * memory. QEMU does not need to use this functionality at the moment. + */ + resp.map_info =3D map_info & RUTABAGA_MAP_CACHE_MASK; + + result =3D rutabaga_resource_map(vr->rutabaga, mblob.resource_id, &map= ping); + CHECK(!result, cmd); + + /* + * There is small risk of the MemoryRegion still deferencing the point= er + * after rutabaga unmaps it. Please see discussion here: + * + * https://lists.gnu.org/archive/html/qemu-devel/2023-09/msg05141.html + * + * It is highly unlikely to happen in practice and doesn't affect known + * use cases. However, it should be fixed and is noted here for poster= ity. + */ + for (slot =3D 0; slot < MAX_SLOTS; slot++) { + if (vr->memory_regions[slot].used) { + continue; + } + + MemoryRegion *mr =3D &(vr->memory_regions[slot].mr); + memory_region_init_ram_ptr(mr, OBJECT(vr), "blob", mapping.size, + mapping.ptr); + memory_region_add_subregion(&vb->hostmem, mblob.offset, mr); + vr->memory_regions[slot].resource_id =3D mblob.resource_id; + vr->memory_regions[slot].used =3D 1; + break; + } + + if (slot >=3D MAX_SLOTS) { + result =3D rutabaga_resource_unmap(vr->rutabaga, mblob.resource_id= ); + CHECK(!result, cmd); + } + + CHECK(slot < MAX_SLOTS, cmd); + + resp.hdr.type =3D VIRTIO_GPU_RESP_OK_MAP_INFO; + virtio_gpu_ctrl_response(g, cmd, &resp.hdr, sizeof(resp)); +} + +static void +rutabaga_cmd_resource_unmap_blob(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + int32_t result; + uint32_t slot =3D 0; + struct virtio_gpu_simple_resource *res; + struct virtio_gpu_resource_unmap_blob ublob; + + VirtIOGPUBase *vb =3D VIRTIO_GPU_BASE(g); + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(ublob); + + CHECK(ublob.resource_id !=3D 0, cmd); + + res =3D virtio_gpu_find_resource(g, ublob.resource_id); + CHECK(res, cmd); + + for (slot =3D 0; slot < MAX_SLOTS; slot++) { + if (vr->memory_regions[slot].resource_id !=3D ublob.resource_id) { + continue; + } + + MemoryRegion *mr =3D &(vr->memory_regions[slot].mr); + memory_region_del_subregion(&vb->hostmem, mr); + + vr->memory_regions[slot].resource_id =3D 0; + vr->memory_regions[slot].used =3D 0; + break; + } + + CHECK(slot < MAX_SLOTS, cmd); + result =3D rutabaga_resource_unmap(vr->rutabaga, res->resource_id); + CHECK(!result, cmd); +} + +static void +virtio_gpu_rutabaga_process_cmd(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + struct rutabaga_fence fence =3D { 0 }; + int32_t result; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + VIRTIO_GPU_FILL_CMD(cmd->cmd_hdr); + + switch (cmd->cmd_hdr.type) { + case VIRTIO_GPU_CMD_CTX_CREATE: + rutabaga_cmd_context_create(g, cmd); + break; + case VIRTIO_GPU_CMD_CTX_DESTROY: + rutabaga_cmd_context_destroy(g, cmd); + break; + case VIRTIO_GPU_CMD_RESOURCE_CREATE_2D: + rutabaga_cmd_create_resource_2d(g, cmd); + break; + case VIRTIO_GPU_CMD_RESOURCE_CREATE_3D: + rutabaga_cmd_create_resource_3d(g, cmd); + break; + case VIRTIO_GPU_CMD_SUBMIT_3D: + rutabaga_cmd_submit_3d(g, cmd); + break; + case VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D: + rutabaga_cmd_transfer_to_host_2d(g, cmd); + break; + case VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D: + rutabaga_cmd_transfer_to_host_3d(g, cmd); + break; + case VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D: + rutabaga_cmd_transfer_from_host_3d(g, cmd); + break; + case VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING: + rutabaga_cmd_attach_backing(g, cmd); + break; + case VIRTIO_GPU_CMD_RESOURCE_DETACH_BACKING: + rutabaga_cmd_detach_backing(g, cmd); + break; + case VIRTIO_GPU_CMD_SET_SCANOUT: + rutabaga_cmd_set_scanout(g, cmd); + break; + case VIRTIO_GPU_CMD_RESOURCE_FLUSH: + rutabaga_cmd_resource_flush(g, cmd); + break; + case VIRTIO_GPU_CMD_RESOURCE_UNREF: + rutabaga_cmd_resource_unref(g, cmd); + break; + case VIRTIO_GPU_CMD_CTX_ATTACH_RESOURCE: + rutabaga_cmd_ctx_attach_resource(g, cmd); + break; + case VIRTIO_GPU_CMD_CTX_DETACH_RESOURCE: + rutabaga_cmd_ctx_detach_resource(g, cmd); + break; + case VIRTIO_GPU_CMD_GET_CAPSET_INFO: + rutabaga_cmd_get_capset_info(g, cmd); + break; + case VIRTIO_GPU_CMD_GET_CAPSET: + rutabaga_cmd_get_capset(g, cmd); + break; + case VIRTIO_GPU_CMD_GET_DISPLAY_INFO: + virtio_gpu_get_display_info(g, cmd); + break; + case VIRTIO_GPU_CMD_GET_EDID: + virtio_gpu_get_edid(g, cmd); + break; + case VIRTIO_GPU_CMD_RESOURCE_CREATE_BLOB: + rutabaga_cmd_resource_create_blob(g, cmd); + break; + case VIRTIO_GPU_CMD_RESOURCE_MAP_BLOB: + rutabaga_cmd_resource_map_blob(g, cmd); + break; + case VIRTIO_GPU_CMD_RESOURCE_UNMAP_BLOB: + rutabaga_cmd_resource_unmap_blob(g, cmd); + break; + default: + cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; + break; + } + + if (cmd->finished) { + return; + } + if (cmd->error) { + error_report("%s: ctrl 0x%x, error 0x%x", __func__, + cmd->cmd_hdr.type, cmd->error); + virtio_gpu_ctrl_response_nodata(g, cmd, cmd->error); + return; + } + if (!(cmd->cmd_hdr.flags & VIRTIO_GPU_FLAG_FENCE)) { + virtio_gpu_ctrl_response_nodata(g, cmd, VIRTIO_GPU_RESP_OK_NODATA); + return; + } + + fence.flags =3D cmd->cmd_hdr.flags; + fence.ctx_id =3D cmd->cmd_hdr.ctx_id; + fence.fence_id =3D cmd->cmd_hdr.fence_id; + fence.ring_idx =3D cmd->cmd_hdr.ring_idx; + + trace_virtio_gpu_fence_ctrl(cmd->cmd_hdr.fence_id, cmd->cmd_hdr.type); + + result =3D rutabaga_create_fence(vr->rutabaga, &fence); + CHECK(!result, cmd); +} + +static void +virtio_gpu_rutabaga_aio_cb(void *opaque) +{ + struct rutabaga_aio_data *data =3D opaque; + VirtIOGPU *g =3D VIRTIO_GPU(data->vr); + struct rutabaga_fence fence_data =3D data->fence; + struct virtio_gpu_ctrl_command *cmd, *tmp; + + uint32_t signaled_ctx_specific =3D fence_data.flags & + RUTABAGA_FLAG_INFO_RING_IDX; + + QTAILQ_FOREACH_SAFE(cmd, &g->fenceq, next, tmp) { + /* + * Due to context specific timelines. + */ + uint32_t target_ctx_specific =3D cmd->cmd_hdr.flags & + RUTABAGA_FLAG_INFO_RING_IDX; + + if (signaled_ctx_specific !=3D target_ctx_specific) { + continue; + } + + if (signaled_ctx_specific && + (cmd->cmd_hdr.ring_idx !=3D fence_data.ring_idx)) { + continue; + } + + if (cmd->cmd_hdr.fence_id > fence_data.fence_id) { + continue; + } + + trace_virtio_gpu_fence_resp(cmd->cmd_hdr.fence_id); + virtio_gpu_ctrl_response_nodata(g, cmd, VIRTIO_GPU_RESP_OK_NODATA); + QTAILQ_REMOVE(&g->fenceq, cmd, next); + g_free(cmd); + } + + g_free(data); +} + +static void +virtio_gpu_rutabaga_fence_cb(uint64_t user_data, + const struct rutabaga_fence *fence) { + struct rutabaga_aio_data *data; + VirtIOGPU *g =3D (VirtIOGPU *)user_data; + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + /* + * gfxstream and both cross-domain (and even newer versions virglrende= rer: + * see VIRGL_RENDERER_ASYNC_FENCE_CB) like to signal fence completion = on + * threads ("callback threads") that are different from the thread that + * processes the command queue ("main thread"). + * + * crosvm and other virtio-gpu 1.1 implementations enable callback thr= eads + * via locking. However, on QEMU a deadlock is observed if + * virtio_gpu_ctrl_response_nodata(..) [used in the fence callback] is= used + * from a thread that is not the main thread. + * + * The reason is QEMU's internal locking is designed to work with QEMU + * threads (see rcu_register_thread()) and not generic C/C++/Rust thre= ads. + * For now, we can workaround this by scheduling the return of the + * fence descriptors on the main thread. + */ + + data =3D g_new0(struct rutabaga_aio_data, 1); + data->vr =3D vr; + data->fence =3D *fence; + aio_bh_schedule_oneshot(qemu_get_aio_context(), + virtio_gpu_rutabaga_aio_cb, + data); +} + +static void +virtio_gpu_rutabaga_debug_cb(uint64_t user_data, + const struct rutabaga_debug *debug) { + + if (debug->debug_type =3D=3D RUTABAGA_DEBUG_ERROR) { + error_report("%s", debug->message); + } else if (debug->debug_type =3D=3D RUTABAGA_DEBUG_WARN) { + warn_report("%s", debug->message); + } else if (debug->debug_type =3D=3D RUTABAGA_DEBUG_INFO) { + info_report("%s", debug->message); + } +} + +static bool virtio_gpu_rutabaga_init(VirtIOGPU *g, Error **errp) +{ + int result; + struct rutabaga_builder builder =3D { 0 }; + char wayland_socket_path[UNIX_PATH_MAX]; + struct rutabaga_channel channel =3D { 0 }; + struct rutabaga_channels channels =3D { 0 }; + + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + vr->rutabaga =3D NULL; + + builder.wsi =3D RUTABAGA_WSI_SURFACELESS; + /* + * Currently, if WSI is specified, the only valid strings are "surface= less" + * or "headless". Surfaceless doesn't create a native window surface,= but + * does copy from the render target to the Pixman buffer if a virtio-g= pu + * 2D hypercall is issued. Surfacless is the default. + * + * Headless is like surfaceless, but doesn't copy to the Pixman buffer= . The + * use case is automated testing environments where there is no need t= o view + * results. + * + * In the future, more performant virtio-gpu 2D UI integration may be = added. + */ + if (vr->wsi) { + if (g_str_equal(vr->wsi, "surfaceless")) { + vr->headless =3D false; + } else if (g_str_equal(vr->wsi, "headless")) { + vr->headless =3D true; + } else { + error_setg(errp, "invalid wsi option selected"); + return false; + } + } + + if ((vr->capset_mask & (1 << RUTABAGA_CAPSET_GFXSTREAM_GLES)) || + (vr->capset_mask & (1 << RUTABAGA_CAPSET_GFXSTREAM_COMPOSER))) { + warn_report("Using an experimental virtio-gpu capability set."); + } + + builder.fence_cb =3D virtio_gpu_rutabaga_fence_cb; + builder.debug_cb =3D virtio_gpu_rutabaga_debug_cb; + builder.capset_mask =3D vr->capset_mask; + builder.user_data =3D (uint64_t)g; + + /* + * If the user doesn't specify the wayland socket path, we try to infer + * the socket via a process similar to the one used by libwayland. + * libwayland does the following: + * + * 1) If $WAYLAND_DISPLAY is set, attempt to connect to + * $XDG_RUNTIME_DIR/$WAYLAND_DISPLAY + * 2) Otherwise, attempt to connect to $XDG_RUNTIME_DIR/wayland-0 + * 3) Otherwise, don't pass a wayland socket to rutabaga. If a guest + * wayland proxy is launched, it will fail to work. + */ + channel.channel_type =3D RUTABAGA_CHANNEL_TYPE_WAYLAND; + if (!vr->wayland_socket_path) { + const char *runtime_dir =3D getenv("XDG_RUNTIME_DIR"); + const char *display =3D getenv("WAYLAND_DISPLAY"); + if (!display) { + display =3D "wayland-0"; + } + + if (runtime_dir) { + result =3D snprintf(wayland_socket_path, UNIX_PATH_MAX, + "%s/%s", runtime_dir, display); + if (result > 0 && result < UNIX_PATH_MAX) { + channel.channel_name =3D wayland_socket_path; + } + } + } else { + channel.channel_name =3D vr->wayland_socket_path; + } + + if ((builder.capset_mask & (1 << RUTABAGA_CAPSET_CROSS_DOMAIN))) { + if (channel.channel_name) { + channels.channels =3D &channel; + channels.num_channels =3D 1; + builder.channels =3D &channels; + } + } + + result =3D rutabaga_init(&builder, &vr->rutabaga); + if (result) { + error_setg_errno(errp, -result, "Failed to init rutabaga"); + return result; + } + + return true; +} + +static int virtio_gpu_rutabaga_get_num_capsets(VirtIOGPU *g) +{ + int result; + uint32_t num_capsets; + VirtIOGPURutabaga *vr =3D VIRTIO_GPU_RUTABAGA(g); + + result =3D rutabaga_get_num_capsets(vr->rutabaga, &num_capsets); + if (result) { + error_report("Failed to get capsets"); + return 0; + } + vr->num_capsets =3D num_capsets; + return num_capsets; +} + +static void virtio_gpu_rutabaga_handle_ctrl(VirtIODevice *vdev, VirtQueue = *vq) +{ + VirtIOGPU *g =3D VIRTIO_GPU(vdev); + struct virtio_gpu_ctrl_command *cmd; + + if (!virtio_queue_ready(vq)) { + return; + } + + cmd =3D virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command)); + while (cmd) { + cmd->vq =3D vq; + cmd->error =3D 0; + cmd->finished =3D false; + QTAILQ_INSERT_TAIL(&g->cmdq, cmd, next); + cmd =3D virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command)); + } + + virtio_gpu_process_cmdq(g); +} + +static void virtio_gpu_rutabaga_realize(DeviceState *qdev, Error **errp) +{ + int num_capsets; + VirtIOGPUBase *bdev =3D VIRTIO_GPU_BASE(qdev); + VirtIOGPU *gpudev =3D VIRTIO_GPU(qdev); + +#if HOST_BIG_ENDIAN + error_setg(errp, "rutabaga is not supported on bigendian platforms"); + return; +#endif + + if (!virtio_gpu_rutabaga_init(gpudev, errp)) { + return; + } + + num_capsets =3D virtio_gpu_rutabaga_get_num_capsets(gpudev); + if (!num_capsets) { + return; + } + + bdev->conf.flags |=3D (1 << VIRTIO_GPU_FLAG_RUTABAGA_ENABLED); + bdev->conf.flags |=3D (1 << VIRTIO_GPU_FLAG_BLOB_ENABLED); + bdev->conf.flags |=3D (1 << VIRTIO_GPU_FLAG_CONTEXT_INIT_ENABLED); + + bdev->virtio_config.num_capsets =3D num_capsets; + virtio_gpu_device_realize(qdev, errp); +} + +static Property virtio_gpu_rutabaga_properties[] =3D { + DEFINE_PROP_BIT64("gfxstream-vulkan", VirtIOGPURutabaga, capset_mask, + RUTABAGA_CAPSET_GFXSTREAM_VULKAN, false), + DEFINE_PROP_BIT64("cross-domain", VirtIOGPURutabaga, capset_mask, + RUTABAGA_CAPSET_CROSS_DOMAIN, false), + DEFINE_PROP_BIT64("gfxstream-gles", VirtIOGPURutabaga, capset_mask, + RUTABAGA_CAPSET_GFXSTREAM_GLES, false), + DEFINE_PROP_BIT64("gfxstream-composer", VirtIOGPURutabaga, capset_mask, + RUTABAGA_CAPSET_GFXSTREAM_COMPOSER, false), + DEFINE_PROP_STRING("wayland-socket-path", VirtIOGPURutabaga, + wayland_socket_path), + DEFINE_PROP_STRING("wsi", VirtIOGPURutabaga, wsi), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtio_gpu_rutabaga_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + VirtioDeviceClass *vdc =3D VIRTIO_DEVICE_CLASS(klass); + VirtIOGPUBaseClass *vbc =3D VIRTIO_GPU_BASE_CLASS(klass); + VirtIOGPUClass *vgc =3D VIRTIO_GPU_CLASS(klass); + + vbc->gl_flushed =3D virtio_gpu_rutabaga_gl_flushed; + vgc->handle_ctrl =3D virtio_gpu_rutabaga_handle_ctrl; + vgc->process_cmd =3D virtio_gpu_rutabaga_process_cmd; + vgc->update_cursor_data =3D virtio_gpu_rutabaga_update_cursor; + + vdc->realize =3D virtio_gpu_rutabaga_realize; + device_class_set_props(dc, virtio_gpu_rutabaga_properties); +} + +static const TypeInfo virtio_gpu_rutabaga_info[] =3D { + { + .name =3D TYPE_VIRTIO_GPU_RUTABAGA, + .parent =3D TYPE_VIRTIO_GPU, + .instance_size =3D sizeof(VirtIOGPURutabaga), + .class_init =3D virtio_gpu_rutabaga_class_init, + }, +}; + +DEFINE_TYPES(virtio_gpu_rutabaga_info) + +module_obj(TYPE_VIRTIO_GPU_RUTABAGA); +module_kconfig(VIRTIO_GPU); +module_dep("hw-display-virtio-gpu"); diff --git a/hw/display/virtio-vga-rutabaga.c b/hw/display/virtio-vga-rutab= aga.c new file mode 100644 index 0000000000..a7bef6da24 --- /dev/null +++ b/hw/display/virtio-vga-rutabaga.c @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "hw/pci/pci.h" +#include "hw/qdev-properties.h" +#include "hw/virtio/virtio-gpu.h" +#include "hw/display/vga.h" +#include "qapi/error.h" +#include "qemu/module.h" +#include "virtio-vga.h" +#include "qom/object.h" + +#define TYPE_VIRTIO_VGA_RUTABAGA "virtio-vga-rutabaga" + +OBJECT_DECLARE_SIMPLE_TYPE(VirtIOVGARutabaga, VIRTIO_VGA_RUTABAGA) + +struct VirtIOVGARutabaga { + VirtIOVGABase parent_obj; + + VirtIOGPURutabaga vdev; +}; + +static void virtio_vga_rutabaga_inst_initfn(Object *obj) +{ + VirtIOVGARutabaga *dev =3D VIRTIO_VGA_RUTABAGA(obj); + + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), + TYPE_VIRTIO_GPU_RUTABAGA); + VIRTIO_VGA_BASE(dev)->vgpu =3D VIRTIO_GPU_BASE(&dev->vdev); +} + +static VirtioPCIDeviceTypeInfo virtio_vga_rutabaga_info =3D { + .generic_name =3D TYPE_VIRTIO_VGA_RUTABAGA, + .parent =3D TYPE_VIRTIO_VGA_BASE, + .instance_size =3D sizeof(VirtIOVGARutabaga), + .instance_init =3D virtio_vga_rutabaga_inst_initfn, +}; +module_obj(TYPE_VIRTIO_VGA_RUTABAGA); +module_kconfig(VIRTIO_VGA); + +static void virtio_vga_register_types(void) +{ + if (have_vga) { + virtio_pci_types_register(&virtio_vga_rutabaga_info); + } +} + +type_init(virtio_vga_register_types) + +module_dep("hw-display-virtio-vga"); --=20 2.42.0.582.g8ccd20d70d-goog From nobody Fri May 17 07:08:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=chromium.org ARC-Seal: i=1; a=rsa-sha256; t=1696018529; cv=none; d=zohomail.com; s=zohoarc; b=gIxJ9wirdOEC+uF6vm4/oqkS3GVcz9v5XkBXQE+V6g2uGhaR72iCyRgFs7zM13gAHTAyEBsGg4GSoCF7UnQuBaL6U0WOD7WUvDhtGBnMBGo0flqSFLEu1PU4sqXmPoqCgPDXoZe40Cj9pcXftR0igm8rVdcJJGpltJkheMrFidQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696018529; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=39AxELZdpnvLtvcdR+zVBAFROvLoU6Rddg7tcrNIFUk=; b=fdJCUGtCYCDkYphmjNRiAZGMhYmsujfZlTveNMyfnGMBckuKs7eRLjhBA1Umh3YQN9EukIcAj+1Mp+9H7BKBNrDPHPnFsKCwICpm6NiT1f4Jb6WCwj0e9BW5wMJ4azDNXXCMaljlN6qLgnOfIz8Dp2CWSpl0mTvW18gFtfDuh58= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696018529522256.4210482696409; Fri, 29 Sep 2023 13:15:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmJs8-0007bY-UK; Fri, 29 Sep 2023 16:14:00 -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 1qmJs7-0007bM-DX for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:13:59 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qmJs3-0004Kv-RA for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:13:59 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-692a885f129so10483431b3a.0 for ; Fri, 29 Sep 2023 13:13:55 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:a7:2:18fe:3fb1:d86b:1e68]) by smtp.gmail.com with ESMTPSA id t12-20020aa7938c000000b00686236718d8sm15267033pfe.41.2023.09.29.13.13.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 13:13:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696018434; x=1696623234; 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=39AxELZdpnvLtvcdR+zVBAFROvLoU6Rddg7tcrNIFUk=; b=LXHKhNh+HVFKYNLNSFVqvoclUHzYtiwl3fKJG5yV/ldoFQ9JlLPd9Ovdvv0UzY8eJ+ nbS6N2o85tEOnMFcatizLLnvtzgOo4NFXFmYu0r6Op8PsoOdpZlJYC+r/TpPPOTvLBeP p/DuxtYpoZ/b9d6CPOrmtk9sDFZi3C6K9OJqQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696018434; x=1696623234; 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=39AxELZdpnvLtvcdR+zVBAFROvLoU6Rddg7tcrNIFUk=; b=mGFQhrcNKp91e23/pftLDXB6FQFGYmYVklFX10bH0AFYCQwxdTUOvqKVzyDc5gx86o SpEdgf/fWTrC/Lj9xX98O1HjcwREocdof6A9KzuxlGOaeH25XevVuFGMoMrmxgRt/VAZ nWXOI2y79ArDHnG7XI9mIbDYyV+Zrsm+Dg9iih2FEKxkiwu5bZGFLeB+jnRYTUrfEr0O 7kdd2s6oZj160uO8ojdmrr5W/aZEmlsrnlqL0iFlf9a/0dnlCP6lOWv58yNgbiXgNbU+ ZVDmgjz1LIYnhyGRXFewEUwd80VBIR5C1fPQw7L38zcUr2ViWUWVMWVTxdb8FLeDKYi6 +R8Q== X-Gm-Message-State: AOJu0YzFfx2Gwtg6Cpr0nka7MvYjP1+4OWGhLxu5sjSxyw/cOUwcwugm oIJEX7vHQuNMim1P7lFJ6at9AONigDyu+LuThX0= X-Google-Smtp-Source: AGHT+IFyg6xtxX/JFsKhqmTfyy6mBtQrUbOlGwhKjLJO2CEAkscuFQaKSnLYipSJ+0f7u3eMd4QXnA== X-Received: by 2002:a05:6a20:8f20:b0:157:54fd:5c26 with SMTP id b32-20020a056a208f2000b0015754fd5c26mr5796566pzk.38.1696018434226; Fri, 29 Sep 2023 13:13:54 -0700 (PDT) From: Gurchetan Singh To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, akihiko.odaki@gmail.com, ray.huang@amd.com, alex.bennee@linaro.org, shentey@gmail.com, hi@alyssa.is, ernunes@redhat.com, manos.pitsidianakis@linaro.org, philmd@linaro.org, mark.cave-ayland@ilande.co.uk Subject: [PATCH v14 7/9] gfxstream + rutabaga: meson support Date: Fri, 29 Sep 2023 13:13:39 -0700 Message-Id: <20230929201341.332-8-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20230929201341.332-1-gurchetansingh@chromium.org> References: <20230929201341.332-1-gurchetansingh@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=gurchetansingh@chromium.org; helo=mail-pf1-x436.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, DKIMWL_WL_HIGH=-0.001, 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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @chromium.org) X-ZM-MESSAGEID: 1696018531622100003 Content-Type: text/plain; charset="utf-8" - Add meson detection of rutabaga_gfx - Build virtio-gpu-rutabaga.c + associated vga/pci files when present Signed-off-by: Gurchetan Singh Tested-by: Alyssa Ross Tested-by: Emmanouil Pitsidianakis Tested-by: Akihiko Odaki Reviewed-by: Emmanouil Pitsidianakis Reviewed-by: Antonio Caggiano Reviewed-by: Akihiko Odaki --- hw/display/meson.build | 22 ++++++++++++++++++++++ meson.build | 7 +++++++ meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 +++ 4 files changed, 34 insertions(+) diff --git a/hw/display/meson.build b/hw/display/meson.build index 413ba4ab24..e362d625dd 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -79,6 +79,13 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU') if_true: [files('virtio-gpu-gl.c', 'virtio-gpu-vi= rgl.c'), pixman, virgl]) hw_display_modules +=3D {'virtio-gpu-gl': virtio_gpu_gl_ss} endif + + if rutabaga.found() + virtio_gpu_rutabaga_ss =3D ss.source_set() + virtio_gpu_rutabaga_ss.add(when: ['CONFIG_VIRTIO_GPU', rutabaga], + if_true: [files('virtio-gpu-rutabaga.c'), p= ixman]) + hw_display_modules +=3D {'virtio-gpu-rutabaga': virtio_gpu_rutabaga_ss} + endif endif =20 if config_all_devices.has_key('CONFIG_VIRTIO_PCI') @@ -95,6 +102,12 @@ if config_all_devices.has_key('CONFIG_VIRTIO_PCI') if_true: [files('virtio-gpu-pci-gl.c'), pixma= n]) hw_display_modules +=3D {'virtio-gpu-pci-gl': virtio_gpu_pci_gl_ss} endif + if rutabaga.found() + virtio_gpu_pci_rutabaga_ss =3D ss.source_set() + virtio_gpu_pci_rutabaga_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIR= TIO_PCI', rutabaga], + if_true: [files('virtio-gpu-pci-rutabag= a.c'), pixman]) + hw_display_modules +=3D {'virtio-gpu-pci-rutabaga': virtio_gpu_pci_rut= abaga_ss} + endif endif =20 if config_all_devices.has_key('CONFIG_VIRTIO_VGA') @@ -113,6 +126,15 @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA') virtio_vga_gl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'), if_false: files('acpi-vga-stub= .c')) hw_display_modules +=3D {'virtio-vga-gl': virtio_vga_gl_ss} + + if rutabaga.found() + virtio_vga_rutabaga_ss =3D ss.source_set() + virtio_vga_rutabaga_ss.add(when: ['CONFIG_VIRTIO_VGA', rutabaga], + if_true: [files('virtio-vga-rutabaga.c'), p= ixman]) + virtio_vga_rutabaga_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-v= ga.c'), + if_false: files('acpi-= vga-stub.c')) + hw_display_modules +=3D {'virtio-vga-rutabaga': virtio_vga_rutabaga_ss} + endif endif =20 system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c')) diff --git a/meson.build b/meson.build index 5139db2ff7..1e12c2964d 100644 --- a/meson.build +++ b/meson.build @@ -1061,6 +1061,12 @@ if not get_option('virglrenderer').auto() or have_sy= stem or have_vhost_user_gpu dependencies: virgl)) endif endif +rutabaga =3D not_found +if not get_option('rutabaga_gfx').auto() or have_system or have_vhost_user= _gpu + rutabaga =3D dependency('rutabaga_gfx_ffi', + method: 'pkg-config', + required: get_option('rutabaga_gfx')) +endif blkio =3D not_found if not get_option('blkio').auto() or have_block blkio =3D dependency('blkio', @@ -4293,6 +4299,7 @@ summary_info +=3D {'libtasn1': tasn1} summary_info +=3D {'PAM': pam} summary_info +=3D {'iconv support': iconv} summary_info +=3D {'virgl support': virgl} +summary_info +=3D {'rutabaga support': rutabaga} summary_info +=3D {'blkio support': blkio} summary_info +=3D {'curl support': curl} summary_info +=3D {'Multipath support': mpathpersist} diff --git a/meson_options.txt b/meson_options.txt index 57e265c871..aabc706b6d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -230,6 +230,8 @@ option('vmnet', type : 'feature', value : 'auto', description: 'vmnet.framework network backend support') option('virglrenderer', type : 'feature', value : 'auto', description: 'virgl rendering support') +option('rutabaga_gfx', type : 'feature', value : 'auto', + description: 'rutabaga_gfx support') option('png', type : 'feature', value : 'auto', description: 'PNG support with libpng') option('vnc', type : 'feature', value : 'auto', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index e4b46d5715..8efbc9851c 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -157,6 +157,7 @@ meson_options_help() { printf "%s\n" ' rbd Ceph block device driver' printf "%s\n" ' rdma Enable RDMA-based migration' printf "%s\n" ' replication replication support' + printf "%s\n" ' rutabaga-gfx rutabaga_gfx support' printf "%s\n" ' sdl SDL user interface' printf "%s\n" ' sdl-image SDL Image support for icons' printf "%s\n" ' seccomp seccomp support' @@ -428,6 +429,8 @@ _meson_option_parse() { --disable-replication) printf "%s" -Dreplication=3Ddisabled ;; --enable-rng-none) printf "%s" -Drng_none=3Dtrue ;; --disable-rng-none) printf "%s" -Drng_none=3Dfalse ;; + --enable-rutabaga-gfx) printf "%s" -Drutabaga_gfx=3Denabled ;; + --disable-rutabaga-gfx) printf "%s" -Drutabaga_gfx=3Ddisabled ;; --enable-safe-stack) printf "%s" -Dsafe_stack=3Dtrue ;; --disable-safe-stack) printf "%s" -Dsafe_stack=3Dfalse ;; --enable-sanitizers) printf "%s" -Dsanitizers=3Dtrue ;; --=20 2.42.0.582.g8ccd20d70d-goog From nobody Fri May 17 07:08:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=chromium.org ARC-Seal: i=1; a=rsa-sha256; t=1696018498; cv=none; d=zohomail.com; s=zohoarc; b=btAulI222KGMCfctjqIl+qIqzwBdxoy8g6txS+P3E5J1boz185AvrHT8NEVdOCdiGDjLjIM9n5CNxXUjqDO1JZV/jh2d7iVytJ4jj8HkWr3eHWFKhHK+Ezl8F79rs/OJ3KUatUPzTUsX2+2WE4cLTfoOS4v34voXNYEQ5BAfvi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696018498; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S9QyYfchM4u9F9KEeRrlfxqN6P5C6cQhy4Wfab7xWp4=; b=a++qPO1eyut14EHiFXcsgVMyyc6BH65J/dZs1qrdlxM+sPu8fDaeljHyJpeQf3K9q72E5YohFFv7OTwx8fspJ46Ph+f9HbnyHXU7UJa9eF0Qcj8dAL0OPiK3yU4yL6YsbyjqbugH8fSXdmQt3uouRtGaeooRnej4NAs3WEFK2tE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696018498274277.69167416798746; Fri, 29 Sep 2023 13:14:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmJs9-0007c0-SH; Fri, 29 Sep 2023 16:14:02 -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 1qmJs8-0007bW-Ni for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:14:00 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qmJs6-0004L7-BQ for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:14:00 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-690d2e13074so11819949b3a.1 for ; Fri, 29 Sep 2023 13:13:56 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:a7:2:18fe:3fb1:d86b:1e68]) by smtp.gmail.com with ESMTPSA id t12-20020aa7938c000000b00686236718d8sm15267033pfe.41.2023.09.29.13.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 13:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696018435; x=1696623235; 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=S9QyYfchM4u9F9KEeRrlfxqN6P5C6cQhy4Wfab7xWp4=; b=H/878Go6HLdR6WeUNocXZKd49MSSu8RAgWsb3Wnmzoae5TgF2vV3SQQ0b9ZhZ2pUT7 NQ/xT1On/U0rivMppr5pIF9hJxV1SlHLGNmiaBcC4Tt7ehB4weT3xWwdN3PZIV4XJilP q9M/KTdMC5vchclnTzyliD6VGlnG5UexVAxfc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696018435; x=1696623235; 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=S9QyYfchM4u9F9KEeRrlfxqN6P5C6cQhy4Wfab7xWp4=; b=aBMWldyGyO/BvItjQYVmub7Io5nUEvq1HxVsAyYP9Tj+eZ5uQWdFiLR/rtqsFw2I5e FAK4NB9KWjmzJMQVYdPR7ag46ki7tbd2Spf7jZQ5JpT+hM4r+gwf6+99c1DVtnXb28G7 1UceCYzA2jfb5ozWUzAW2vxzsTermnJsH2bmDC24aYy/j8vXJnoSEJ+vOeBfM9nAECAM 9wIWrV0xzJrpH5QWVN6zVWn5mPlqVISYBH1t34o8gmPXqzHA3TI88yDSeQG1TXHJegi0 R8/rJ6ltyO70B3PHXyy6JqiTAApafFNT427QWPFqsjm4S0TD8boxe++Y43ja4SNtkE0z wF6Q== X-Gm-Message-State: AOJu0YxtK6UB9Q41RHDdhQgRwA0VEiP/RzqFRrvtYcfzcvL5Zm6Uwz+F wyuj3ee+JMV30wYJjFNi1I+hPmPv4zFr8vcYI28= X-Google-Smtp-Source: AGHT+IG+l12LZzC+SRKaza3jhpm9Kc4DkJ3+j89vDW8LHFKtke+ByrA7077qC8tie1W8IdSdNE6Xbg== X-Received: by 2002:a05:6a20:3ca9:b0:15d:c274:2eb1 with SMTP id b41-20020a056a203ca900b0015dc2742eb1mr5856334pzj.10.1696018435537; Fri, 29 Sep 2023 13:13:55 -0700 (PDT) From: Gurchetan Singh To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, akihiko.odaki@gmail.com, ray.huang@amd.com, alex.bennee@linaro.org, shentey@gmail.com, hi@alyssa.is, ernunes@redhat.com, manos.pitsidianakis@linaro.org, philmd@linaro.org, mark.cave-ayland@ilande.co.uk Subject: [PATCH v14 8/9] gfxstream + rutabaga: enable rutabaga Date: Fri, 29 Sep 2023 13:13:40 -0700 Message-Id: <20230929201341.332-9-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20230929201341.332-1-gurchetansingh@chromium.org> References: <20230929201341.332-1-gurchetansingh@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=gurchetansingh@chromium.org; helo=mail-pf1-x42b.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, DKIMWL_WL_HIGH=-0.001, 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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @chromium.org) X-ZM-MESSAGEID: 1696018499560100001 Content-Type: text/plain; charset="utf-8" This change enables rutabaga to receive virtio-gpu-3d hypercalls when it is active. Signed-off-by: Gurchetan Singh Tested-by: Alyssa Ross Tested-by: Emmanouil Pitsidianakis Tested-by: Akihiko Odaki Reviewed-by: Antonio Caggiano Reviewed-by: Emmanouil Pitsidianakis Reviewed-by: Akihiko Odaki --- hw/display/virtio-gpu-base.c | 3 ++- hw/display/virtio-gpu.c | 5 +++-- softmmu/qdev-monitor.c | 3 +++ softmmu/vl.c | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c index 4f2b0ba1f3..50c5373b65 100644 --- a/hw/display/virtio-gpu-base.c +++ b/hw/display/virtio-gpu-base.c @@ -223,7 +223,8 @@ virtio_gpu_base_get_features(VirtIODevice *vdev, uint64= _t features, { VirtIOGPUBase *g =3D VIRTIO_GPU_BASE(vdev); =20 - if (virtio_gpu_virgl_enabled(g->conf)) { + if (virtio_gpu_virgl_enabled(g->conf) || + virtio_gpu_rutabaga_enabled(g->conf)) { features |=3D (1 << VIRTIO_GPU_F_VIRGL); } if (virtio_gpu_edid_enabled(g->conf)) { diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index be16efbd38..6efd15b6ae 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1363,8 +1363,9 @@ void virtio_gpu_device_realize(DeviceState *qdev, Err= or **errp) VirtIOGPU *g =3D VIRTIO_GPU(qdev); =20 if (virtio_gpu_blob_enabled(g->parent_obj.conf)) { - if (!virtio_gpu_have_udmabuf()) { - error_setg(errp, "cannot enable blob resources without udmabuf= "); + if (!virtio_gpu_rutabaga_enabled(g->parent_obj.conf) && + !virtio_gpu_have_udmabuf()) { + error_setg(errp, "need rutabaga or udmabuf for blob resources"= ); return; } =20 diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 74f4e41338..1b8005ae55 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -86,6 +86,9 @@ static const QDevAlias qdev_alias_table[] =3D { { "virtio-gpu-pci", "virtio-gpu", QEMU_ARCH_VIRTIO_PCI }, { "virtio-gpu-gl-device", "virtio-gpu-gl", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-gpu-gl-pci", "virtio-gpu-gl", QEMU_ARCH_VIRTIO_PCI }, + { "virtio-gpu-rutabaga-device", "virtio-gpu-rutabaga", + QEMU_ARCH_VIRTIO_MMIO }, + { "virtio-gpu-rutabaga-pci", "virtio-gpu-rutabaga", QEMU_ARCH_VIRTIO_P= CI }, { "virtio-input-host-device", "virtio-input-host", QEMU_ARCH_VIRTIO_MM= IO }, { "virtio-input-host-ccw", "virtio-input-host", QEMU_ARCH_VIRTIO_CCW }, { "virtio-input-host-pci", "virtio-input-host", QEMU_ARCH_VIRTIO_PCI }, diff --git a/softmmu/vl.c b/softmmu/vl.c index 59a472a0b1..5b030e3b2e 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -215,6 +215,7 @@ static struct { { .driver =3D "ati-vga", .flag =3D &default_vga }, { .driver =3D "vhost-user-vga", .flag =3D &default_vga }, { .driver =3D "virtio-vga-gl", .flag =3D &default_vga }, + { .driver =3D "virtio-vga-rutabaga", .flag =3D &default_vga }, }; =20 static QemuOptsList qemu_rtc_opts =3D { --=20 2.42.0.582.g8ccd20d70d-goog From nobody Fri May 17 07:08:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=chromium.org ARC-Seal: i=1; a=rsa-sha256; t=1696018512; cv=none; d=zohomail.com; s=zohoarc; b=AcVBOPv2udmcP8LE9nTSlG/OPrkLJVYbBrjEv0O2iphQ0KUOzA01EpRjfZKCVZRQuBxnP34lHv9OgkZfFBOeEoJlBDwYO4z5UcsrFC/exSnzb8fgSin+4ZQC6Bd2L3BR3UVbBRg8eHTOL+2+vib9mPrJanuMjHNxPgMJzVkeRHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696018512; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Up46gG40z1exqA4Wctak20FAQcQzj+VBT2UXPZM+Lqs=; b=Ho46MJviEI+DyAXuQAxxvuFyxY6QwUG632LKliRgabHI5f9A912iA6R+/8L+wfqMqL/pV/Ef8V2LGDYiYTJH1TYND2uC+Cb6Q22+jvinfYT1rwEG4EuDQaATEV6Qod4wHKhVDEU0aluZ5ab/Q1dGCPBCk8I5ztzJFlSOR7eEhMY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696018512446209.38592766330248; Fri, 29 Sep 2023 13:15:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmJsF-0007f6-8N; Fri, 29 Sep 2023 16:14:07 -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 1qmJsE-0007dw-0e for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:14:06 -0400 Received: from mail-oo1-xc2b.google.com ([2607:f8b0:4864:20::c2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qmJs6-0004LL-Lb for qemu-devel@nongnu.org; Fri, 29 Sep 2023 16:14:05 -0400 Received: by mail-oo1-xc2b.google.com with SMTP id 006d021491bc7-57bbb38d5d4so4995369eaf.2 for ; Fri, 29 Sep 2023 13:13:58 -0700 (PDT) Received: from gurchetansingh0.mtv.corp.google.com ([2620:15c:a7:2:18fe:3fb1:d86b:1e68]) by smtp.gmail.com with ESMTPSA id t12-20020aa7938c000000b00686236718d8sm15267033pfe.41.2023.09.29.13.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 13:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696018437; x=1696623237; 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=Up46gG40z1exqA4Wctak20FAQcQzj+VBT2UXPZM+Lqs=; b=CAyt16oYK2zBNxwNlKRvzp3iEwebM0U6NvOd7QD8ObJAwYMAVrHiL1IwcEDvu/fEPk gFX5xmT3lZh4ZIGsgcC/ZHwlk7u0kvq6mckw8VFiVLFcoJJjfIG5ih+F7lyAfAlvz2OS 8rr8N1xTE4icZUwNp99j1M3rMOPHAN3r+EUs8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696018437; x=1696623237; 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=Up46gG40z1exqA4Wctak20FAQcQzj+VBT2UXPZM+Lqs=; b=tekH7vmiHLeMZY+enil7UFuS6QDaY//A9ITxSaQ9c6EiM9V7oyuTembP2UtewQZqW2 ViWaar5qLNYsP9Gz9tvUxKjVMzt3b3p6FnQlpR6Ca6Fl3aYyqn64aRxcu2FA5U0Rks97 rFoAvtGpfoY8VZ7OpO28FHCSLdbe4yQZ2AsDWia78WPFFz/rqJyf45Y1KzBzwCU+iCUe s6rAn4ktHF2zy9b7GAF+QMKZkfe7OsjW0qbM7UBpR5VnNIaxguSOlJdJG99jQRzCkz4y KkZ4G8RVTALvbNrPmg8DRHqkna7ZBHQsKQe9/2m36D7sVz//4ppoeYCAzbI0MgkQXWyd cluQ== X-Gm-Message-State: AOJu0YyvYpcLZoGN6UOgWs6gRQOAmmftf4PuXHGyX1yiuEMup9WyFdS5 RTCaU1YLuF/tPg/qeaKA5F3MJ27qp0Vixci/7tA= X-Google-Smtp-Source: AGHT+IHnvBt5XmtJfO/ZGSDEYMhK85jbQXROqsdzIqGP09W5VhDKjLylpHs/MgasOjdviioiiDvW/A== X-Received: by 2002:a05:6358:290b:b0:143:788c:2560 with SMTP id y11-20020a056358290b00b00143788c2560mr6741751rwb.15.1696018436806; Fri, 29 Sep 2023 13:13:56 -0700 (PDT) From: Gurchetan Singh To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, akihiko.odaki@gmail.com, ray.huang@amd.com, alex.bennee@linaro.org, shentey@gmail.com, hi@alyssa.is, ernunes@redhat.com, manos.pitsidianakis@linaro.org, philmd@linaro.org, mark.cave-ayland@ilande.co.uk Subject: [PATCH v14 9/9] docs/system: add basic virtio-gpu documentation Date: Fri, 29 Sep 2023 13:13:41 -0700 Message-Id: <20230929201341.332-10-gurchetansingh@chromium.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20230929201341.332-1-gurchetansingh@chromium.org> References: <20230929201341.332-1-gurchetansingh@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::c2b; envelope-from=gurchetansingh@chromium.org; helo=mail-oo1-xc2b.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, DKIMWL_WL_HIGH=-0.001, 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, T_SPF_TEMPERROR=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @chromium.org) X-ZM-MESSAGEID: 1696018512754100001 Content-Type: text/plain; charset="utf-8" This adds basic documentation for virtio-gpu. Suggested-by: Akihiko Odaki Signed-off-by: Gurchetan Singh Tested-by: Alyssa Ross Tested-by: Emmanouil Pitsidianakis Tested-by: Akihiko Odaki Reviewed-by: Emmanouil Pitsidianakis Reviewed-by: Antonio Caggiano Reviewed-by: Akihiko Odaki --- docs/system/device-emulation.rst | 1 + docs/system/devices/virtio-gpu.rst | 112 +++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 docs/system/devices/virtio-gpu.rst diff --git a/docs/system/device-emulation.rst b/docs/system/device-emulatio= n.rst index 4491c4cbf7..1167f3a9f2 100644 --- a/docs/system/device-emulation.rst +++ b/docs/system/device-emulation.rst @@ -91,6 +91,7 @@ Emulated Devices devices/nvme.rst devices/usb.rst devices/vhost-user.rst + devices/virtio-gpu.rst devices/virtio-pmem.rst devices/vhost-user-rng.rst devices/canokey.rst diff --git a/docs/system/devices/virtio-gpu.rst b/docs/system/devices/virti= o-gpu.rst new file mode 100644 index 0000000000..5e0b33bc74 --- /dev/null +++ b/docs/system/devices/virtio-gpu.rst @@ -0,0 +1,112 @@ +.. + SPDX-License-Identifier: GPL-2.0-or-later + +virtio-gpu +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +This document explains the setup and usage of the virtio-gpu device. +The virtio-gpu device paravirtualizes the GPU and display controller. + +Linux kernel support +-------------------- + +virtio-gpu requires a guest Linux kernel built with the +``CONFIG_DRM_VIRTIO_GPU`` option. + +QEMU virtio-gpu variants +------------------------ + +QEMU virtio-gpu device variants come in the following form: + + * ``virtio-vga[-BACKEND]`` + * ``virtio-gpu[-BACKEND][-INTERFACE]`` + * ``vhost-user-vga`` + * ``vhost-user-pci`` + +**Backends:** QEMU provides a 2D virtio-gpu backend, and two accelerated +backends: virglrenderer ('gl' device label) and rutabaga_gfx ('rutabaga' +device label). There is a vhost-user backend that runs the graphics stack +in a separate process for improved isolation. + +**Interfaces:** QEMU further categorizes virtio-gpu device variants based +on the interface exposed to the guest. The interfaces can be classified +into VGA and non-VGA variants. The VGA ones are prefixed with virtio-vga +or vhost-user-vga while the non-VGA ones are prefixed with virtio-gpu or +vhost-user-gpu. + +The VGA ones always use the PCI interface, but for the non-VGA ones, the +user can further pick between MMIO or PCI. For MMIO, the user can suffix +the device name with -device, though vhost-user-gpu does not support MMIO. +For PCI, the user can suffix it with -pci. Without these suffixes, the +platform default will be chosen. + +virtio-gpu 2d +------------- + +The default 2D backend only performs 2D operations. The guest needs to +employ a software renderer for 3D graphics. + +Typically, the software renderer is provided by `Mesa`_ or `SwiftShader`_. +Mesa's implementations (LLVMpipe, Lavapipe and virgl below) work out of box +on typical modern Linux distributions. + +.. parsed-literal:: + -device virtio-gpu + +.. _Mesa: https://www.mesa3d.org/ +.. _SwiftShader: https://github.com/google/swiftshader + +virtio-gpu virglrenderer +------------------------ + +When using virgl accelerated graphics mode in the guest, OpenGL API calls +are translated into an intermediate representation (see `Gallium3D`_). The +intermediate representation is communicated to the host and the +`virglrenderer`_ library on the host translates the intermediate +representation back to OpenGL API calls. + +.. parsed-literal:: + -device virtio-gpu-gl + +.. _Gallium3D: https://www.freedesktop.org/wiki/Software/gallium/ +.. _virglrenderer: https://gitlab.freedesktop.org/virgl/virglrenderer/ + +virtio-gpu rutabaga +------------------- + +virtio-gpu can also leverage rutabaga_gfx to provide `gfxstream`_ +rendering and `Wayland display passthrough`_. With the gfxstream rendering +mode, GLES and Vulkan calls are forwarded to the host with minimal +modification. + +The crosvm book provides directions on how to build a `gfxstream-enabled +rutabaga`_ and launch a `guest Wayland proxy`_. + +This device does require host blob support (``hostmem`` field below). The +``hostmem`` field specifies the size of virtio-gpu host memory window. +This is typically between 256M and 8G. + +At least one virtio-gpu capability set ("capset") must be specified when +starting the device. The currently capsets supported are ``gfxstream-vulk= an`` +and ``cross-domain`` for Linux guests. For Android guests, the experimental +``gfxstream-gles`` and ``gfxstream-composer`` capsets are also supported. + +The device will try to auto-detect the wayland socket path if the +``cross-domain`` capset name is set. The user may optionally specify +``wayland-socket-path`` for non-standard paths. + +The ``wsi`` option can be set to ``surfaceless`` or ``headless``. +Surfaceless doesn't create a native window surface, but does copy from the +render target to the Pixman buffer if a virtio-gpu 2D hypercall is issued. +Headless is like surfaceless, but doesn't copy to the Pixman buffer. +Surfaceless is the default if ``wsi`` is not specified. + +.. parsed-literal:: + -device virtio-gpu-rutabaga,gfxstream-vulkan=3Don,cross-domain=3Don, + hostmem=3D8G,wayland-socket-path=3D/tmp/nonstandard/mock_wayland.so= ck, + wsi=3Dheadless + +.. _gfxstream: https://android.googlesource.com/platform/hardware/google/g= fxstream/ +.. _Wayland display passthrough: https://www.youtube.com/watch?v=3DOZJiHMt= IQ2M +.. _gfxstream-enabled rutabaga: https://crosvm.dev/book/appendix/rutabaga_= gfx.html +.. _guest Wayland proxy: https://crosvm.dev/book/devices/wayland.html --=20 2.42.0.582.g8ccd20d70d-goog