From patchwork Thu Apr 24 12:28:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 28965 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f198.google.com (mail-ig0-f198.google.com [209.85.213.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9119B203AC for ; Thu, 24 Apr 2014 12:29:11 +0000 (UTC) Received: by mail-ig0-f198.google.com with SMTP id h3sf2757845igd.5 for ; Thu, 24 Apr 2014 05:29:11 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=W43aRWvR/GjIiQeGiHs3UZo30RuRiyKYM6qon8y47r8=; b=IrT4oWL9apiCNv5x5hAVXW8TCUi8ZpXiVnTK52cHGPhsPSYMVRrOMePG6TsOilbprl Dj7WyVqrDa0r65XaF8gVf2So9CD+9Hld0hECVd7Ko/oHeIkhIWrDx05LX84SozZgd9gR bk7V6TsiV3FF07ir4gpS6mMbM4h+zNA10hX8ocpa9iCVcvM/at5X+YQhAkV5aXa46+/O cLP8vOd1TEg/QHv0YgSKiLHvcimuIN8XxjXvjhPFqfvgxDSeogiL8F5k9C7ZA7t8oP3/ lvji8vKWvGgYrvZa3bSIFS/5jM5Rrz1wUMJBm2ILMKWwDOdQI3Ruz1mCX8u5jlQ2cDO4 +efA== X-Gm-Message-State: ALoCoQmMx8YyYOxvv0Cm2wggFPGfwnF32EDaE1kNjmD83cflvWIZZdrxs55jDOzB96et1Jw2TSmw X-Received: by 10.182.254.10 with SMTP id ae10mr984572obd.43.1398342550988; Thu, 24 Apr 2014 05:29:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.72 with SMTP id s66ls1088748qgs.85.gmail; Thu, 24 Apr 2014 05:29:10 -0700 (PDT) X-Received: by 10.52.181.132 with SMTP id dw4mr32929vdc.86.1398342550856; Thu, 24 Apr 2014 05:29:10 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id vd8si879171vdc.34.2014.04.24.05.29.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Apr 2014 05:29:10 -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.128.178; Received: by mail-ve0-f178.google.com with SMTP id jw12so2900551veb.9 for ; Thu, 24 Apr 2014 05:29:10 -0700 (PDT) X-Received: by 10.220.133.197 with SMTP id g5mr1082609vct.20.1398342550772; Thu, 24 Apr 2014 05:29:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp11869vcb; Thu, 24 Apr 2014 05:29:10 -0700 (PDT) X-Received: by 10.68.174.225 with SMTP id bv1mr3127246pbc.12.1398342549501; Thu, 24 Apr 2014 05:29:09 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id as3si2601671pbc.178.2014.04.24.05.29.08; Thu, 24 Apr 2014 05:29:08 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757014AbaDXM25 (ORCPT + 27 others); Thu, 24 Apr 2014 08:28:57 -0400 Received: from mail-we0-f179.google.com ([74.125.82.179]:60997 "EHLO mail-we0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756983AbaDXM2w (ORCPT ); Thu, 24 Apr 2014 08:28:52 -0400 Received: by mail-we0-f179.google.com with SMTP id x48so2120990wes.24 for ; Thu, 24 Apr 2014 05:28:51 -0700 (PDT) X-Received: by 10.180.12.206 with SMTP id a14mr6332229wic.48.1398342531330; Thu, 24 Apr 2014 05:28:51 -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 y20sm35144777wiv.14.2014.04.24.05.28.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Apr 2014 05:28:50 -0700 (PDT) From: Peter Griffin To: linux-kernel@vger.kernel.org Cc: linaro-kernel@lists.linaro.org, Arnd Bergmann , Peter Griffin , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 02/13] video: omap2dss: fix LPAE warnings Date: Thu, 24 Apr 2014 13:28:18 +0100 Message-Id: <1398342509-10243-3-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398342509-10243-1-git-send-email-peter.griffin@linaro.org> References: <1398342509-10243-1-git-send-email-peter.griffin@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org 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 | 6 +++--- include/video/omapdss.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c index f18397c..4fe1431 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 -> " - "%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, + 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, 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;