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

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_sdvo.c between commit c3456fb3e471 ("drm/i915:
prefer VBT modes for SVDO-LVDS over EDID") from Linus' tree and commit
41aa344866e3 ("drm/i915: Organize VBT stuff inside drm_i915_private")
from the drm tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/i915/intel_sdvo.c
index d4ea6c2,7068195..0000000
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@@ -1776,17 -1848,14 +1848,17 @@@ static void intel_sdvo_get_lvds_modes(s
  	 * Assume that the preferred modes are
  	 * arranged in priority order.
  	 */
 -	intel_ddc_get_modes(connector, intel_sdvo->i2c);
 -	if (list_empty(&connector->probed_modes) == false)
 -		goto end;
 +	intel_ddc_get_modes(connector, &intel_sdvo->ddc);
  
 -	/* Fetch modes from VBT */
 +	/*
 +	 * Fetch modes from VBT. For SDVO prefer the VBT mode since some
 +	 * SDVO->LVDS transcoders can't cope with the EDID mode. Since
 +	 * drm_mode_probed_add adds the mode at the head of the list we add it
 +	 * last.
 +	 */
- 	if (dev_priv->sdvo_lvds_vbt_mode != NULL) {
+ 	if (dev_priv->vbt.sdvo_lvds_vbt_mode != NULL) {
  		newmode = drm_mode_duplicate(connector->dev,
- 					     dev_priv->sdvo_lvds_vbt_mode);
+ 					     dev_priv->vbt.sdvo_lvds_vbt_mode);
  		if (newmode != NULL) {
  			/* Guarantee the mode is preferred */
  			newmode->type = (DRM_MODE_TYPE_PREFERRED |

Attachment: pgp00000.pgp
Description: PGP signature