2010-01-20 00:21:04

by Roel Kluin

Subject: [PATCH] dma: cases IPU_PIX_FMT_BGRA32, BGR32 and ABGR32 are the same in ipu_ch_param_set_size()

In these cases the same statements are executed.

Signed-off-by: Roel Kluin <[email protected]>
---
But was this intended? if not, what should differ? bpp?

diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
index 9a5bc1a..1c518f1 100644
--- a/drivers/dma/ipu/ipu_idmac.c
+++ b/drivers/dma/ipu/ipu_idmac.c
@@ -348,6 +348,7 @@ static void ipu_ch_param_set_size(union chan_param_mem *params,
break;
case IPU_PIX_FMT_BGRA32:
case IPU_PIX_FMT_BGR32:
+ case IPU_PIX_FMT_ABGR32:
params->ip.bpp = 0;
params->ip.pfs = 4;
params->ip.npb = 7;
@@ -376,20 +377,6 @@ static void ipu_ch_param_set_size(union chan_param_mem *params,
params->ip.wid2 = 7; /* Blue bit width - 1 */
params->ip.wid3 = 7; /* Alpha bit width - 1 */
break;
- case IPU_PIX_FMT_ABGR32:
- params->ip.bpp = 0;
- params->ip.pfs = 4;
- params->ip.npb = 7;
- params->ip.sat = 2; /* SAT = 32-bit access */
- params->ip.ofs0 = 8; /* Red bit offset */
- params->ip.ofs1 = 16; /* Green bit offset */
- params->ip.ofs2 = 24; /* Blue bit offset */
- params->ip.ofs3 = 0; /* Alpha bit offset */
- params->ip.wid0 = 7; /* Red bit width - 1 */
- params->ip.wid1 = 7; /* Green bit width - 1 */
- params->ip.wid2 = 7; /* Blue bit width - 1 */
- params->ip.wid3 = 7; /* Alpha bit width - 1 */
- break;
case IPU_PIX_FMT_UYVY:
params->ip.bpp = 2;
params->ip.pfs = 6;

2010-01-20 00:22:53

by Dan Williams

Subject: Re: [PATCH] dma: cases IPU_PIX_FMT_BGRA32, BGR32 and ABGR32 are the same in ipu_ch_param_set_size()

[ added Guennadi ]

On Tue, Jan 19, 2010 at 5:25 PM, Roel Kluin <[email protected]> wrote:
> In these cases the same statements are executed.
>
> Signed-off-by: Roel Kluin <[email protected]>
> ---
> But was this intended? if not, what should differ? bpp?
>
> diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
> index 9a5bc1a..1c518f1 100644
> --- a/drivers/dma/ipu/ipu_idmac.c
> +++ b/drivers/dma/ipu/ipu_idmac.c
> @@ -348,6 +348,7 @@ static void ipu_ch_param_set_size(union chan_param_mem *params,
> ? ? ? ? ? ? ? ?break;
> ? ? ? ?case IPU_PIX_FMT_BGRA32:
> ? ? ? ?case IPU_PIX_FMT_BGR32:
> + ? ? ? case IPU_PIX_FMT_ABGR32:
> ? ? ? ? ? ? ? ?params->ip.bpp ?= 0;
> ? ? ? ? ? ? ? ?params->ip.pfs ?= 4;
> ? ? ? ? ? ? ? ?params->ip.npb ?= 7;
> @@ -376,20 +377,6 @@ static void ipu_ch_param_set_size(union chan_param_mem *params,
> ? ? ? ? ? ? ? ?params->ip.wid2 = 7; ? ? ? ? ? ?/* Blue bit width - 1 */
> ? ? ? ? ? ? ? ?params->ip.wid3 = 7; ? ? ? ? ? ?/* Alpha bit width - 1 */
> ? ? ? ? ? ? ? ?break;
> - ? ? ? case IPU_PIX_FMT_ABGR32:
> - ? ? ? ? ? ? ? params->ip.bpp ?= 0;
> - ? ? ? ? ? ? ? params->ip.pfs ?= 4;
> - ? ? ? ? ? ? ? params->ip.npb ?= 7;
> - ? ? ? ? ? ? ? params->ip.sat ?= 2; ? ? ? ? ? ?/* SAT = 32-bit access */
> - ? ? ? ? ? ? ? params->ip.ofs0 = 8; ? ? ? ? ? ?/* Red bit offset */
> - ? ? ? ? ? ? ? params->ip.ofs1 = 16; ? ? ? ? ? /* Green bit offset */
> - ? ? ? ? ? ? ? params->ip.ofs2 = 24; ? ? ? ? ? /* Blue bit offset */
> - ? ? ? ? ? ? ? params->ip.ofs3 = 0; ? ? ? ? ? ?/* Alpha bit offset */
> - ? ? ? ? ? ? ? params->ip.wid0 = 7; ? ? ? ? ? ?/* Red bit width - 1 */
> - ? ? ? ? ? ? ? params->ip.wid1 = 7; ? ? ? ? ? ?/* Green bit width - 1 */
> - ? ? ? ? ? ? ? params->ip.wid2 = 7; ? ? ? ? ? ?/* Blue bit width - 1 */
> - ? ? ? ? ? ? ? params->ip.wid3 = 7; ? ? ? ? ? ?/* Alpha bit width - 1 */
> - ? ? ? ? ? ? ? break;
> ? ? ? ?case IPU_PIX_FMT_UYVY:
> ? ? ? ? ? ? ? ?params->ip.bpp ?= 2;
> ? ? ? ? ? ? ? ?params->ip.pfs ?= 6;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at ?http://www.tux.org/lkml/
>

2010-01-20 19:21:12

by Guennadi Liakhovetski

Subject: Re: [PATCH] dma: cases IPU_PIX_FMT_BGRA32, BGR32 and ABGR32 are the same in ipu_ch_param_set_size()

On Wed, 20 Jan 2010, Roel Kluin wrote:

> In these cases the same statements are executed.
>
> Signed-off-by: Roel Kluin <[email protected]>

Acked-by: Guennadi Liakhovetski <[email protected]>

Thanks
Guennadi

> ---
> But was this intended? if not, what should differ? bpp?
>
> diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
> index 9a5bc1a..1c518f1 100644
> --- a/drivers/dma/ipu/ipu_idmac.c
> +++ b/drivers/dma/ipu/ipu_idmac.c
> @@ -348,6 +348,7 @@ static void ipu_ch_param_set_size(union chan_param_mem *params,
> break;
> case IPU_PIX_FMT_BGRA32:
> case IPU_PIX_FMT_BGR32:
> + case IPU_PIX_FMT_ABGR32:
> params->ip.bpp = 0;
> params->ip.pfs = 4;
> params->ip.npb = 7;
> @@ -376,20 +377,6 @@ static void ipu_ch_param_set_size(union chan_param_mem *params,
> params->ip.wid2 = 7; /* Blue bit width - 1 */
> params->ip.wid3 = 7; /* Alpha bit width - 1 */
> break;
> - case IPU_PIX_FMT_ABGR32:
> - params->ip.bpp = 0;
> - params->ip.pfs = 4;
> - params->ip.npb = 7;
> - params->ip.sat = 2; /* SAT = 32-bit access */
> - params->ip.ofs0 = 8; /* Red bit offset */
> - params->ip.ofs1 = 16; /* Green bit offset */
> - params->ip.ofs2 = 24; /* Blue bit offset */
> - params->ip.ofs3 = 0; /* Alpha bit offset */
> - params->ip.wid0 = 7; /* Red bit width - 1 */
> - params->ip.wid1 = 7; /* Green bit width - 1 */
> - params->ip.wid2 = 7; /* Blue bit width - 1 */
> - params->ip.wid3 = 7; /* Alpha bit width - 1 */
> - break;
> case IPU_PIX_FMT_UYVY:
> params->ip.bpp = 2;
> params->ip.pfs = 6;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/