From patchwork Wed Apr 23 17:28:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 28914 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 96ABD203AC for ; Wed, 23 Apr 2014 17:28:58 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id gq1sf7391275obb.2 for ; Wed, 23 Apr 2014 10:28:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=ePzCrNfka/2d7m8If5chVk+ud20G0+mB+JFl0aOqpH0=; b=FYVMAgYGBAStM+4mSz0T9keNnydgnPEgOe6vr2FUJJTw8t4ocB3IdcK/p6IWEfgQTi EDyW++6Jfqm61wuR5cXZnVayyjqN1zWeLrv7+7hpEopa77JkTODnxEC3YvlNQ1ludm2s PLUxzlJYWXbuNHGoyI6Y3IzWVBCeK16f63Ny1KAtMqqRRnj2h73hI88aCRrbGrP0py55 VXwhVkCa08wA7q6303dGx9piblJPLz/GbirR0dsNr3sLbVbibyEFZDeqIOyYJY/nA7Dp yaaPil7IWHUWCHDlPVU7mPoXHxfmO6lYrDTHzD7A9yoki2xnI9Jtj709wGFnJEv6sAAH sMBw== X-Gm-Message-State: ALoCoQlbSAQgG9N/xl1efH4kNLJdRNcfcEk6uasraFTS2XpRRo9SQna2t5tLOp5eIBIqOtP0kGJo X-Received: by 10.182.241.9 with SMTP id we9mr27066876obc.22.1398274137946; Wed, 23 Apr 2014 10:28:57 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.35.210 with SMTP id n76ls724458qgn.15.gmail; Wed, 23 Apr 2014 10:28:57 -0700 (PDT) X-Received: by 10.220.103.141 with SMTP id k13mr13726383vco.25.1398274137813; Wed, 23 Apr 2014 10:28:57 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id lt7si302718vcb.158.2014.04.23.10.28.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 10:28:57 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id hy4so1556607vcb.11 for ; Wed, 23 Apr 2014 10:28:57 -0700 (PDT) X-Received: by 10.52.130.225 with SMTP id oh1mr36467362vdb.8.1398274137748; Wed, 23 Apr 2014 10:28:57 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp120696vcb; Wed, 23 Apr 2014 10:28:57 -0700 (PDT) X-Received: by 10.180.10.164 with SMTP id j4mr2685330wib.51.1398274136936; Wed, 23 Apr 2014 10:28:56 -0700 (PDT) Received: from mail-we0-f172.google.com (mail-we0-f172.google.com [74.125.82.172]) by mx.google.com with ESMTPS id vn1si937854wjc.185.2014.04.23.10.28.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 10:28:56 -0700 (PDT) Received-SPF: none (google.com: peter.griffin@linaro.org does not designate permitted sender hosts) client-ip=74.125.82.172; Received: by mail-we0-f172.google.com with SMTP id t61so1182386wes.31 for ; Wed, 23 Apr 2014 10:28:56 -0700 (PDT) X-Received: by 10.180.82.133 with SMTP id i5mr2792710wiy.50.1398274136467; Wed, 23 Apr 2014 10:28:56 -0700 (PDT) Received: from localhost.localdomain (cpc14-aztw22-2-0-cust189.18-1.cable.virginm.net. [82.45.1.190]) by mx.google.com with ESMTPSA id go20sm2372382wjc.18.2014.04.23.10.28.55 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 10:28:55 -0700 (PDT) From: Peter Griffin To: peter.griffin@linaro.org Cc: patches@linaro.org, linaro-kernel@lists.linaro.org Subject: [PATCH 02/13] video: omap2dss: fix LPAE warnings Date: Wed, 23 Apr 2014 18:28:36 +0100 Message-Id: <1398274127-2106-2-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398274127-2106-1-git-send-email-peter.griffin@linaro.org> References: <1398274127-2106-1-git-send-email-peter.griffin@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.griffin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Arnd Bergmann If LPAE is enabled, dma_addr_t is 64 bit, so we have to change a few type for everything in this driver to match again. Signed-off-by: Arnd Bergmann Signed-off-by: Peter Griffin Cc: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen Cc: linux-fbdev@vger.kernel.org Cc: linux-omap@vger.kernel.org --- drivers/video/fbdev/omap2/dss/dispc.c | 4 ++-- include/video/omapdss.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c index f18397c..461457d 100644 --- a/drivers/video/fbdev/omap2/dss/dispc.c +++ b/drivers/video/fbdev/omap2/dss/dispc.c @@ -2577,9 +2577,9 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi, channel = dispc_ovl_get_channel_out(plane); - DSSDBG("dispc_ovl_setup %d, pa %x, pa_uv %x, sw %d, %d,%d, %dx%d -> " + DSSDBG("dispc_ovl_setup %d, pa %pad, pa_uv %pad, sw %d, %d,%d, %dx%d -> " "%dx%d, cmode %x, rot %d, mir %d, chan %d repl %d\n", - plane, oi->paddr, oi->p_uv_addr, oi->screen_width, oi->pos_x, + plane, &oi->paddr, &oi->p_uv_addr, oi->screen_width, oi->pos_x, oi->pos_y, oi->width, oi->height, oi->out_width, oi->out_height, oi->color_mode, oi->rotation, oi->mirror, channel, replication); diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 6adb445..ded61a9 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -388,8 +388,8 @@ struct omap_dss_cpr_coefs { }; struct omap_overlay_info { - u32 paddr; - u32 p_uv_addr; /* for NV12 format */ + dma_addr_t paddr; + dma_addr_t p_uv_addr; /* for NV12 format */ u16 screen_width; u16 width; u16 height;