From: Zheng Yang <zhengyang@rock-chips.com>
Date: Wed, 16 Nov 2016 09:04:54 +0000 (+0800)
Subject: video: rockchip: hdmi: enable hdr when resolution is not 4K
X-Git-Tag: firefly_0821_release~637
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ea7b3fd24ca09c61c3b0c362b4a968536f00a330;p=firefly-linux-kernel-4.4.55.git

video: rockchip: hdmi: enable hdr when resolution is not 4K

Change-Id: If3ab93cd0ef822c82d6d482cb3ed2dc29f6613d8
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit 62a423c5a074a895b1f92f3ceecf4f4ba5d8253a)
---

diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c b/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c
index e077ca01d4b3..45727290b800 100644
--- a/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c
@@ -932,9 +932,7 @@ static int hdmi_set_info(struct rk_screen *screen, struct hdmi *hdmi)
 	mode = (struct fb_videomode *)&hdmi_mode[i].mode;
 	if (hdmi->video.color_input == HDMI_COLOR_RGB_0_255) {
 		screen->color_mode = COLOR_RGB;
-	} else if (mode->xres >= 3840 &&
-		   mode->yres >= 2160 &&
-		   colorimetry > HDMI_COLORIMETRY_EXTEND_ADOBE_RGB) {
+	} else if (colorimetry > HDMI_COLORIMETRY_EXTEND_ADOBE_RGB) {
 		screen->color_mode = COLOR_YCBCR_BT2020;
 		if (hdmi->video.eotf == EOTF_ST_2084)
 			screen->data_space = 1;