linux-kernel - linux-next: manual merge of the drm-intel tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130305102334.0cc15cb90a0f8baa4126cc14@canb.auug.org.au>
Date:	Tue, 5 Mar 2013 10:23:34 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Daniel Vetter <daniel.vetter@...ll.ch>,
	<intel-gfx@...ts.freedesktop.org>,
	<dri-devel@...ts.freedesktop.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Paulo Zanoni <paulo.r.zanoni@...el.com>,
	Thierry Reding <thierry.reding@...onic-design.de>
Subject: linux-next: manual merge of the drm-intel tree with Linus' tree

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@...b.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;
  	}

Content of type "application/pgp-signature" skipped