From patchwork Thu Oct 11 20:31:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 982701 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="U0gvNc+9"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="izkMMD0w"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42WN28083mz9sBZ for ; Fri, 12 Oct 2018 07:32:48 +1100 (AEDT) Received: from localhost ([::1]:36984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAhdV-0006fL-BN for incoming@patchwork.ozlabs.org; Thu, 11 Oct 2018 16:32:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAhcg-0006dv-HZ for qemu-devel@nongnu.org; Thu, 11 Oct 2018 16:31:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAhcc-0006Yu-2b for qemu-devel@nongnu.org; Thu, 11 Oct 2018 16:31:54 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:29171) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gAhcb-0006Un-Oj for qemu-devel@nongnu.org; Thu, 11 Oct 2018 16:31:49 -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=1539289910; x=1570825910; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=OR8cSTg43u2HRif36r8UliYJO6prM1ZjTuaJBzXo+0Y=; b=U0gvNc+970OUw4eLDMyte2NV50YwS4eGEINS+/YtfUW8eerwrPprmqqF BmFWxZJiwezrvxT25Mz6DwzQyq0KouwqVl9DCdJB0bC1a+U9fJa7MMYQq TGMDRq2IKfND/J42GmuKjr7q+cXi39s/e0WRJDkGcBh6DBFY622XkKY5Z JUYgE1bofQf9t72QrqavX6kSbaClscB+lnU5wRsTv1Mdt6xrehQfY2JaE W4aBtv+IVucgN45VsqgsxzbX39rXXY3lQgR/lqQQ4VaPfLSZBY8dzXMXV 0JtJ9jxJM9EANEXWDjm/ppBLBMx7WeBr4BU19K8tk1CPQm3ORnHd7C3v7 g==; X-IronPort-AV: E=Sophos;i="5.54,369,1534780800"; d="scan'208";a="91781671" Received: from mail-bl2nam02lp0081.outbound.protection.outlook.com (HELO NAM02-BL2-obe.outbound.protection.outlook.com) ([207.46.163.81]) by ob1.hgst.iphmx.com with ESMTP; 12 Oct 2018 04:31:48 +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=izkMMD0wPKFL9IJbfP4mBwZFlJHc8hHJgr1/G+Qhdy3J0pBMVGznntrNAWoIGhhgtnz8iEGUyqDBO8qP/h3uXfkyw7/s6+eMkadSUQxCJPDXeVWRd2APzIY3gv7bdd8dFAkOTwh7ZCcr0uCHG4MtChzzn9fhKaOrTWKcPTtj5Os= Received: from CY4PR04MB0392.namprd04.prod.outlook.com (10.173.188.145) by CY4PR04MB1224.namprd04.prod.outlook.com (10.173.193.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.26; Thu, 11 Oct 2018 20:31:46 +0000 Received: from CY4PR04MB0392.namprd04.prod.outlook.com ([fe80::ddab:bdc2:6bc7:6d22]) by CY4PR04MB0392.namprd04.prod.outlook.com ([fe80::ddab:bdc2:6bc7:6d22%6]) with mapi id 15.20.1228.020; Thu, 11 Oct 2018 20:31:46 +0000 From: Alistair Francis To: "peter.maydell@linaro.org" Thread-Topic: [PULL 03/10] riscv: Enable VGA and PCIE_VGA Thread-Index: AQHUYaFuZj16WC1r4UeUGZudZxl0Pg== Date: Thu, 11 Oct 2018 20:31:46 +0000 Message-ID: <20181011203115.18666-4-alistair.francis@wdc.com> References: <20181011203115.18666-1-alistair.francis@wdc.com> In-Reply-To: <20181011203115.18666-1-alistair.francis@wdc.com> 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: SG2PR01CA0126.apcprd01.prod.exchangelabs.com (2603:1096:4:40::30) To CY4PR04MB0392.namprd04.prod.outlook.com (2603:10b6:903:b1::17) 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; CY4PR04MB1224; 6:eR2h7mz/+REoXdnd6RBD/zU7z8TWRUruQ9bozrrmCuKIE6KVC62ZDO3ZRf05pZaa3fxUppR9KKlcZePBVBP77YhCFRqMhN7Y7cYQqXiUykTuo0Kqbzpj4w6jLeVxt0TmJMj48pCRmwtbF/C6Ia3nEY8DcaMLrrx9Nm/6PRWTrecAGkcu/Hz5tg8DwLH2WHRkS012NpR6p0+SB7E3PKuyrLa6Jt3H/xxOCH1F3avcc/RkNHm4N6K/npOGWnLrBe7JxLoOItu6Ct5DudIavDkeXvsUFOHL2o1ntzu5A6Cbw82pqm1/x7ncONt5w8yYUS9msHsIoRH+KUjP+x1muz0iH+6HF1+w92F1A+2JdQ3P5R/9DAXG7rOdtSAy4z8IM+NpbcbeKEoY8IWWO3FKXWtxH/aEdHPXzNvOfKu6EekYMsxcJUSAU8M7Z5hr9Oxg4Tl21DaGmy6e2lsTAUSN5RNX8g==; 5:Je6ziMOvPN6KA+vg4KW79VB5/NdB5xO202YoaNQnQ5EhVCo59yxbFO+aH9MamaJIrvwYyCoNtrrItNcXdC7Xl6RQR7XK+q3stbFoyfUbePD3XSvqCYAuccMc7m08z8tQvJEI81MMIOBauBtBB+EBjrA6Y1mXe/ZOgVt4zHicFOM=; 7:pp8ekzXaX9BgxyN5Z5iHhAj1Wqp46bXpeQlwF+J3hoNwktbFBHDzUmIKvZcNnVMTejtmFkM2uwH69tAcPIyJz17/KBbfFNDmnrKoDKdrH0JS9+ffrPX9nBw2zon2VgCSyGWVOWRKEUREz9kwwElZhqK0Klvyj7mnfzy7RXFRpR7uQp+1drwFWEXP9inOrHoNKwC3+qlB5599/7R/OiOwUasMXcPGk2mGWyctDLTRZuPuRos6S9aINyLebfMTgNMQ x-ms-office365-filtering-correlation-id: a3d40299-2995-4cf0-fa50-08d62fb89061 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:CY4PR04MB1224; x-ms-traffictypediagnostic: CY4PR04MB1224: 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)(8121501046)(5005006)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699051); SRVR:CY4PR04MB1224; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB1224; x-forefront-prvs: 08220FA8D6 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(346002)(376002)(39860400002)(366004)(136003)(199004)(189003)(81156014)(8936002)(68736007)(36756003)(6506007)(86362001)(7736002)(6916009)(8676002)(105586002)(76176011)(2906002)(256004)(81166006)(50226002)(54906003)(5660300001)(5640700003)(6486002)(1076002)(4326008)(52116002)(486006)(11346002)(2900100001)(102836004)(2501003)(99286004)(2616005)(6436002)(478600001)(72206003)(44832011)(476003)(186003)(97736004)(2351001)(25786009)(71190400001)(53936002)(3846002)(14454004)(386003)(106356001)(316002)(6512007)(446003)(305945005)(71200400001)(26005)(66066001)(6116002)(5250100002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB1224; H:CY4PR04MB0392.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-microsoft-antispam-message-info: lPLbwV/qHiBC0kLN8CnQ2uI/Jpx7yqt4V+GdUOK0zpi8zMvTD5nmdpNI/95id6yIGlAqkEoB+LfGocJ7PZb0fvpvqPAXoT4tOx/LVui8Q0nQ2lk7q4oVwF5TcGTzLwvGAuI21rPz9ieSjIScG+1v5urgPFtG5f/A07THZPKt5YWJyti6ngmZJ3fR6t6aiOSUIq9llzmYK/9lLeaIi1otAXIs0cJ6Lnvwn+iIgzVxuwaSes3QZKuU36byZdPsMrexVQE1YGEci90Cx1cdflu8COQYTFudFfUkmfaeJZaTzsW3f0VKib2rSvv9jZvuBYBpQ9WKY1grTQkodFLxka+wXVtAI/eJvC19PYYWMVlRbh0= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3d40299-2995-4cf0-fa50-08d62fb89061 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2018 20:31:46.6415 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB1224 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PULL 03/10] 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: Alistair Francis , "qemu-devel@nongnu.org" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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,