diff for duplicates of <201011121643.52923.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index f4fbca7..0a52f06 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -120,7 +120,7 @@ call it mcde_wait_for_overlay. Same for some other functions. > + /* TODO: check if these watermark levels work for HDMI as well. */ > + pixelfetchwtrmrklevel = MCDE_PIXFETCH_SMALL_WTRMRKLVL; > +#else -> + if ((fifo = MCDE_FIFO_A || fifo = MCDE_FIFO_B) && +> + if ((fifo == MCDE_FIFO_A || fifo == MCDE_FIFO_B) && > + regs->ppl >= fifo_size * 2) > + pixelfetchwtrmrklevel = MCDE_PIXFETCH_LARGE_WTRMRKLVL; > + else diff --git a/a/content_digest b/N1/content_digest index e3f74e9..4c8acc5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01289390653-6111-1-git-send-email-jimmy.rubin@stericsson.com\0" "ref\01289390653-6111-2-git-send-email-jimmy.rubin@stericsson.com\0" - "From\0Arnd Bergmann <arnd@arndb.de>\0" - "Subject\0Re: [PATCH 01/10] MCDE: Add hardware abstraction layer\0" - "Date\0Fri, 12 Nov 2010 15:43:52 +0000\0" + "From\0arnd@arndb.de (Arnd Bergmann)\0" + "Subject\0[PATCH 01/10] MCDE: Add hardware abstraction layer\0" + "Date\0Fri, 12 Nov 2010 16:43:52 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -128,7 +128,7 @@ "> +\t/* TODO: check if these watermark levels work for HDMI as well. */\n" "> +\tpixelfetchwtrmrklevel = MCDE_PIXFETCH_SMALL_WTRMRKLVL;\n" "> +#else\n" - "> +\tif ((fifo = MCDE_FIFO_A || fifo = MCDE_FIFO_B) &&\n" + "> +\tif ((fifo == MCDE_FIFO_A || fifo == MCDE_FIFO_B) &&\n" "> +\t\t\t\t\tregs->ppl >= fifo_size * 2)\n" "> +\t\tpixelfetchwtrmrklevel = MCDE_PIXFETCH_LARGE_WTRMRKLVL;\n" "> +\telse\n" @@ -165,4 +165,4 @@ "\n" "\tArnd" -4a3d52a2a901d82c7d503bc4fec85c53b3c4b7c25aef16c7c4fec8795ed720fe +869ef101d414f32661508685de79636beccc18bbe4ed06f32fe2684ecb22171e
diff --git a/a/1.txt b/N2/1.txt index f4fbca7..0a52f06 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -120,7 +120,7 @@ call it mcde_wait_for_overlay. Same for some other functions. > + /* TODO: check if these watermark levels work for HDMI as well. */ > + pixelfetchwtrmrklevel = MCDE_PIXFETCH_SMALL_WTRMRKLVL; > +#else -> + if ((fifo = MCDE_FIFO_A || fifo = MCDE_FIFO_B) && +> + if ((fifo == MCDE_FIFO_A || fifo == MCDE_FIFO_B) && > + regs->ppl >= fifo_size * 2) > + pixelfetchwtrmrklevel = MCDE_PIXFETCH_LARGE_WTRMRKLVL; > + else diff --git a/a/content_digest b/N2/content_digest index e3f74e9..10b7f4a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,13 @@ "ref\01289390653-6111-2-git-send-email-jimmy.rubin@stericsson.com\0" "From\0Arnd Bergmann <arnd@arndb.de>\0" "Subject\0Re: [PATCH 01/10] MCDE: Add hardware abstraction layer\0" - "Date\0Fri, 12 Nov 2010 15:43:52 +0000\0" + "Date\0Fri, 12 Nov 2010 16:43:52 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" + "Cc\0Jimmy Rubin <jimmy.rubin@stericsson.com>" + linux-fbdev@vger.kernel.org + linux-media@vger.kernel.org + Dan Johansson <dan.johansson@stericsson.com> + " Linus Walleij <linus.walleij@stericsson.com>\0" "\00:1\0" "b\0" "On Wednesday 10 November 2010, Jimmy Rubin wrote:\n" @@ -128,7 +133,7 @@ "> +\t/* TODO: check if these watermark levels work for HDMI as well. */\n" "> +\tpixelfetchwtrmrklevel = MCDE_PIXFETCH_SMALL_WTRMRKLVL;\n" "> +#else\n" - "> +\tif ((fifo = MCDE_FIFO_A || fifo = MCDE_FIFO_B) &&\n" + "> +\tif ((fifo == MCDE_FIFO_A || fifo == MCDE_FIFO_B) &&\n" "> +\t\t\t\t\tregs->ppl >= fifo_size * 2)\n" "> +\t\tpixelfetchwtrmrklevel = MCDE_PIXFETCH_LARGE_WTRMRKLVL;\n" "> +\telse\n" @@ -165,4 +170,4 @@ "\n" "\tArnd" -4a3d52a2a901d82c7d503bc4fec85c53b3c4b7c25aef16c7c4fec8795ed720fe +472858a578b530cd4640a1b1bf7a98411f6d272ac08bdbd084354e8d09fafc63
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.