Hi all,

Today's linux-next merge of the drm-intel tree got conflicts in
drivers/gpu/drm/i915/intel_hdmi.c and drivers/gpu/drm/i915/intel_sdvo.c
between commit 18316c8c39a8 ("drm: Remove duplicate drm_mode_cea_vic()")
from Linus' tree and commit 4f3a8bc7ba6e ("drm/i915: rename some HDMI bit
definitions") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_hdmi.c
index fa8ec4a,4d222ec..0000000
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@@ -781,8 -777,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 d07a8cd,63dcb76..0000000
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@@ -1076,9 -1076,11 +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;
  	}