diff for duplicates of <20100623085035.GP9381@nokia.com> diff --git a/a/1.txt b/N1/1.txt index 3e78f50..ec5c682 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -82,14 +82,14 @@ On Wed, Jun 23, 2010 at 07:18:00AM +0200, ext Nagarajan, Rajkumar wrote: > > _dispc_set_scale_coef(plane, hscaleup, vscaleup, five_taps); > -> - if (!orig_width || orig_width = out_width) -> + if (!orig_width || (!vdma && (orig_width = out_width))) +> - if (!orig_width || orig_width == out_width) +> + if (!orig_width || (!vdma && (orig_width == out_width))) > fir_hinc = 0; > else > fir_hinc = 1024 * orig_width / out_width; > -> - if (!orig_height || orig_height = out_height) -> + if (!orig_height || (!vdma && (orig_height = out_height))) +> - if (!orig_height || orig_height == out_height) +> + if (!orig_height || (!vdma && (orig_height == out_height))) > fir_vinc = 0; > else > fir_vinc = 1024 * orig_height / out_height; @@ -97,7 +97,7 @@ On Wed, Jun 23, 2010 at 07:18:00AM +0200, ext Nagarajan, Rajkumar wrote: > > REG_FLD_MOD(dispc_reg_att[plane], vidrot, 13, 12); > -> - if (rotation = OMAP_DSS_ROT_90 || rotation = OMAP_DSS_ROT_270) +> - if (rotation == OMAP_DSS_ROT_90 || rotation == OMAP_DSS_ROT_270) > - REG_FLD_MOD(dispc_reg_att[plane], 0x1, 18, 18); > - else > - REG_FLD_MOD(dispc_reg_att[plane], 0x0, 18, 18); @@ -122,9 +122,9 @@ at some point but didn't see any obvious improvement. However the 34xx TRM didn't say anything about 5-tap so perhaps it just didn't actually do anything. -> + if ((color_mode = OMAP_DSS_COLOR_YUV2) || -> + (color_mode = OMAP_DSS_COLOR_UYVY)) -> + if ((rotation = 1) || (rotation = 3)) +> + if ((color_mode == OMAP_DSS_COLOR_YUV2) || +> + (color_mode == OMAP_DSS_COLOR_UYVY)) +> + if ((rotation == 1) || (rotation == 3)) > + return true; > + return false; > +} @@ -210,8 +210,8 @@ _dispc_set_vdma_attrs(..., vdma); > /* For YUV2 and UYVY modes VRFB needs to handle pixels a bit > * differently. See TRM. */ > - if (yuv_mode) { -> + if (color_mode = OMAP_DSS_COLOR_YUV2 || -> + color_mode = OMAP_DSS_COLOR_UYVY) { +> + if (color_mode == OMAP_DSS_COLOR_YUV2 || +> + color_mode == OMAP_DSS_COLOR_UYVY) { > bytespp *= 2; > width /= 2; > } @@ -222,8 +222,8 @@ _dispc_set_vdma_attrs(..., vdma); > + /* for vdma */ > + /* TODO: VDMA support for RGB16 mode */ > + if (cpu_is_omap3630()) -> + if (color_mode = OMAP_DSS_COLOR_YUV2) -> + if ((rotation = 1) || (rotation = 3)) +> + if (color_mode == OMAP_DSS_COLOR_YUV2) +> + if ((rotation == 1) || (rotation == 3)) > + pixel_size_exp = 2; > + @@ -238,8 +238,8 @@ be to 2 for YUV anyway. > vrfb->yoffset = vrfb_height - height; > vrfb->bytespp = bytespp; > - vrfb->yuv_mode = yuv_mode; -> + if (color_mode = OMAP_DSS_COLOR_YUV2 || -> + color_mode = OMAP_DSS_COLOR_UYVY) +> + if (color_mode == OMAP_DSS_COLOR_YUV2 || +> + color_mode == OMAP_DSS_COLOR_UYVY) > + vrfb->yuv_mode = true; > } > EXPORT_SYMBOL(omap_vrfb_setup); @@ -253,3 +253,7 @@ be to 2 for YUV anyway. -- Ville Syrjälä +-- +To unsubscribe from this list: send the line "unsubscribe linux-omap" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 28dd1e3..3503042 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0FF55437E1F14DA4BAEB721A458B6701706BDA5F45D@dbde02.ent.ti.com\0" "From\0Ville Syrj\303\244l\303\244 <ville.syrjala@nokia.com>\0" "Subject\0Re: [PATCH] OMAP: DSS2: DMA optimization using scaler line buffers\0" - "Date\0Wed, 23 Jun 2010 08:50:35 +0000\0" + "Date\0Wed, 23 Jun 2010 11:50:35 +0300\0" "To\0ext Nagarajan" " Rajkumar <x0133774@ti.com>\0" "Cc\0linux-omap@vger.kernel.org <linux-omap@vger.kernel.org>" @@ -93,14 +93,14 @@ "> \n" "> \t_dispc_set_scale_coef(plane, hscaleup, vscaleup, five_taps);\n" "> \n" - "> -\tif (!orig_width || orig_width = out_width)\n" - "> +\tif (!orig_width || (!vdma && (orig_width = out_width)))\n" + "> -\tif (!orig_width || orig_width == out_width)\n" + "> +\tif (!orig_width || (!vdma && (orig_width == out_width)))\n" "> \t\tfir_hinc = 0;\n" "> \telse\n" "> \t\tfir_hinc = 1024 * orig_width / out_width;\n" "> \n" - "> -\tif (!orig_height || orig_height = out_height)\n" - "> +\tif (!orig_height || (!vdma && (orig_height = out_height)))\n" + "> -\tif (!orig_height || orig_height == out_height)\n" + "> +\tif (!orig_height || (!vdma && (orig_height == out_height)))\n" "> \t\tfir_vinc = 0;\n" "> \telse\n" "> \t\tfir_vinc = 1024 * orig_height / out_height;\n" @@ -108,7 +108,7 @@ "> \n" "> \t\tREG_FLD_MOD(dispc_reg_att[plane], vidrot, 13, 12);\n" "> \n" - "> -\t\tif (rotation = OMAP_DSS_ROT_90 || rotation = OMAP_DSS_ROT_270)\n" + "> -\t\tif (rotation == OMAP_DSS_ROT_90 || rotation == OMAP_DSS_ROT_270)\n" "> -\t\t\tREG_FLD_MOD(dispc_reg_att[plane], 0x1, 18, 18);\n" "> -\t\telse\n" "> -\t\t\tREG_FLD_MOD(dispc_reg_att[plane], 0x0, 18, 18);\n" @@ -133,9 +133,9 @@ "TRM didn't say anything about 5-tap so perhaps it just didn't actually\n" "do anything.\n" "\n" - "> +\t\tif ((color_mode = OMAP_DSS_COLOR_YUV2) ||\n" - "> +\t\t\t(color_mode = OMAP_DSS_COLOR_UYVY))\n" - "> +\t\t\tif ((rotation = 1) || (rotation = 3))\n" + "> +\t\tif ((color_mode == OMAP_DSS_COLOR_YUV2) ||\n" + "> +\t\t\t(color_mode == OMAP_DSS_COLOR_UYVY))\n" + "> +\t\t\tif ((rotation == 1) || (rotation == 3))\n" "> +\t\t\t\treturn true;\n" "> +\treturn false;\n" "> +}\n" @@ -221,8 +221,8 @@ "> \t/* For YUV2 and UYVY modes VRFB needs to handle pixels a bit\n" "> \t * differently. See TRM. */\n" "> -\tif (yuv_mode) {\n" - "> +\tif (color_mode = OMAP_DSS_COLOR_YUV2 ||\n" - "> +\t\t\tcolor_mode = OMAP_DSS_COLOR_UYVY) {\n" + "> +\tif (color_mode == OMAP_DSS_COLOR_YUV2 ||\n" + "> +\t\t\tcolor_mode == OMAP_DSS_COLOR_UYVY) {\n" "> \t\tbytespp *= 2;\n" "> \t\twidth /= 2;\n" "> \t}\n" @@ -233,8 +233,8 @@ "> +\t/* for vdma */\n" "> +\t/* TODO: VDMA support for RGB16 mode */\n" "> +\tif (cpu_is_omap3630())\n" - "> +\t\tif (color_mode = OMAP_DSS_COLOR_YUV2)\n" - "> +\t\t\tif ((rotation = 1) || (rotation = 3))\n" + "> +\t\tif (color_mode == OMAP_DSS_COLOR_YUV2)\n" + "> +\t\t\tif ((rotation == 1) || (rotation == 3))\n" "> +\t\t\t\tpixel_size_exp = 2;\n" "> +\n" "\n" @@ -249,8 +249,8 @@ "> \tvrfb->yoffset = vrfb_height - height;\n" "> \tvrfb->bytespp = bytespp;\n" "> -\tvrfb->yuv_mode = yuv_mode;\n" - "> +\tif (color_mode = OMAP_DSS_COLOR_YUV2 ||\n" - "> +\t\t\tcolor_mode = OMAP_DSS_COLOR_UYVY)\n" + "> +\tif (color_mode == OMAP_DSS_COLOR_YUV2 ||\n" + "> +\t\t\tcolor_mode == OMAP_DSS_COLOR_UYVY)\n" "> +\t\tvrfb->yuv_mode = true;\n" "> }\n" "> EXPORT_SYMBOL(omap_vrfb_setup);\n" @@ -263,6 +263,10 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" "\n" "-- \n" - "Ville Syrj\303\244l\303\244" + "Ville Syrj\303\244l\303\244\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" + "the body of a message to majordomo@vger.kernel.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -1f8d58715da85147d023d4b7ef349f0c51fe9228c71558653bac92a2194c0067 +4ed9a5e4365e904a9b808ad95f83356994018b548bd09a074f83a3a90302fa30
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.