From nobody Thu Oct 31 00:18:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612276675; cv=none; d=zohomail.com; s=zohoarc; b=nENdglwRQ96pqjBXFyrzRuXtDX9oq9ndPLTRj2Bu1WiDWEezaxNdn6oX434QB0mo6KBm6K2ffOtR5YfYHtwZrCNzqVw/G8d5cey8Z9ZWRuGYPLPo8s1dNJCZu7lnjOqeeJF8Ue0kBgk7aMtBZurjNkFOmbuCkrpP/N3LAccKvUI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612276675; 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=eb2CGzD3TyOgBuW3soHR73dC4rDlZH0FmrocXLTMxhI=; b=adMuF9b5tScU7Qup7Rk0RezIHMl8bEJO+PXWny9a3am40bQV9H6KjO0mvIh81k9cZbGGRX0Il9kP1HLSWmAGZL3wPE3OinXArcfS2/wL1LDqezXkiePiQEOmICjsLj7m8eRNSC1Nkij93jjo5H/6rhbyT1Yey5YJubW8x1nrK+I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612276675449149.914433412162; Tue, 2 Feb 2021 06:37:55 -0800 (PST) Received: from localhost ([::1]:59024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6woU-0004PW-Bw for importer@patchew.org; Tue, 02 Feb 2021 09:37:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6wfE-00011c-Bc for qemu-devel@nongnu.org; Tue, 02 Feb 2021 09:28:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:33257) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6wfC-0003Pq-DE for qemu-devel@nongnu.org; Tue, 02 Feb 2021 09:28:20 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-591-W9bEqNQvNa6Uh9lHvjwokg-1; Tue, 02 Feb 2021 09:28:16 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D8E6874981 for ; Tue, 2 Feb 2021 14:28:15 +0000 (UTC) Received: from localhost (unknown [10.36.110.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82F1E60C5F; Tue, 2 Feb 2021 14:28:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612276097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eb2CGzD3TyOgBuW3soHR73dC4rDlZH0FmrocXLTMxhI=; b=YRBYjHVfyWRo7Egz7Es6/4DCbvFxZ9ticlvfH+8Vdtl2tseZKfcY0vwI3odAdlLfzW9jf8 1BRGh/XYOcxvWNBxAXdjcWtE/GDOvEWtc8qT0Q8fQzaC01cviFr2bS0LoggsPBnVr162cr EB7LQ8y4I2PToYeuDqNChq78Qr2+jKY= X-MC-Unique: W9bEqNQvNa6Uh9lHvjwokg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 09/20] ui: remove console_has_gl_dmabuf() Date: Tue, 2 Feb 2021 18:26:14 +0400 Message-Id: <20210202142625.609070-10-marcandre.lureau@redhat.com> In-Reply-To: <20210202142625.609070-1-marcandre.lureau@redhat.com> References: <20210202142625.609070-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.386, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau This check is currently limited. It only is used by vhost-user-gpu (not by vfio-display), and will print an error repeatedly during run-time. We are going to dissociate the GL context from the DisplayChangeListener, and listeners may come and go. The following patches will address this differently. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/ui/console.h | 1 - hw/display/vhost-user-gpu.c | 5 ----- ui/console.c | 5 ----- 3 files changed, 11 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index bea2b6329a..ac989fdf70 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -323,7 +323,6 @@ void dpy_gl_ctx_destroy(QemuConsole *con, QEMUGLContext= ctx); int dpy_gl_ctx_make_current(QemuConsole *con, QEMUGLContext ctx); =20 bool console_has_gl(QemuConsole *con); -bool console_has_gl_dmabuf(QemuConsole *con); =20 static inline int surface_stride(DisplaySurface *s) { diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 55b0ed15f2..dd587436ff 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -224,11 +224,6 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUs= erGpuMsg *msg) close(dmabuf->fd); dmabuf->fd =3D -1; } - if (!console_has_gl_dmabuf(con)) { - /* it would be nice to report that error earlier */ - error_report("console doesn't support dmabuf!"); - break; - } dpy_gl_release_dmabuf(con, dmabuf); if (fd =3D=3D -1) { dpy_gl_scanout_disable(con); diff --git a/ui/console.c b/ui/console.c index ab9224429e..b5bc3f7699 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1463,11 +1463,6 @@ bool console_has_gl(QemuConsole *con) return con->gl !=3D NULL; } =20 -bool console_has_gl_dmabuf(QemuConsole *con) -{ - return con->gl !=3D NULL && con->gl->ops->dpy_gl_scanout_dmabuf !=3D N= ULL; -} - void register_displaychangelistener(DisplayChangeListener *dcl) { static const char nodev[] =3D --=20 2.29.0