From nobody Mon Nov 25 05:14:51 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1717067126; cv=none; d=zohomail.com; s=zohoarc; b=RXxq30Xhq/5ikz6UHy1ZLeeWiExrV0K9c6z8ZVVkzELIAjEB+8sU9wjoddbVUR3oZcco7XdxHg/ozHPlkgQ4sKEUd6O99a1F8LmOH3aztKn172haqnnY93sVoh0TktKDz+1x/H1/3QJJPlnjEqSeXjX385DA+AzuvEp45lAn84Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717067126; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cxEaRxvFBwC7Pqt5KKTcfeLxFQTr3RTmikUqbsB4wvg=; b=ePrRItGqtlllfhW2HmyH8n/wE9YvomVGEMEhMEoCXIIB7SWaPPZWWCoRJ9ok23Yl2MQtTrzfUiheL8j+MSDtMJZGlAUcPljitYHDtGDsEbFirsH7fCrEpJD+OI0E//MpWykJkiC4ZhGO1pJBzf1GUDSRwk4nq0O2355A/qBYkeA= 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 1717067126924733.6091000477445; Thu, 30 May 2024 04:05:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCda6-0001Aj-Sw; Thu, 30 May 2024 07:04:26 -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 1sCda5-0001AQ-PJ for qemu-devel@nongnu.org; Thu, 30 May 2024 07:04:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCda4-000748-1f for qemu-devel@nongnu.org; Thu, 30 May 2024 07:04:25 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-671-CfWU5Ae8M7K_1fBIQdhqUA-1; Thu, 30 May 2024 07:04:19 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6C7BD85A58C; Thu, 30 May 2024 11:04:19 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 12A03286E; Thu, 30 May 2024 11:04:18 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D625418000A9; Thu, 30 May 2024 13:04:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717067061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=cxEaRxvFBwC7Pqt5KKTcfeLxFQTr3RTmikUqbsB4wvg=; b=T+EMA6Arc+7qMb8LGfS6pW0jcIB7Kq7/pSQolOoB2IHIXOtfju87T0Gbot1vJn13evtLJH c5fKBXZoMuYt82C0FIbtJr5we0yuuAV1+dprdJNy3RhTHLesY34YjGcVEPi7AHcQuvDRsf PMQnCVEUJzGiB4e+gz3tlHNGmU9n938= X-MC-Unique: CfWU5Ae8M7K_1fBIQdhqUA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , qemu-stable@nongnu.org Subject: [PATCH] stdvga: fix screen blanking Date: Thu, 30 May 2024 13:04:17 +0200 Message-ID: <20240530110417.1724583-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 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=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.085, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1717067129179100001 Content-Type: text/plain; charset="utf-8" In case the display surface uses a shared buffer (i.e. uses vga vram directly instead of a shadow) go unshare the buffer before clearing it. This avoids vga memory corruption, which in turn fixes unblanking not working properly with X11. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2067 Signed-off-by: Gerd Hoffmann --- hw/display/vga.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/display/vga.c b/hw/display/vga.c index 30facc6c8e33..34ab8eb9b745 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1762,6 +1762,12 @@ static void vga_draw_blank(VGACommonState *s, int fu= ll_update) if (s->last_scr_width <=3D 0 || s->last_scr_height <=3D 0) return; =20 + if (is_buffer_shared(surface)) { + /* unshare buffer, otherwise the blanking corrupts vga vram */ + qemu_console_resize(s->con, s->last_scr_width, s->last_scr_height); + surface =3D qemu_console_surface(s->con); + } + w =3D s->last_scr_width * surface_bytes_per_pixel(surface); d =3D surface_data(surface); for(i =3D 0; i < s->last_scr_height; i++) { --=20 2.45.1