From nobody Thu Apr 25 08:52:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) client-ip=78.46.105.101; envelope-from=seabios-bounces@seabios.org; helo=coreboot.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593076667; cv=none; d=zohomail.com; s=zohoarc; b=aATf6WqccjlLI7gKa4/c24rroQ5FrPHg6/PBP++ns8jOoF4jKA1AAF2zsipX9DGQn9sN3M4/EjE30txLysCpB8duXXBf/FJvTiczDQkLXfby+3IfsHaexvVueKC1C8XJbVnJwougVT33JjNw+4CJFKd8iFT5emIBHBneFiB14eU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593076667; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Subject:To; bh=ceiV6ijPUO7RLzX+ju7IPzn+z9qNZtUm3VRboHsRXGg=; b=mB+spEM9Xxg8lTmNcKbrjQqOkIinrT3BITpdtci9zqt7jXp5OkUdNY0OHzfF5wx8gzZMtYMLzRZ3KgOrVws+otdDw4K/G5NIPjkOpKOp0EWdJ1Ca9CZBs42e78CTgVeZY1YXUM28DY2gI018+caIavCAWt8shpHDD7bbXdMmwbg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from coreboot.org (coreboot.org [78.46.105.101]) by mx.zohomail.com with SMTPS id 1593076667199416.4330105544119; Thu, 25 Jun 2020 02:17:47 -0700 (PDT) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTPA id AB64A10C1986; Thu, 25 Jun 2020 09:17:42 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTP id C1F8910C1983 for ; Thu, 25 Jun 2020 09:17:24 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-211-IhmpF4J8OyOk9oeUSO-Z0w-1; Thu, 25 Jun 2020 05:17:21 -0400 Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BBF00107ACCD for ; Thu, 25 Jun 2020 09:17:20 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80D412B4B8; Thu, 25 Jun 2020 09:17:17 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) id C9DF89D71; Thu, 25 Jun 2020 11:17:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593076643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type; bh=ejZvh8j9dgx/4PWIP8QV4BJ7PGu1rzfsmrNDyUvFndI=; b=EiNCjbVjX8aRFd2PoRa85gYqA5e9cV9vh83J4WprB/fLKXfLOYKRZHLS4oR6jIRfe3ySDk kIlI8b/9YOVsNzhncXae+i7cX0sM/Ee6+98LdohPcyd09HTGuWt+tf8yNcLv1d5KMwg+hi LABw/8uPjl10As4WoeBQi9l0bm0usHA= X-MC-Unique: IhmpF4J8OyOk9oeUSO-Z0w-1 From: Gerd Hoffmann To: seabios@seabios.org Date: Thu, 25 Jun 2020 11:17:09 +0200 Message-Id: <20200625091709.8550-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: RG5YCWL76SHWF7743WP3KH3GEFTDJJVY X-Message-ID-Hash: RG5YCWL76SHWF7743WP3KH3GEFTDJJVY X-MailFrom: kraxel@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-seabios.seabios.org-0; header-match-seabios.seabios.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Gerd Hoffmann X-Mailman-Version: 3.3.1 Precedence: list Subject: [SeaBIOS] [PATCH] vga: fix cirrus bios List-Id: SeaBIOS mailing list Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Authentication-Results: coreboot.org; auth=pass smtp.auth=mailman@coreboot.org smtp.mailfrom=seabios-bounces@seabios.org X-Spamd-Bar: -- X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Little mistake, big effect. The patch adding the ati driver broke cirrus due to a missing "else", which effectively downgrades cirrus to standard vga. Fixes: 34b6ecc16074 ("vga: add atiext driver") Signed-off-by: Gerd Hoffmann Reviewed-by: Paul Menzel --- vgasrc/vgahw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vgasrc/vgahw.h b/vgasrc/vgahw.h index c774f4f2c6b7..8b64660e5ef7 100644 --- a/vgasrc/vgahw.h +++ b/vgasrc/vgahw.h @@ -36,7 +36,7 @@ static inline int vgahw_set_mode(struct vgamode_s *vmode_= g, int flags) { static inline void vgahw_list_modes(u16 seg, u16 *dest, u16 *last) { if (CONFIG_VGA_CIRRUS) clext_list_modes(seg, dest, last); - if (CONFIG_VGA_ATI) + else if (CONFIG_VGA_ATI) ati_list_modes(seg, dest, last); else if (CONFIG_VGA_BOCHS) bochsvga_list_modes(seg, dest, last); --=20 2.18.4 _______________________________________________ SeaBIOS mailing list -- seabios@seabios.org To unsubscribe send an email to seabios-leave@seabios.org