From patchwork Wed Nov 13 07:16:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 3177171 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7E7B19F39E for ; Wed, 13 Nov 2013 07:16:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 893002058C for ; Wed, 13 Nov 2013 07:16:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8E21620585 for ; Wed, 13 Nov 2013 07:16:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 21479FAF18; Tue, 12 Nov 2013 23:16:08 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f45.google.com (mail-pb0-f45.google.com [209.85.160.45]) by gabe.freedesktop.org (Postfix) with ESMTP id A946FFAF18 for ; Tue, 12 Nov 2013 23:16:06 -0800 (PST) Received: by mail-pb0-f45.google.com with SMTP id mc8so6541pbc.18 for ; Tue, 12 Nov 2013 23:16:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lL+X/8FfbvaxW0Bw6h5autPmgqZ2Jd1q0Mbs6uTvtG8=; b=VG1w+kudzs/Pwku9w19p3bSkQTfN9GOt9kAXm4edX0nJA/aIJypFjqsvNqFhwkJHzc dZZYqdQx5yZ3FREuIpYNJ9n06gAf/x9HXVGzcj6s/ZudRKH2b8Zx8HLyr2h+KbZWc53G IMWDX14scKbyTmNYidFBadtYw1zHRkwdSr4Yeo2qq5x2FEctLX93VIF2xJqc5b1k3ZSS CDMBPBFCN17G1/YJ1COxQT3iW4Av41gUNiW8YP+8Kp3HN6I61wygq53h6nSt/jLT6UiB Wjvuhlw48yapiSE8Ut+lhrDb2XaxTcxEvbJ1l9GLQm8FcJxflPDNJQmumNXNBiGYoG4C JNMg== X-Gm-Message-State: ALoCoQl+NM9xa/WUt32N63+EtCb2Z077QOQB17LEoOE0kPHRFMyJxYz28aNRFSrEpW8ZjVXzdM6+ X-Received: by 10.68.170.225 with SMTP id ap1mr39851988pbc.117.1384326966491; Tue, 12 Nov 2013 23:16:06 -0800 (PST) Received: from brutus.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id xv2sm42260633pbb.39.2013.11.12.23.16.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Nov 2013 23:16:05 -0800 (PST) From: Olof Johansson To: airlied@redhat.com Subject: [PATCH] gpu: host1x: Silence a few warnings with LPAE=y Date: Tue, 12 Nov 2013 23:16:50 -0800 Message-Id: <1384327010-8870-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.10.4 Cc: tbergstrom@nvidia.com, dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, Arto Merilainen X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When building with LPAE=y (64-bit dma_addr_t), the following warnings are seen: drivers/gpu/host1x/hw/cdma_hw.c:57:3: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' drivers/gpu/host1x/hw/debug_hw.c:167:10: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'dma_addr_t' The agreed-to solution for this is upcast to u64 and using %llx. Signed-off-by: Olof Johansson --- drivers/gpu/host1x/hw/cdma_hw.c | 4 ++-- drivers/gpu/host1x/hw/debug_hw.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/host1x/hw/cdma_hw.c b/drivers/gpu/host1x/hw/cdma_hw.c index 37e2a63..6b09b71 100644 --- a/drivers/gpu/host1x/hw/cdma_hw.c +++ b/drivers/gpu/host1x/hw/cdma_hw.c @@ -54,8 +54,8 @@ static void cdma_timeout_cpu_incr(struct host1x_cdma *cdma, u32 getptr, u32 *p = (u32 *)((u32)pb->mapped + getptr); *(p++) = HOST1X_OPCODE_NOP; *(p++) = HOST1X_OPCODE_NOP; - dev_dbg(host1x->dev, "%s: NOP at 0x%x\n", __func__, - pb->phys + getptr); + dev_dbg(host1x->dev, "%s: NOP at %#llx\n", __func__, + (u64)pb->phys + getptr); getptr = (getptr + 8) & (pb->size_bytes - 1); } wmb(); diff --git a/drivers/gpu/host1x/hw/debug_hw.c b/drivers/gpu/host1x/hw/debug_hw.c index 640c75c..f72c873 100644 --- a/drivers/gpu/host1x/hw/debug_hw.c +++ b/drivers/gpu/host1x/hw/debug_hw.c @@ -163,8 +163,8 @@ static void show_channel_gathers(struct output *o, struct host1x_cdma *cdma) continue; } - host1x_debug_output(o, " GATHER at %08x+%04x, %d words\n", - g->base, g->offset, g->words); + host1x_debug_output(o, " GATHER at %#llx+%04x, %d words\n", + (u64)g->base, g->offset, g->words); show_gather(o, g->base + g->offset, g->words, cdma, g->base, mapped);