2021-08-31 21:18:21

by Jernej Škrabec

[permalink] [raw]
Subject: [PATCH] drm/sun4i: Fix macros in sun8i_csc.h

Macros SUN8I_CSC_CTRL() and SUN8I_CSC_COEFF() don't follow usual
recommendation of having arguments enclosed in parenthesis. While that
didn't change anything for quiet sometime, it actually become important
after CSC code rework with commit ea067aee45a8 ("drm/sun4i: de2/de3:
Remove redundant CSC matrices").

Without this fix, colours are completely off for supported YVU formats
on SoCs with DE2 (A64, H3, R40, etc.).

Fix the issue by enclosing macro arguments in parenthesis.

Cc: [email protected] # 5.12+
Fixes: 883029390550 ("drm/sun4i: Add DE2 CSC library")
Reported-by: Roman Stratiienko <[email protected]>
Signed-off-by: Jernej Skrabec <[email protected]>
---
drivers/gpu/drm/sun4i/sun8i_csc.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.h b/drivers/gpu/drm/sun4i/sun8i_csc.h
index a55a38ad849c..022cafa6c06c 100644
--- a/drivers/gpu/drm/sun4i/sun8i_csc.h
+++ b/drivers/gpu/drm/sun4i/sun8i_csc.h
@@ -16,8 +16,8 @@ struct sun8i_mixer;
#define CCSC10_OFFSET 0xA0000
#define CCSC11_OFFSET 0xF0000

-#define SUN8I_CSC_CTRL(base) (base + 0x0)
-#define SUN8I_CSC_COEFF(base, i) (base + 0x10 + 4 * i)
+#define SUN8I_CSC_CTRL(base) ((base) + 0x0)
+#define SUN8I_CSC_COEFF(base, i) ((base) + 0x10 + 4 * (i))

#define SUN8I_CSC_CTRL_EN BIT(0)

--
2.33.0


2021-09-01 03:15:58

by Chen-Yu Tsai

[permalink] [raw]
Subject: Re: [PATCH] drm/sun4i: Fix macros in sun8i_csc.h

On Wed, Sep 1, 2021 at 2:48 AM Jernej Skrabec <[email protected]> wrote:
>
> Macros SUN8I_CSC_CTRL() and SUN8I_CSC_COEFF() don't follow usual
> recommendation of having arguments enclosed in parenthesis. While that
> didn't change anything for quiet sometime, it actually become important

^ Typo

> after CSC code rework with commit ea067aee45a8 ("drm/sun4i: de2/de3:
> Remove redundant CSC matrices").
>
> Without this fix, colours are completely off for supported YVU formats
> on SoCs with DE2 (A64, H3, R40, etc.).
>
> Fix the issue by enclosing macro arguments in parenthesis.
>
> Cc: [email protected] # 5.12+
> Fixes: 883029390550 ("drm/sun4i: Add DE2 CSC library")
> Reported-by: Roman Stratiienko <[email protected]>
> Signed-off-by: Jernej Skrabec <[email protected]>

Otherwise,

Reviewed-by: Chen-Yu Tsai <[email protected]>

2021-09-01 21:51:21

by Maxime Ripard

[permalink] [raw]
Subject: Re: [PATCH] drm/sun4i: Fix macros in sun8i_csc.h

On Wed, Sep 01, 2021 at 11:13:01AM +0800, Chen-Yu Tsai wrote:
> On Wed, Sep 1, 2021 at 2:48 AM Jernej Skrabec <[email protected]> wrote:
> >
> > Macros SUN8I_CSC_CTRL() and SUN8I_CSC_COEFF() don't follow usual
> > recommendation of having arguments enclosed in parenthesis. While that
> > didn't change anything for quiet sometime, it actually become important
>
> ^ Typo
>
> > after CSC code rework with commit ea067aee45a8 ("drm/sun4i: de2/de3:
> > Remove redundant CSC matrices").
> >
> > Without this fix, colours are completely off for supported YVU formats
> > on SoCs with DE2 (A64, H3, R40, etc.).
> >
> > Fix the issue by enclosing macro arguments in parenthesis.
> >
> > Cc: [email protected] # 5.12+
> > Fixes: 883029390550 ("drm/sun4i: Add DE2 CSC library")
> > Reported-by: Roman Stratiienko <[email protected]>
> > Signed-off-by: Jernej Skrabec <[email protected]>
>
> Otherwise,
>
> Reviewed-by: Chen-Yu Tsai <[email protected]>

Fixed the typo and applied, thanks
Maxime


Attachments:
(No filename) (1.04 kB)
signature.asc (235.00 B)
Download all attachments