From: Daniel Vetter Date: Tue, 19 Mar 2013 08:47:30 +0000 (+0100) Subject: Merge tag 'v3.9-rc3' into drm-intel-next-queued X-Git-Tag: firefly_0821_release~3680^2~443^2~82^2~22 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=0d4a42f6bd298e826620585e766a154ab460617a Merge tag 'v3.9-rc3' into drm-intel-next-queued Backmerge so that I can merge Imre Deak's coalesced sg entries fixes, which depend upon the new for_each_sg_page introduce in commit a321e91b6d73ed011ffceed384c40d2785cf723b Author: Imre Deak Date: Wed Feb 27 17:02:56 2013 -0800 lib/scatterlist: add simple page iterator The merge itself is just two trivial conflicts: Signed-off-by: Daniel Vetter --- 0d4a42f6bd298e826620585e766a154ab460617a diff --cc drivers/gpu/drm/i915/intel_hdmi.c index 4d222ec58b81,fa8ec4a26041..c882839cd51e --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@@ -777,8 -781,8 +777,8 @@@ bool intel_hdmi_mode_fixup(struct drm_e if (intel_hdmi->color_range_auto) { /* See CEA-861-E - 5.1 Default Encoding Parameters */ if (intel_hdmi->has_hdmi_sink && - drm_mode_cea_vic(adjusted_mode) > 1) + drm_match_cea_mode(adjusted_mode) > 1) - intel_hdmi->color_range = SDVO_COLOR_RANGE_16_235; + intel_hdmi->color_range = HDMI_COLOR_RANGE_16_235; else intel_hdmi->color_range = 0; } diff --cc drivers/gpu/drm/i915/intel_sdvo.c index 38b8511ca598,d07a8cdf998e..53005260cd1d --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@@ -1076,11 -1076,9 +1076,11 @@@ static bool intel_sdvo_mode_fixup(struc if (intel_sdvo->color_range_auto) { /* See CEA-861-E - 5.1 Default Encoding Parameters */ + /* FIXME: This bit is only valid when using TMDS encoding and 8 + * bit per color mode. */ if (intel_sdvo->has_hdmi_monitor && - drm_mode_cea_vic(adjusted_mode) > 1) + drm_match_cea_mode(adjusted_mode) > 1) - intel_sdvo->color_range = SDVO_COLOR_RANGE_16_235; + intel_sdvo->color_range = HDMI_COLOR_RANGE_16_235; else intel_sdvo->color_range = 0; }