From patchwork Tue Jun 14 14:58:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 9176185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3F3A56075D for ; Tue, 14 Jun 2016 15:31:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32D6924151 for ; Tue, 14 Jun 2016 15:31:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 275BD27E78; Tue, 14 Jun 2016 15:31:48 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 8E28F27DF9 for ; Tue, 14 Jun 2016 15:31:47 +0000 (UTC) Received: from localhost ([::1]:36159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCqJd-0004CZ-NG for patchwork-qemu-devel@patchwork.kernel.org; Tue, 14 Jun 2016 11:31:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCpo7-0006BQ-1u for qemu-devel@nongnu.org; Tue, 14 Jun 2016 10:59:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCpo5-0003m9-TD for qemu-devel@nongnu.org; Tue, 14 Jun 2016 10:59:11 -0400 Received: from mail-vk0-x234.google.com ([2607:f8b0:400c:c05::234]:33684) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCpo5-0003lr-Ed for qemu-devel@nongnu.org; Tue, 14 Jun 2016 10:59:09 -0400 Received: by mail-vk0-x234.google.com with SMTP id d185so100651310vkg.0 for ; Tue, 14 Jun 2016 07:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=sEuxvIk2HCnd4aO8qRYe19O5cG+l2w67UhjRM1cmkPc=; b=WJOgx9Xs+Gc8ZReOrClJMk1jIIwPJTa9uXLDBVUR2xsP+Pf6nas64ybRxO1K4p7ak1 pEnmG5+FE1uDKhZBt1TLmI5/yHBUOTFDzUNNx+nGhVjJ5TSVrPIR4G9cdvo/zXZPjLmi 3BAaFoioCf50AOUN7+xfmG21fs7zAXHKIo4tE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=sEuxvIk2HCnd4aO8qRYe19O5cG+l2w67UhjRM1cmkPc=; b=fA0VlxdeYGl9N39cM50CTwnLk4G6pRyQbovaT7l3l1QI6V/HsRV6hDRuzbZv/kMCEn NgC1XwktYJfpc/JU0FboTXKb6kgo8deVVNDPSUvkY197w0WLIhxeR65dfwAlm9/0TsJz zH+1mYjJLo5jZSrQobwXm6IriqUFtbNuCPNmGqX8r9X1gnDamyDNVXCIPEwDx4gJ6dM6 n+QO5A2OE0eQ7SazETSpeeOeAVNUlXNFaKuBNK1YO0m8jzSWJ2S/LoJhBhN8ptFjVLY0 RJh0tnA91osoL7ZlkSn+6KALT2ssYj8KE+ztQUzRuE8ZY2qwxRTtfpR2I5AX6GR5jrIH Pg3Q== X-Gm-Message-State: ALyK8tJp3ibbXrwNZLx3mmM/aOywRGp94/3c53CP3VD+ym7GWKLd7uBR+Afb7mRY9QfMsvXm4biYoH3btbgbK2wY X-Received: by 10.176.0.238 with SMTP id 101mr7323353uaj.107.1465916348609; Tue, 14 Jun 2016 07:59:08 -0700 (PDT) MIME-Version: 1.0 Received: by 10.31.97.68 with HTTP; Tue, 14 Jun 2016 07:58:49 -0700 (PDT) In-Reply-To: References: <1465833014-21982-1-git-send-email-fred.konrad@greensocs.com> From: Peter Maydell Date: Tue, 14 Jun 2016 15:58:49 +0100 Message-ID: To: =?UTF-8?B?S09OUkFEIEZyw6lkw6lyaWM=?= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400c:c05::234 Subject: Re: [Qemu-devel] [PATCH V10 0/9] Xilinx DisplayPort. 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: Edgar Iglesias , hyunk@xilinx.com, Mark Burton , QEMU Developers , Alistair Francis , Peter Crosthwaite , Guillaume Delbergue Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP On 14 June 2016 at 14:59, Peter Maydell wrote: > On 13 June 2016 at 16:50, wrote: >> From: KONRAD Frederic >> >> This is the 10th version of this patch-set of the implementation of the Xilinx >> DisplayPort and DPDMA. >> >> This 10th version fixes one bug with the I2C broadcast patch. I found some minor build issues in this series, which I'm just going to fix up in my tree rather than making you respin this: Format string issues which mean it doesn't build on OSX or 32-bit hosts: /home/petmay01/linaro/qemu-for-merges/hw/display/xlnx_dp.c:700:5: error: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘uint64_t’ [-Werror=format=] /home/petmay01/linaro/qemu-for-merges/hw/display/xlnx_dp.c:709:5: error: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘uint64_t’ [-Werror=format=] Clang build issues: /Users/pm215/src/qemu-for-merges/hw/i2c/i2c-ddc.c:284:33: warning: unused variable 'vmstate_i2c_ddc' [-Wunused-const-variable] (vmstate wasn't actually wired up to dc->vmsd) /Users/pm215/src/qemu-for-merges/hw/dma/xlnx_dpdma.c:307:20: warning: unused function 'xlnx_dpdma_set_desc_next_address' [-Wunused-function] Full diff of fixups: thanks -- PMM diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 552955f..be53b75 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -697,7 +697,7 @@ static uint64_t xlnx_dp_read(void *opaque, hwaddr offset, unsigned size) break; } - DPRINTF("core read @%" PRIx64 " = 0x%8.8lX\n", offset << 2, ret); + DPRINTF("core read @%" PRIx64 " = 0x%8.8" PRIX64 "\n", offset << 2, ret); return ret; } @@ -706,7 +706,7 @@ static void xlnx_dp_write(void *opaque, hwaddr offset, uint64_t value, { XlnxDPState *s = XLNX_DP(opaque); - DPRINTF("core write @%" PRIx64 " = 0x%8.8lX\n", offset, value); + DPRINTF("core write @%" PRIx64 " = 0x%8.8" PRIX64 "\n", offset, value); offset = offset >> 2; diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c index 97a5da7..8ceb21d 100644 --- a/hw/dma/xlnx_dpdma.c +++ b/hw/dma/xlnx_dpdma.c @@ -304,14 +304,6 @@ static uint64_t xlnx_dpdma_descriptor_next_address(XlnxDPDMAState *s, + s->registers[DPDMA_DSCR_NEXT_ADDR_CH(channel)]; } -static inline void xlnx_dpdma_set_desc_next_address(XlnxDPDMAState *s, - uint8_t channel, - uint64_t addr) -{ - s->registers[DPDMA_DSCR_NEXT_ADDRE_CH(channel)] = extract64(addr, 32, 32); - s->registers[DPDMA_DSCR_NEXT_ADDR_CH(channel)] = extract64(addr, 0, 32); -} - static bool xlnx_dpdma_is_channel_enabled(XlnxDPDMAState *s, uint8_t channel) { diff --git a/hw/i2c/i2c-ddc.c b/hw/i2c/i2c-ddc.c index 02cd374..b47ec9a 100644 --- a/hw/i2c/i2c-ddc.c +++ b/hw/i2c/i2c-ddc.c @@ -270,27 +270,28 @@ static void i2c_ddc_init(Object *obj) build_edid_blob(&lcd_edid, s->edid_blob); } +static const VMStateDescription vmstate_i2c_ddc = { + .name = TYPE_I2CDDC, + .version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_BOOL(firstbyte, I2CDDCState), + VMSTATE_UINT8(reg, I2CDDCState), + VMSTATE_END_OF_LIST() + } +}; + static void i2c_ddc_class_init(ObjectClass *oc, void *data) { DeviceClass *dc = DEVICE_CLASS(oc); I2CSlaveClass *isc = I2C_SLAVE_CLASS(oc); dc->reset = i2c_ddc_reset; + dc->vmsd = &vmstate_ic2_ddc; isc->event = i2c_ddc_event; isc->recv = i2c_ddc_rx; isc->send = i2c_ddc_tx; } -static const VMStateDescription vmstate_i2c_ddc = { - .name = TYPE_I2CDDC, - .version_id = 1, - .fields = (VMStateField[]) { - VMSTATE_BOOL(firstbyte, I2CDDCState), - VMSTATE_UINT8(reg, I2CDDCState), - VMSTATE_END_OF_LIST() - } -}; - static TypeInfo i2c_ddc_info = { .name = TYPE_I2CDDC, .parent = TYPE_I2C_SLAVE,