diff options
Diffstat (limited to 'meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch')
-rw-r--r-- | meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch new file mode 100644 index 0000000000..22add6efd2 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | From 9c93bcab724b5935d745604773ed43825efefd87 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tomi Valkeinen <tomi.valkeinen@nokia.com> | ||
3 | Date: Thu, 2 Apr 2009 13:47:11 +0300 | ||
4 | Subject: [PATCH] DSS2: Fix DMA rotation | ||
5 | |||
6 | u16 was not a good type for offsets. First, they need to be signed, | ||
7 | and second, 16 bits is not enough. | ||
8 | --- | ||
9 | drivers/video/omap2/dss/dispc.c | 12 ++++++------ | ||
10 | 1 files changed, 6 insertions(+), 6 deletions(-) | ||
11 | |||
12 | diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c | ||
13 | index ffb5648..6cea545 100644 | ||
14 | --- a/drivers/video/omap2/dss/dispc.c | ||
15 | +++ b/drivers/video/omap2/dss/dispc.c | ||
16 | @@ -778,7 +778,7 @@ static void _dispc_set_vid_size(enum omap_plane plane, int width, int height) | ||
17 | dispc_write_reg(vsi_reg[plane-1], val); | ||
18 | } | ||
19 | |||
20 | -static void _dispc_set_pix_inc(enum omap_plane plane, u16 inc) | ||
21 | +static void _dispc_set_pix_inc(enum omap_plane plane, s32 inc) | ||
22 | { | ||
23 | const struct dispc_reg ri_reg[] = { DISPC_GFX_PIXEL_INC, | ||
24 | DISPC_VID_PIXEL_INC(0), | ||
25 | @@ -787,7 +787,7 @@ static void _dispc_set_pix_inc(enum omap_plane plane, u16 inc) | ||
26 | dispc_write_reg(ri_reg[plane], inc); | ||
27 | } | ||
28 | |||
29 | -static void _dispc_set_row_inc(enum omap_plane plane, u16 inc) | ||
30 | +static void _dispc_set_row_inc(enum omap_plane plane, s32 inc) | ||
31 | { | ||
32 | const struct dispc_reg ri_reg[] = { DISPC_GFX_ROW_INC, | ||
33 | DISPC_VID_ROW_INC(0), | ||
34 | @@ -1123,7 +1123,7 @@ static void _dispc_set_rotation_attrs(enum omap_plane plane, u8 rotation, | ||
35 | } | ||
36 | } | ||
37 | |||
38 | -static int pixinc(int pixels, u8 ps) | ||
39 | +static s32 pixinc(int pixels, u8 ps) | ||
40 | { | ||
41 | if (pixels == 1) | ||
42 | return 1; | ||
43 | @@ -1140,7 +1140,7 @@ static void calc_rotation_offset(u8 rotation, bool mirror, | ||
44 | u16 width, u16 height, | ||
45 | enum omap_color_mode color_mode, bool fieldmode, | ||
46 | unsigned *offset0, unsigned *offset1, | ||
47 | - u16 *row_inc, u16 *pix_inc) | ||
48 | + s32 *row_inc, s32 *pix_inc) | ||
49 | { | ||
50 | u8 ps; | ||
51 | u16 fbw, fbh; | ||
52 | @@ -1298,8 +1298,8 @@ static int _dispc_setup_plane(enum omap_plane plane, | ||
53 | bool fieldmode = 0; | ||
54 | int cconv = 0; | ||
55 | unsigned offset0, offset1; | ||
56 | - u16 row_inc; | ||
57 | - u16 pix_inc; | ||
58 | + s32 row_inc; | ||
59 | + s32 pix_inc; | ||
60 | |||
61 | if (plane == OMAP_DSS_GFX) { | ||
62 | if (width != out_width || height != out_height) | ||
63 | -- | ||
64 | 1.5.6.5 | ||
65 | |||