aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/exynos/exynos_mixer.c
diff options
context:
space:
mode:
authorChristoph Manszewski <c.manszewski@samsung.com>2018-11-28 16:32:11 +0100
committerInki Dae <inki.dae@samsung.com>2018-12-05 17:34:50 +0900
commite9e5ba93cb1f61c16298aade49ec2537d497f0d6 (patch)
treeeae727c99918047d3357c102b5d6fea15d2d70dc /drivers/gpu/drm/exynos/exynos_mixer.c
parentdrm/exynos: decon: Make pixel blend mode configurable (diff)
downloadlinux-dev-e9e5ba93cb1f61c16298aade49ec2537d497f0d6.tar.xz
linux-dev-e9e5ba93cb1f61c16298aade49ec2537d497f0d6.zip
drm/exynos: mixer: Fix color format setting
Fix color format decision based on height(pixels). According to CEA-861-E: "High Definition (HD) - A CE video format that, inclusively, has between 720 to 1080 active vertical lines (Vactive) lines per video frame." Tested on Odroid-U3 with Exynos 4412 CPU, kernel next-20181128 using modetest. Signed-off-by: Christoph Manszewski <c.manszewski@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_mixer.c')
-rw-r--r--drivers/gpu/drm/exynos/exynos_mixer.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 5a47af8e76c0..9cdae10fd36d 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -384,14 +384,9 @@ static void mixer_cfg_rgb_fmt(struct mixer_context *ctx, unsigned int height)
{
u32 val;
- switch (height) {
- case 480:
- case 576:
+ if (height < 720) {
val = MXR_CFG_RGB601_0_255;
- break;
- case 720:
- case 1080:
- default:
+ } else {
val = MXR_CFG_RGB709_16_235;
/* Configure the BT.709 CSC matrix for full range RGB. */
mixer_reg_write(ctx, MXR_CM_COEFF_Y,
@@ -401,7 +396,6 @@ static void mixer_cfg_rgb_fmt(struct mixer_context *ctx, unsigned int height)
MXR_CSC_CT(-0.102, -0.338, 0.440));
mixer_reg_write(ctx, MXR_CM_COEFF_CR,
MXR_CSC_CT( 0.440, -0.399, -0.040));
- break;
}
mixer_reg_writemask(ctx, MXR_CFG, val, MXR_CFG_RGB_FMT_MASK);