2163c92c771d9ef8f905956a7fed645283a53544
[buildroot.git] /
1 diff -urN linux-2.6.28.2-0rig//drivers/video/atmel_mpopfb.c linux-2.6.28.2/drivers/video/atmel_mpopfb.c
2 --- linux-2.6.28.2-0rig//drivers/video/atmel_mpopfb.c 2009-01-29 09:41:04.000000000 +0100
3 +++ linux-2.6.28.2/drivers/video/atmel_mpopfb.c 2009-01-29 09:43:46.000000000 +0100
4 @@ -315,6 +315,10 @@
5 static void atmel_mpopfb_start(struct atmel_mpopfb_info *sinfo)
6 {
7 if (!sinfo->running) {
8 + unsigned int line_cache_disable =
9 + sinfo->baseimg_info.line_cache_disable ?
10 + ATMEL_MPOP_CR_CACHEDIS_MASK : 0;
11 +
12 dev_dbg(sinfo->info->device, " * Starting MPOP.\n");
13
14 /* Enable all error interrupts. */
15 @@ -325,9 +329,9 @@
16 * reading from the slave interface it will start
17 * generating a frame.
18 */
19 - mpop_writel(sinfo, ATMEL_MPOP_CR,
20 - ATMEL_MPOP_CR_EN_MASK
21 - /*| ATMEL_MPOP_CR_OUT_BGR_MASK */ );
22 + mpop_writel(sinfo, ATMEL_MPOP_CR, ATMEL_MPOP_CR_EN_MASK
23 + | line_cache_disable
24 + | ATMEL_MPOP_CR_OUT_BGR_MASK);
25
26 sinfo->running = 1;
27 }
28 diff -urN linux-2.6.28.2-0rig//include/linux/atmel_mpopfb.h linux-2.6.28.2/include/linux/atmel_mpopfb.h
29 --- linux-2.6.28.2-0rig//include/linux/atmel_mpopfb.h 2009-01-29 09:41:04.000000000 +0100
30 +++ linux-2.6.28.2/include/linux/atmel_mpopfb.h 2009-01-29 09:43:46.000000000 +0100
31 @@ -42,9 +42,11 @@
32 unsigned xsize;
33 unsigned ysize;
34
35 - /* Signal that we should flip the video. */
36 + /* Signal for flipping the video. */
37 int flip;
38
39 + /* Signal for disabling the line cache. */
40 + int line_cache_disable;
41 };
42
43 enum atmel_mpopfb_overlay_type {