Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24f13a66 authored Apr 24, 2014 by Arnd Bergmann Committed by Tomi Valkeinen May 09, 2014

video: omap2dss: fix LPAE warnings



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 <arnd@arndb.de>
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org
Cc: linux-omap@vger.kernel.org
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

parent c84d9505

drivers/video/fbdev/omap2/dss/dispc.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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);		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",		" %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->pos_y, oi->width, oi->height, oi->out_width, oi->out_height,
	oi->color_mode, oi->rotation, oi->mirror, channel, replication);		oi->color_mode, oi->rotation, oi->mirror, channel, replication);

include/video/omapdss.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -388,8 +388,8 @@ struct omap_dss_cpr_coefs {
	};		};

	struct omap_overlay_info {		struct omap_overlay_info {
	u32 paddr;		dma_addr_t paddr;
	u32 p_uv_addr; /* for NV12 format */		dma_addr_t p_uv_addr; /* for NV12 format */
	u16 screen_width;		u16 screen_width;
	u16 width;		u16 width;
	u16 height;		u16 height;