From 1cb58f9d38597896d4d74c22f0d8a892fc867e95 Mon Sep 17 00:00:00 2001 From: Wangqiang Guo Date: Thu, 13 Jun 2024 15:40:58 +0800 Subject: [PATCH] media: rockchip: hdmirx: fix color space err. Type: Fix Redmine ID: #489206 Associated modifications: null Test: cat /d/hdmirx/status check color space. Change-Id: Ib9ab90a663ef49e2e1a84eec6b216335569c38bb Signed-off-by: Wangqiang Guo --- .../platform/rockchip/hdmirx/rk_hdmirx.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c index d54e17e56a8b..2350333aa333 100644 --- a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c @@ -796,8 +796,8 @@ static void hdmirx_get_color_space(struct rk_hdmirx_dev *hdmirx_dev) */ hdmirx_readl(hdmirx_dev, PKTDEC_AVIIF_PH2_1); val = hdmirx_readl(hdmirx_dev, PKTDEC_AVIIF_PB3_0); - EC2_0 = (val & EXTEND_COLORIMETRY) >> 20; - C1_C0 = (val & COLORIMETRY_MASK) >> 14; + EC2_0 = (val & EXTEND_COLORIMETRY) >> 28; + C1_C0 = (val & COLORIMETRY_MASK) >> 22; if (hdmirx_dev->pix_fmt == HDMIRX_RGB888) { if (EC2_0 == HDMIRX_ADOBE_RGB || EC2_0 == HDMIRX_BT2020_RGB_OR_YCC) @@ -827,14 +827,14 @@ static void hdmirx_get_color_space(struct rk_hdmirx_dev *hdmirx_dev) static bool IsColorRangeLimitFormat(uint32_t width, uint32_t height, bool interlace) { - if (((width == 720) && (height == 240) && (interlace == false)) \ - || ((width == 720) && (height == 1201) && (interlace == false)) \ - || ((width == 720) && (height == 480) && (interlace == true)) \ - || ((width == 720) && (height == 576) && (interlace == true)) \ - || ((width == 1440) && (height == 480) && (interlace == true)) \ - || ((width == 1440) && (height == 576) && (interlace == true)) \ - || ((width == 1920) && (height == 1080) && (interlace == true)) \ - || ((width == 2880) && (height == 480) && (interlace == true)) \ + if (((width == 720) && (height == 240) && (interlace == false)) + || ((width == 720) && (height == 1201) && (interlace == false)) + || ((width == 720) && (height == 480) && (interlace == true)) + || ((width == 720) && (height == 576) && (interlace == true)) + || ((width == 1440) && (height == 480) && (interlace == true)) + || ((width == 1440) && (height == 576) && (interlace == true)) + || ((width == 1920) && (height == 1080) && (interlace == true)) + || ((width == 2880) && (height == 480) && (interlace == true)) || ((width == 3840) && (height == 2160) && (interlace == false))) { return true; } else {