From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ysjqg-0001ux-Q9 for qemu-devel@nongnu.org; Wed, 13 May 2015 23:30:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ysjqc-0001iX-OI for qemu-devel@nongnu.org; Wed, 13 May 2015 23:30:14 -0400 Received: from mail-qc0-f173.google.com ([209.85.216.173]:36188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ysjqc-0001hj-Jq for qemu-devel@nongnu.org; Wed, 13 May 2015 23:30:10 -0400 Received: by qcbgy10 with SMTP id gy10so33379577qcb.3 for ; Wed, 13 May 2015 20:30:09 -0700 (PDT) MIME-Version: 1.0 Sender: peter.crosthwaite@petalogix.com In-Reply-To: <1431544326-13372-9-git-send-email-fred.konrad@greensocs.com> References: <1431544326-13372-1-git-send-email-fred.konrad@greensocs.com> <1431544326-13372-9-git-send-email-fred.konrad@greensocs.com> Date: Wed, 13 May 2015 20:30:09 -0700 Message-ID: From: Peter Crosthwaite Content-Type: text/plain; charset=UTF-8 Subject: Re: [Qemu-devel] [PATCH 8/8] arm: xlnx-zynqmp: Add DisplayPort and DPDMA. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?Fr=C3=A9deric_Konrad?= Cc: Mark Burton , "qemu-devel@nongnu.org Developers" , hyunk@xilinx.com On Wed, May 13, 2015 at 12:12 PM, wrote: > From: KONRAD Frederic > > This adds the DP and the DPDMA to the Zynq MP. > > Signed-off-by: KONRAD Frederic > --- > hw/arm/xlnx-zynqmp.c | 23 +++++++++++++++++++++++ > include/hw/arm/xlnx-zynqmp.h | 4 ++++ > 2 files changed, 27 insertions(+) > > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index dff6c8a..0eb82fa 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -27,6 +27,10 @@ > #define GIC_BASE_ADDR 0xf9000000 > #define GIC_DIST_ADDR 0xf9010000 > #define GIC_CPU_ADDR 0xf9020000 Blank line. > +#define DP_ADDR 0xfd4a0000 > +#define DP_IRQ 113 Blank line > +#define DPDMA_ADDR 0xfd4c0000 > +#define DPDMA_IRQ 116 > > static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = { > 0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000, > @@ -83,6 +87,16 @@ static void xlnx_zynqmp_init(Object *obj) > object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_CADENCE_UART); > qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default()); > } > + > + object_initialize(&s->dp, sizeof(s->dp), TYPE_XILINX_DP); > + object_property_add_child(container_get(qdev_get_machine(), "/unattached"), > + TYPE_XILINX_DP, OBJECT(&s->dp), &error_abort); > + qdev_set_parent_bus(DEVICE(&s->dp), sysbus_get_default()); > + object_initialize(&s->dpdma, sizeof(s->dpdma), TYPE_XILINX_DPDMA); > + object_property_add_child(container_get(qdev_get_machine(), "/unattached"), > + TYPE_XILINX_DPDMA, OBJECT(&s->dpdma), > + &error_abort); > + qdev_set_parent_bus(DEVICE(&s->dpdma), sysbus_get_default()); > } > > static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) > @@ -186,6 +200,15 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) > sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart[i]), 0, > gic_spi[uart_intr[i]]); > } > + > + sysbus_mmio_map(SYS_BUS_DEVICE(&s->dp), 0, DP_ADDR); > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->dp), 0, gic_spi[DP_IRQ]); > + sysbus_mmio_map(SYS_BUS_DEVICE(&s->dpdma), 0, DPDMA_ADDR); > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->dpdma), 0, gic_spi[DPDMA_IRQ]); > + object_property_set_link(OBJECT(&s->dp), OBJECT(&s->dpdma), "dpdma", > + &error_abort); Does moving the set_link after the realizes remove the need for the dummy object_property_add_child? Regards, Peter > + object_property_set_bool(OBJECT(&s->dp), true, "realized", &err); > + object_property_set_bool(OBJECT(&s->dpdma), true, "realized", &err); > } > > static void xlnx_zynqmp_class_init(ObjectClass *oc, void *data) > diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h > index 79c2b0b..66ec010 100644 > --- a/include/hw/arm/xlnx-zynqmp.h > +++ b/include/hw/arm/xlnx-zynqmp.h > @@ -22,6 +22,8 @@ > #include "hw/intc/arm_gic.h" > #include "hw/net/cadence_gem.h" > #include "hw/char/cadence_uart.h" > +#include "hw/dma/xilinx_dpdma.h" > +#include "hw/display/xilinx_dp.h" > > #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp" > #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \ > @@ -52,6 +54,8 @@ typedef struct XlnxZynqMPState { > MemoryRegion gic_mr[XLNX_ZYNQMP_GIC_REGIONS][XLNX_ZYNQMP_GIC_ALIASES]; > CadenceGEMState gem[XLNX_ZYNQMP_NUM_GEMS]; > CadenceUARTState uart[XLNX_ZYNQMP_NUM_UARTS]; > + XilinxDPState dp; > + XilinxDPDMAState dpdma; > } XlnxZynqMPState; > > #define XLNX_ZYNQMP_H > -- > 1.9.0 > >