diff for duplicates of <4ECB8A81.9090701@ti.com> diff --git a/a/1.txt b/N1/1.txt index 7cf56ab..cdab979 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -153,8 +153,8 @@ Archit > - y = oi->pos_y; > - w = oi->width; > - h = oi->height; -> - outw = oi->out_width = 0 ? oi->width : oi->out_width; -> - outh = oi->out_height = 0 ? oi->height : oi->out_height; +> - outw = oi->out_width == 0 ? oi->width : oi->out_width; +> - outh = oi->out_height == 0 ? oi->height : oi->out_height; > - paddr = oi->paddr; > - > - orig_w = w; @@ -239,8 +239,8 @@ Archit > - * the width if the original width was bigger. > - */ > - if ((w& 1)&& -> - (oi->color_mode = OMAP_DSS_COLOR_YUV2 || -> - oi->color_mode = OMAP_DSS_COLOR_UYVY)) { +> - (oi->color_mode == OMAP_DSS_COLOR_YUV2 || +> - oi->color_mode == OMAP_DSS_COLOR_UYVY)) { > - if (orig_w> w) > - w += 1; > - else @@ -353,9 +353,9 @@ Archit > - if (!dispc_is_overlay_scaled(oc)) > - continue; > - -> - outw = oi->out_width = 0 ? +> - outw = oi->out_width == 0 ? > - oi->width : oi->out_width; -> - outh = oi->out_height = 0 ? +> - outh = oi->out_height == 0 ? > - oi->height : oi->out_height; > - > - /* is the overlay outside the update region? */ @@ -444,7 +444,7 @@ Archit > --- a/drivers/video/omap2/dss/rfbi.c > +++ b/drivers/video/omap2/dss/rfbi.c > @@ -784,7 +784,6 @@ int omap_rfbi_prepare_update(struct omap_dss_device *dssdev, -> if (*w = 0 || *h = 0) +> if (*w == 0 || *h == 0) > return -EINVAL; > > - dss_setup_partial_planes(dssdev, x, y, w, h, true); diff --git a/a/content_digest b/N1/content_digest index 245e3b6..9cd4f6d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01321953724-6350-1-git-send-email-tomi.valkeinen@ti.com\0" "ref\01321953724-6350-7-git-send-email-tomi.valkeinen@ti.com\0" "From\0Archit Taneja <a0393947@ti.com>\0" - "Subject\0Re: [PATCH 06/65] OMAPDSS: remove partial update from the overlay\0" - "Date\0Tue, 22 Nov 2011 11:53:53 +0000\0" + "Subject\0Re: [PATCH 06/65] OMAPDSS: remove partial update from the overlay manager\0" + "Date\0Tue, 22 Nov 2011 17:11:53 +0530\0" "To\0Tomi Valkeinen <tomi.valkeinen@ti.com>\0" "Cc\0linux-fbdev@vger.kernel.org" linux-omap@vger.kernel.org @@ -164,8 +164,8 @@ "> -\ty = oi->pos_y;\n" "> -\tw = oi->width;\n" "> -\th = oi->height;\n" - "> -\toutw = oi->out_width = 0 ? oi->width : oi->out_width;\n" - "> -\touth = oi->out_height = 0 ? oi->height : oi->out_height;\n" + "> -\toutw = oi->out_width == 0 ? oi->width : oi->out_width;\n" + "> -\touth = oi->out_height == 0 ? oi->height : oi->out_height;\n" "> -\tpaddr = oi->paddr;\n" "> -\n" "> -\torig_w = w;\n" @@ -250,8 +250,8 @@ "> -\t\t * the width if the original width was bigger.\n" "> -\t\t */\n" "> -\t\tif ((w& 1)&&\n" - "> -\t\t\t\t(oi->color_mode = OMAP_DSS_COLOR_YUV2 ||\n" - "> -\t\t\t\t oi->color_mode = OMAP_DSS_COLOR_UYVY)) {\n" + "> -\t\t\t\t(oi->color_mode == OMAP_DSS_COLOR_YUV2 ||\n" + "> -\t\t\t\t oi->color_mode == OMAP_DSS_COLOR_UYVY)) {\n" "> -\t\t\tif (orig_w> w)\n" "> -\t\t\t\tw += 1;\n" "> -\t\t\telse\n" @@ -364,9 +364,9 @@ "> -\t\t\tif (!dispc_is_overlay_scaled(oc))\n" "> -\t\t\t\tcontinue;\n" "> -\n" - "> -\t\t\toutw = oi->out_width = 0 ?\n" + "> -\t\t\toutw = oi->out_width == 0 ?\n" "> -\t\t\t\toi->width : oi->out_width;\n" - "> -\t\t\touth = oi->out_height = 0 ?\n" + "> -\t\t\touth = oi->out_height == 0 ?\n" "> -\t\t\t\toi->height : oi->out_height;\n" "> -\n" "> -\t\t\t/* is the overlay outside the update region? */\n" @@ -455,7 +455,7 @@ "> --- a/drivers/video/omap2/dss/rfbi.c\n" "> +++ b/drivers/video/omap2/dss/rfbi.c\n" "> @@ -784,7 +784,6 @@ int omap_rfbi_prepare_update(struct omap_dss_device *dssdev,\n" - "> \tif (*w = 0 || *h = 0)\n" + "> \tif (*w == 0 || *h == 0)\n" "> \t\treturn -EINVAL;\n" ">\n" "> -\tdss_setup_partial_planes(dssdev, x, y, w, h, true);\n" @@ -463,4 +463,4 @@ ">\n" "> \treturn 0;" -ce0e4e2ba41f9536ba49e14393dee6a2aa5b2410869cbc412e751ed345072b59 +d743f94ae5537493f7c92ab47749f604c7f39a6d054d401f3facb7d47f5b6bd3
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.