From patchwork Wed Jun 19 22:19:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11005499 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 4DAA61398 for ; Wed, 19 Jun 2019 22:25:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35046284ED for ; Wed, 19 Jun 2019 22:25:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24E912868D; Wed, 19 Jun 2019 22:25:33 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9CE97284ED for ; Wed, 19 Jun 2019 22:25:32 +0000 (UTC) Received: from localhost ([::1]:42334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdj1I-0006XT-0b for patchwork-qemu-devel@patchwork.kernel.org; Wed, 19 Jun 2019 18:25:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36033) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdiwt-0001hp-2W for qemu-devel@nongnu.org; Wed, 19 Jun 2019 18:21:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdiwr-0007oJ-I4 for qemu-devel@nongnu.org; Wed, 19 Jun 2019 18:20:58 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:55057) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hdiwo-0007iW-NU; Wed, 19 Jun 2019 18:20:54 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MdNse-1iCmhc0YGO-00ZLPw; Thu, 20 Jun 2019 00:20:00 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 20 Jun 2019 00:19:31 +0200 Message-Id: <20190619221933.1981-9-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190619221933.1981-1-laurent@vivier.eu> References: <20190619221933.1981-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:h0lBnGkz286V7bvmWJ5gZuoalWyxGJLRdgvCJL6C2vsCn/TDHqS k0fcJfguog0gImKHUOK0shFyCvOtT4rOxvXqfU0hy1sdk0ZCioGGTFx8jLxxlPhk85ulkZX hSgG99cF+3lVI4NdI0dccWxq35LzIljLcBt1KG6lMV6AaBUDkQtj1WNqNNCyQztEi8eZn33 SYDM4zLnLOAei1AswraDg== X-UI-Out-Filterresults: notjunk:1;V03:K0:AMA5apviTAg=:ajeo4knuuyb9O/kg5/WMmg 2rcl7SPq3HbOcR8tDob7NG5jeGHBJVBRBzChlskLT/EWXNY8P26PdrFDQh3pDU+o86/pvM+UN F6qoCe/xtlyj6ADSoFhsjUIk3El1Ni/EY+fqY9nKACx4uSKYHiCsffuN1qjXUcWGbOcFgwUIu OirOHuvIuJQuzdVBqTM6B4TD7bEJ5bjtHtI8rkXImDHe+Rr56/F4hxoFoL/Gh8IWPJs3qTEzj 20ar72m8SQQNCB7ymXJ6w3Ord7nA5FLkO4ltiNr/iPUP/KFIRy7iF34Q5sQzuhtBBjDMdHdKS gCn64FEV1M7CliQ28HEFXR6XPzn3+tGkVB64Tz8HBAyHwYSm/3gSKj7SY/HnH1XqbOJ+BfX1R 72oamyGEP2L3PLS2BcmwI27Y8aT+87FJIfIgcDxVX5fKaeggI8YGiWr3KzO3YZcoJcofGHtjH J33m96aULtX4+1aEXsl8OecCfxO9kUh1oPYHVHtQjXRIPN9BgRf9xUzeFuzFO2/5pg06GC2gI GPyWX5mzYRduNpffwzMaUh59nhxCm23Fic8xsXNHe5hI7Yc+HjOFrchlv7BvWmtcvH8yxoyf2 1LJA8rBMW0fZaZFPRFokB/vnQ6OMS5KjwTmuqTtGb44xY7DtMoCXFinhJmodWbiJO/91kiSm5 rrMNOLEMWpnHvUB6f+oFhEyH3++Et8Xzq7MW4Q4VjcgCrkjexI+wqYUrrhqEMQ/efQP7K9Ye1 ijF//PiqC6VRtJSDq668pGvz5j807nZtR/MnCdphIjhV+aPOfRw7sYhip2I= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PATCH v8 08/10] hw/m68k: add Nubus support for macfb video card X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Thomas Huth , Jason Wang , Mark Cave-Ayland , Laurent Vivier , "Dr . David Alan Gilbert" , =?utf-8?q?Herv=C3=A9_Pouss?= =?utf-8?q?ineau?= , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Max Reitz , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Mark Cave-Ayland Co-developed-by: Mark Cave-Ayland Signed-off-by: Mark Cave-Ayland Signed-off-by: Laurent Vivier Reviewed-by: Hervé Poussineau --- hw/display/Kconfig | 1 + hw/display/macfb.c | 56 ++++++++++++++++++++++++++++++++++++++ include/hw/display/macfb.h | 21 ++++++++++++++ 3 files changed, 78 insertions(+) diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 035cd85bcf..95096d3c82 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -133,3 +133,4 @@ config ATI_VGA config MACFB bool + depends on NUBUS diff --git a/hw/display/macfb.c b/hw/display/macfb.c index 61ba2e9e15..458e268d86 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -15,6 +15,7 @@ #include "hw/sysbus.h" #include "ui/console.h" #include "ui/pixel_ops.h" +#include "hw/nubus/nubus.h" #include "hw/display/macfb.h" #include "qapi/error.h" @@ -380,12 +381,38 @@ static void macfb_sysbus_realize(DeviceState *dev, Error **errp) sysbus_init_mmio(SYS_BUS_DEVICE(s), &ms->mem_vram); } +const uint8_t macfb_rom[] = { + 255, 0, 0, 0, +}; + +static void macfb_nubus_realize(DeviceState *dev, Error **errp) +{ + NubusDevice *nd = NUBUS_DEVICE(dev); + MacfbNubusState *s = NUBUS_MACFB(dev); + MacfbNubusDeviceClass *ndc = MACFB_NUBUS_GET_CLASS(dev); + MacfbState *ms = &s->macfb; + + ndc->parent_realize(dev, errp); + + macfb_common_realize(dev, ms, errp); + memory_region_add_subregion(&nd->slot_mem, DAFB_BASE, &ms->mem_ctrl); + memory_region_add_subregion(&nd->slot_mem, VIDEO_BASE, &ms->mem_vram); + + nubus_register_rom(nd, macfb_rom, sizeof(macfb_rom), 1, 9, 0xf); +} + static void macfb_sysbus_reset(DeviceState *d) { MacfbSysBusState *s = MACFB(d); macfb_reset(&s->macfb); } +static void macfb_nubus_reset(DeviceState *d) +{ + MacfbNubusState *s = NUBUS_MACFB(d); + macfb_reset(&s->macfb); +} + static Property macfb_sysbus_properties[] = { DEFINE_PROP_UINT32("width", MacfbSysBusState, macfb.width, 640), DEFINE_PROP_UINT32("height", MacfbSysBusState, macfb.height, 480), @@ -393,6 +420,13 @@ static Property macfb_sysbus_properties[] = { DEFINE_PROP_END_OF_LIST(), }; +static Property macfb_nubus_properties[] = { + DEFINE_PROP_UINT32("width", MacfbNubusState, macfb.width, 640), + DEFINE_PROP_UINT32("height", MacfbNubusState, macfb.height, 480), + DEFINE_PROP_UINT8("depth", MacfbNubusState, macfb.depth, 8), + DEFINE_PROP_END_OF_LIST(), +}; + static void macfb_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -404,6 +438,19 @@ static void macfb_sysbus_class_init(ObjectClass *klass, void *data) dc->props = macfb_sysbus_properties; } +static void macfb_nubus_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + MacfbNubusDeviceClass *ndc = MACFB_NUBUS_DEVICE_CLASS(klass); + + device_class_set_parent_realize(dc, macfb_nubus_realize, + &ndc->parent_realize); + dc->desc = "Nubus Macintosh framebuffer"; + dc->reset = macfb_nubus_reset; + dc->vmsd = &vmstate_macfb; + dc->props = macfb_nubus_properties; +} + static TypeInfo macfb_sysbus_info = { .name = TYPE_MACFB, .parent = TYPE_SYS_BUS_DEVICE, @@ -411,9 +458,18 @@ static TypeInfo macfb_sysbus_info = { .class_init = macfb_sysbus_class_init, }; +static TypeInfo macfb_nubus_info = { + .name = TYPE_NUBUS_MACFB, + .parent = TYPE_NUBUS_DEVICE, + .instance_size = sizeof(MacfbNubusState), + .class_init = macfb_nubus_class_init, + .class_size = sizeof(MacfbNubusDeviceClass), +}; + static void macfb_register_types(void) { type_register_static(&macfb_sysbus_info); + type_register_static(&macfb_nubus_info); } type_init(macfb_register_types) diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h index 3fe2592735..26367ae2c4 100644 --- a/include/hw/display/macfb.h +++ b/include/hw/display/macfb.h @@ -40,4 +40,25 @@ typedef struct { MacfbState macfb; } MacfbSysBusState; +#define MACFB_NUBUS_DEVICE_CLASS(class) \ + OBJECT_CLASS_CHECK(MacfbNubusDeviceClass, (class), TYPE_NUBUS_MACFB) +#define MACFB_NUBUS_GET_CLASS(obj) \ + OBJECT_GET_CLASS(MacfbNubusDeviceClass, (obj), TYPE_NUBUS_MACFB) + +typedef struct MacfbNubusDeviceClass { + DeviceClass parent_class; + + DeviceRealize parent_realize; +} MacfbNubusDeviceClass; + +#define TYPE_NUBUS_MACFB "nubus-macfb" +#define NUBUS_MACFB(obj) \ + OBJECT_CHECK(MacfbNubusState, (obj), TYPE_NUBUS_MACFB) + +typedef struct { + NubusDevice busdev; + + MacfbState macfb; +} MacfbNubusState; + #endif