From patchwork Mon Oct 30 10:47:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1856998 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hJGD4ywm; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SJqmp4XN4z1yQ4 for ; Mon, 30 Oct 2023 21:50:34 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxPqJ-00072o-5S; Mon, 30 Oct 2023 06:49:59 -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 1qxPqH-0006p2-BV for qemu-ppc@nongnu.org; Mon, 30 Oct 2023 06:49:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxPqD-0002md-KT for qemu-ppc@nongnu.org; Mon, 30 Oct 2023 06:49:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698662993; 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=3AFikoxqnKEK721avSJDiab7E/fh9h5DnwunW97iVck=; b=hJGD4ywmRlkk76BCZidfHnMsy7ouqRpQWsP7zo90LeuaYj+Z9UwVatWA66PhYYK9jHVsG0 KhLzZYO0UfxS2KlXj18p4e+Baev6DhX8o0RvhOQsqvKbgsAJuNTWVCOvqhaUHRmB1n+8uf I76pyI+/WrMt+y5lEaYIaAxL/h9HF44= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-556-U6ww7AbROeqLIRAn-oefyA-1; Mon, 30 Oct 2023 06:49:50 -0400 X-MC-Unique: U6ww7AbROeqLIRAn-oefyA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 A98C11C07554; Mon, 30 Oct 2023 10:49:49 +0000 (UTC) Received: from localhost (unknown [10.39.208.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDF402026D4C; Mon, 30 Oct 2023 10:49:48 +0000 (UTC) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Thomas Huth , BALATON Zoltan , Gerd Hoffmann , "Michael S. Tsirkin" , qemu-ppc@nongnu.org, Markus Armbruster , "Dr. David Alan Gilbert" , qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Eric Blake Subject: [PATCH v7 22/23] hw/display: make ATI_VGA depend on PIXMAN Date: Mon, 30 Oct 2023 14:47:53 +0400 Message-ID: <20231030104755.124188-23-marcandre.lureau@redhat.com> In-Reply-To: <20231030104755.124188-1-marcandre.lureau@redhat.com> References: <20231030104755.124188-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.478, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau To avoid a kconfig cycle, change "depends on PCI" to "select PCI". Signed-off-by: Marc-André Lureau Acked-by: BALATON Zoltan --- configs/devices/mips64el-softmmu/default.mak | 3 +-- hw/display/Kconfig | 3 ++- hw/display/meson.build | 2 +- hw/mips/Kconfig | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/devices/mips64el-softmmu/default.mak b/configs/devices/mips64el-softmmu/default.mak index d5188f7ea5..4d80d60511 100644 --- a/configs/devices/mips64el-softmmu/default.mak +++ b/configs/devices/mips64el-softmmu/default.mak @@ -1,9 +1,8 @@ # Default configuration for mips64el-softmmu include ../mips-softmmu/common.mak -CONFIG_FULOONG=y +#CONFIG_FULOONG=y CONFIG_LOONGSON3V=y -CONFIG_ATI_VGA=y CONFIG_RTL8139_PCI=y CONFIG_JAZZ=y CONFIG_VT82C686=y diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 1aafe1923d..8219225a1c 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -125,7 +125,8 @@ config DPCD config ATI_VGA bool default y if PCI_DEVICES - depends on PCI + depends on PIXMAN + select PCI select VGA select BITBANG_I2C select DDC diff --git a/hw/display/meson.build b/hw/display/meson.build index 9c06aaee20..344dfe3d8c 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -62,7 +62,7 @@ system_ss.add(when: 'CONFIG_XLNX_DISPLAYPORT', if_true: files('xlnx_dp.c')) system_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c')) -system_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d.c', 'ati_dbg.c')) +system_ss.add(when: 'CONFIG_ATI_VGA', if_true: [files('ati.c', 'ati_2d.c', 'ati_dbg.c'), pixman]) if config_all_devices.has_key('CONFIG_VIRTIO_GPU') diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index ac1eb06a51..48bb15fdd3 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -32,7 +32,9 @@ config JAZZ config FULOONG bool + default y if MIPS select PCI_BONITO + depends on ATI_VGA config LOONGSON3V bool