drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
In commit 9f428b95ac89 ("drm/mediatek: Add new color format MACROs in
OVL"), some new color formats are defined in the MACROs to make the
switch statement more concise. That commit was intended to be a no-op
cleanup. However, there are typos in these formats MACROs, which cause
the return value to be incorrect. Fix the typos to ensure the return
value remains unchanged.
Fixes: 9f428b95ac89 ("drm/mediatek: Add new color format MACROs in OVL")
Signed-off-by: Hsin-Te Yuan <yuanhsinte@chromium.org>
---
Changes in v2:
- Clarify that the commit get fixed was intended to be a no-op cleanup
- Fix the typo in tag
- Link to v1: https://lore.kernel.org/r/20241015-color-v1-1-35b01fa0a826@chromium.org
---
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 89b439dcf3a6af9f5799487fdc0f128a9b5cbe4a..1632ac5c23d87e1cdc41013a9cf7864728dcb63b 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -65,8 +65,8 @@
#define OVL_CON_CLRFMT_RGB (1 << 12)
#define OVL_CON_CLRFMT_ARGB8888 (2 << 12)
#define OVL_CON_CLRFMT_RGBA8888 (3 << 12)
-#define OVL_CON_CLRFMT_ABGR8888 (OVL_CON_CLRFMT_RGBA8888 | OVL_CON_BYTE_SWAP)
-#define OVL_CON_CLRFMT_BGRA8888 (OVL_CON_CLRFMT_ARGB8888 | OVL_CON_BYTE_SWAP)
+#define OVL_CON_CLRFMT_ABGR8888 (OVL_CON_CLRFMT_ARGB8888 | OVL_CON_BYTE_SWAP)
+#define OVL_CON_CLRFMT_BGRA8888 (OVL_CON_CLRFMT_RGBA8888 | OVL_CON_BYTE_SWAP)
#define OVL_CON_CLRFMT_UYVY (4 << 12)
#define OVL_CON_CLRFMT_YUYV (5 << 12)
#define OVL_CON_MTX_YUV_TO_RGB (6 << 16)
---
base-commit: 75b607fab38d149f232f01eae5e6392b394dd659
change-id: 20241015-color-e205e75b64aa
Best regards,
--
Hsin-Te Yuan <yuanhsinte@chromium.org>
On Wed, Oct 16, 2024 at 7:10 PM Hsin-Te Yuan <yuanhsinte@chromium.org> wrote: > > In commit 9f428b95ac89 ("drm/mediatek: Add new color format MACROs in > OVL"), some new color formats are defined in the MACROs to make the > switch statement more concise. That commit was intended to be a no-op > cleanup. However, there are typos in these formats MACROs, which cause > the return value to be incorrect. Fix the typos to ensure the return > value remains unchanged. > > Fixes: 9f428b95ac89 ("drm/mediatek: Add new color format MACROs in OVL") > Signed-off-by: Hsin-Te Yuan <yuanhsinte@chromium.org> > --- > Changes in v2: > - Clarify that the commit get fixed was intended to be a no-op cleanup > - Fix the typo in tag > - Link to v1: https://lore.kernel.org/r/20241015-color-v1-1-35b01fa0a826@chromium.org > --- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index 89b439dcf3a6af9f5799487fdc0f128a9b5cbe4a..1632ac5c23d87e1cdc41013a9cf7864728dcb63b 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -65,8 +65,8 @@ > #define OVL_CON_CLRFMT_RGB (1 << 12) > #define OVL_CON_CLRFMT_ARGB8888 (2 << 12) > #define OVL_CON_CLRFMT_RGBA8888 (3 << 12) > -#define OVL_CON_CLRFMT_ABGR8888 (OVL_CON_CLRFMT_RGBA8888 | OVL_CON_BYTE_SWAP) > -#define OVL_CON_CLRFMT_BGRA8888 (OVL_CON_CLRFMT_ARGB8888 | OVL_CON_BYTE_SWAP) > +#define OVL_CON_CLRFMT_ABGR8888 (OVL_CON_CLRFMT_ARGB8888 | OVL_CON_BYTE_SWAP) > +#define OVL_CON_CLRFMT_BGRA8888 (OVL_CON_CLRFMT_RGBA8888 | OVL_CON_BYTE_SWAP) > #define OVL_CON_CLRFMT_UYVY (4 << 12) > #define OVL_CON_CLRFMT_YUYV (5 << 12) > #define OVL_CON_MTX_YUV_TO_RGB (6 << 16) > > --- > base-commit: 75b607fab38d149f232f01eae5e6392b394dd659 > change-id: 20241015-color-e205e75b64aa > > Best regards, > -- > Hsin-Te Yuan <yuanhsinte@chromium.org> > You missed Doug's R-b tag in v1: https://lore.kernel.org/all/CAD=FV=XrrhUoB9=JuPY2erLMA7S-EREqvP5t8NNuBuUiA4rZjQ@mail.gmail.com/ Can you resend v3 with both R-b tags this time? Thanks, Fei
On 10/16/24 13:08, Hsin-Te Yuan wrote: > In commit 9f428b95ac89 ("drm/mediatek: Add new color format MACROs in > OVL"), some new color formats are defined in the MACROs to make the > switch statement more concise. That commit was intended to be a no-op > cleanup. However, there are typos in these formats MACROs, which cause > the return value to be incorrect. Fix the typos to ensure the return > value remains unchanged. > > Fixes: 9f428b95ac89 ("drm/mediatek: Add new color format MACROs in OVL") > Signed-off-by: Hsin-Te Yuan <yuanhsinte@chromium.org> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > --- > Changes in v2: > - Clarify that the commit get fixed was intended to be a no-op cleanup > - Fix the typo in tag > - Link to v1: https://lore.kernel.org/r/20241015-color-v1-1-35b01fa0a826@chromium.org > --- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index 89b439dcf3a6af9f5799487fdc0f128a9b5cbe4a..1632ac5c23d87e1cdc41013a9cf7864728dcb63b 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -65,8 +65,8 @@ > #define OVL_CON_CLRFMT_RGB (1 << 12) > #define OVL_CON_CLRFMT_ARGB8888 (2 << 12) > #define OVL_CON_CLRFMT_RGBA8888 (3 << 12) > -#define OVL_CON_CLRFMT_ABGR8888 (OVL_CON_CLRFMT_RGBA8888 | OVL_CON_BYTE_SWAP) > -#define OVL_CON_CLRFMT_BGRA8888 (OVL_CON_CLRFMT_ARGB8888 | OVL_CON_BYTE_SWAP) > +#define OVL_CON_CLRFMT_ABGR8888 (OVL_CON_CLRFMT_ARGB8888 | OVL_CON_BYTE_SWAP) > +#define OVL_CON_CLRFMT_BGRA8888 (OVL_CON_CLRFMT_RGBA8888 | OVL_CON_BYTE_SWAP) > #define OVL_CON_CLRFMT_UYVY (4 << 12) > #define OVL_CON_CLRFMT_YUYV (5 << 12) > #define OVL_CON_MTX_YUV_TO_RGB (6 << 16) > > --- > base-commit: 75b607fab38d149f232f01eae5e6392b394dd659 > change-id: 20241015-color-e205e75b64aa > > Best regards,
© 2016 - 2024 Red Hat, Inc.