From patchwork Thu Oct 4 20:06:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10626609 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5491C1926 for ; Thu, 4 Oct 2018 20:10:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46D1E296C0 for ; Thu, 4 Oct 2018 20:10:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A7EF296C4; Thu, 4 Oct 2018 20:10:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B5FE0296C0 for ; Thu, 4 Oct 2018 20:10:25 +0000 (UTC) Received: from localhost ([::1]:58818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g89x2-0002Jj-VP for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 Oct 2018 16:10:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g89te-0008ME-52 for qemu-devel@nongnu.org; Thu, 04 Oct 2018 16:06:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g89tW-0007tw-Jg for qemu-devel@nongnu.org; Thu, 04 Oct 2018 16:06:52 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:40402) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g89tU-0007p7-MN for qemu-devel@nongnu.org; Thu, 04 Oct 2018 16:06:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1538683610; x=1570219610; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=OR8cSTg43u2HRif36r8UliYJO6prM1ZjTuaJBzXo+0Y=; b=PDqbGeWinzetwl/St35YypKpjlv4iUkKYChIMARR2FwwqL1aaZp4aCAZ lwMjRV8oMnHnKcU5uWlgVj0jSHCCAP1a67gpDAl0gtPRJYRF8YAuMvfYi 39b+GFJoByIxteE+WmnPMd63nJmZliLn9hutUot6H/5qlUccy4U4FcgAh QF208Do09bgfNEDkQM9uINp6DwfhiTmYrbDx/MQjFwp/j01+vg5BvxT6D EHRAxNMsk2Jp4dc+QCBgXe891LcsFx7o7A1HL0P03ZthiOOnPyo/O+9Xm En/b0yvOsIXxrWa0Cbf6Zl8H9teRkLdL1KpkHOW9+W10Pb2Ncyt26pLRf w==; X-IronPort-AV: E=Sophos;i="5.54,341,1534780800"; d="scan'208";a="188915739" Received: from mail-bl2nam02lp0087.outbound.protection.outlook.com (HELO NAM02-BL2-obe.outbound.protection.outlook.com) ([207.46.163.87]) by ob1.hgst.iphmx.com with ESMTP; 05 Oct 2018 04:06:44 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lCPxjArDC0q7bLR1+dbtO/MmxIZMlo2oxoHhelxWxuE=; b=NOdgGM5xBfOZTTpZwBNdbDgoFDznIb/di0tuLUkpaMAs+Tt/FdVkJfijcjRX7AZNmrEplNqNic96DHEplx7swh2PlL+Iog+/1JQxu6iwyrzymqs/U8GkkxSBWlX7rhxQVQNPPTcI9Tr+8XQa13SrmAkhjD3V/gWcDllKYlmLPF0= Received: from MWHPR04MB0401.namprd04.prod.outlook.com (10.173.48.18) by MWHPR04MB1136.namprd04.prod.outlook.com (10.173.51.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.25; Thu, 4 Oct 2018 20:06:38 +0000 Received: from MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::f94c:102e:8dce:7c02]) by MWHPR04MB0401.namprd04.prod.outlook.com ([fe80::f94c:102e:8dce:7c02%6]) with mapi id 15.20.1185.026; Thu, 4 Oct 2018 20:06:38 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "mjc@sifive.com" Thread-Topic: [PATCH v5 3/5] riscv: Enable VGA and PCIE_VGA Thread-Index: AQHUXB3CjSVc/kTVM0yh3OlGpgILWg== Date: Thu, 4 Oct 2018 20:06:38 +0000 Message-ID: <8323df439d7937e910b31c301b243aafb954aba9.1538683492.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.17.1 x-clientproxiedby: BYAPR11CA0072.namprd11.prod.outlook.com (2603:10b6:a03:80::49) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MWHPR04MB1136; 6:fJqclfUJtBgkXDS+8Xl6Bf0E+0zqJvfPagwAgonqf4dJmiKm1VpabEeTBNdRG0V9AC5askowCILYul5qGf++G7yXnBEbdjWHsT5wjfxiQ5mI2IioEPG1zJc+mNVD3ByAGQ0FYUXzppFH9QxgfQmV2ckeMOFmmlIYt/njC0C1etB8/JprCPx/hgM1fcc4SX/taE07ki5bmdpFyIaZAqRG1L2Ny7rLTDqlgiABd0CFhey/AREDR2ScrzZ4bhVH0eplC/QnoXRdtqhC0wEumyt1T0IIQoxzJZB4OQTpxmj10ec4C3ZLvyte+uYSMVQvlrsa4ImGQzBA7q+vxy8kf/lPRfHnOg56QcKamhdh11U553atWXpPCRpVBpaUmF9WYd5G2PzzsYpwDdlfcB17Wdd2Tt1mTM8DSaS2/0kdpZLQ8fq4ED8nbtaKUxLiIV1DbE8vtp2ZWtjx92ovH4SSHqjbbQ==; 5:lxWL+I4Ueico4iLFNevPZaZXH69E0iQ5v3Pfiq5SBuihHzkr+VIERFsxPjyXE1XcE+ytZBBSUsJyCHyGTdlcwn8l7E/kUmBtoXdQYi/goaUdK8HgXYiKqFltwDcLh7HlUW2p1SD3bCrcS2NOTLQpL5exUqxnEu/JKYvJK6TME80=; 7:cJPw5qme38jIV7qwloYyz3V9DknmS6k8+XheF1mWPXuBEzlyjGXEjAAU7N5SatkSAtK0fPXTrjAcdm356orS/xxP5h9gqrZ/KP1OEZIpgtq9k3FRg4waDubk+cl22B0OruEDobh+q8p7dkubeu0RUoF6lSGS6gAnj8hKmrJ+ETdenTIHPfZIlAHWizObbE/WWf3Aov1ot0W5sZLI/sohCFWYkjbkVrZcmNK8be8lmyrycUbQWvv5Ijk/3Yn6b6sA x-ms-office365-filtering-correlation-id: 91e940fe-41cf-491f-8d68-08d62a34e48e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB1136; x-ms-traffictypediagnostic: MWHPR04MB1136: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(3231355)(944501410)(52105095)(10201501046)(6055026)(149066)(150057)(6041310)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(201708071742011)(7699051); SRVR:MWHPR04MB1136; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB1136; x-forefront-prvs: 0815F8251E x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(376002)(396003)(39860400002)(136003)(366004)(189003)(199004)(99286004)(66066001)(486006)(478600001)(5660300001)(4326008)(2906002)(72206003)(71200400001)(6436002)(39060400002)(6486002)(5250100002)(76176011)(36756003)(6506007)(386003)(71190400001)(6512007)(52116002)(53936002)(118296001)(25786009)(81166006)(2501003)(256004)(110136005)(102836004)(68736007)(54906003)(316002)(6116002)(3846002)(305945005)(105586002)(14454004)(44832011)(106356001)(186003)(476003)(446003)(7736002)(26005)(2616005)(50226002)(97736004)(11346002)(81156014)(8676002)(86362001)(8936002)(2900100001); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB1136; H:MWHPR04MB0401.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-microsoft-antispam-message-info: hB5v/0lYYLlOK21iXWUdDr6R9539PVneA/yo6k3YvS5WC1s6wqid0TAUHI6y6Qwg8qzp5xSFQahMB+CDg8wos4gGwHnSVf2u4PZNCoah8xJawXTI+qZwkKx+qKS94pF391sbfuCYA82/Wk8cOV2pA7zaQw6Z6Mqm1gDxueoCANxRFx2bkmAsZUDSUVfxx2OqZhzZpwasQzm4eKROa8X75sgB9bWUKiYzsMm52de1jqTNn98xdl12TNXlf5qWzUVBcYlwFhNt3Bt8PSdLjtbPSKP7LnyjDra6q4Hj9ZG3/XGSSYGYMjG/2S5jo3KV7nwUTsnBUnXd5P5aqzt8wDnxHQU/kWTBPjFIXT1b+HvUrl8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91e940fe-41cf-491f-8d68-08d62a34e48e X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Oct 2018 20:06:38.4991 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB1136 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PATCH v5 3/5] riscv: Enable VGA and PCIE_VGA X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "alistair23@gmail.com" , "palmer@sifive.com" , Alistair Francis , "stephen@eideticom.com" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Enable compile support for VGA devices. This allows the user to conenct a display by adding '-device bochs-display -display sdl' to their command line argument. Signed-off-by: Alistair Francis --- default-configs/riscv32-softmmu.mak | 3 +++ default-configs/riscv64-softmmu.mak | 3 +++ hw/riscv/virt.c | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index 3e3d195f37..05fae82f1b 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -9,3 +9,6 @@ CONFIG_CADENCE=y CONFIG_PCI_GENERIC=y CONFIG_PCI_XILINX=y + +CONFIG_VGA=y +CONFIG_VGA_PCI=y diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak index 3e3d195f37..05fae82f1b 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -9,3 +9,6 @@ CONFIG_CADENCE=y CONFIG_PCI_GENERIC=y CONFIG_PCI_XILINX=y + +CONFIG_VGA=y +CONFIG_VGA_PCI=y diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 9bd2c10581..62a953aa2b 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -437,8 +437,8 @@ static void riscv_virt_board_init(MachineState *machine) } gpex_pcie_init(system_memory, 0, memmap[VIRT_PCIE].base, - memmap[VIRT_PCIE].size, 0x40000000, 0x20000000, - qdev_get_gpio_in(DEVICE(s->plic), PCIE_IRQ), true); + memmap[VIRT_PCIE].size, 0x40000000, 0x20000000, + qdev_get_gpio_in(DEVICE(s->plic), PCIE_IRQ), true); serial_mm_init(system_memory, memmap[VIRT_UART0].base, 0, qdev_get_gpio_in(DEVICE(s->plic), UART0_IRQ), 399193,