From: Zheng Yang Date: Mon, 9 Feb 2015 02:40:40 +0000 (+0800) Subject: HDMI: fix filter feature SUPPORT_TMDS_600M error: X-Git-Tag: firefly_0821_release~4263^2~55 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1f69fb29312271612312fbaca88b089256b6835e;p=firefly-linux-kernel-4.4.55.git HDMI: fix filter feature SUPPORT_TMDS_600M error: If soc is not support feature SUPPORT_TMDS_600M, or current EDID information is not support the feature, we should not show the corresponding option, such as 3840x2160p-60. Signed-off-by: Zheng Yang --- diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c b/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c index 1bd26e7e7f4f..56dd6aa0705f 100644 --- a/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c +++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c @@ -447,10 +447,10 @@ static void hdmi_sort_modelist(struct hdmi_edid *edid, int feature) vic = modelist->vic & HDMI_VIC_MASK; if (vic == hdmi_mode[i].vic || vic == hdmi_mode[i].vic_2nd) { - if ((feature & SUPPORT_TMDS_600M) == 0 && - !(modelist->vic & HDMI_VIDEO_YUV420) && - hdmi_mode[i].mode.pixclock > 340000000 && - edid->maxtmdsclock < 340000000) + if ((((feature & SUPPORT_TMDS_600M) == 0 && + !(modelist->vic & HDMI_VIDEO_YUV420)) || + edid->maxtmdsclock < 340000000) && + hdmi_mode[i].mode.pixclock > 340000000) continue; if ((feature & SUPPORT_4K) == 0 && hdmi_mode[i].mode.xres >= 3840)