From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Sep 2012 01:52:08 +0000 (+1000)
Subject: Merge remote-tracking branch 'drm/drm-next'
X-Git-Tag: next-20120919~64
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5460e309e53b4bcde4d39e19473ebc4f26980fc0;p=karo-tx-linux.git

Merge remote-tracking branch 'drm/drm-next'

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
---

5460e309e53b4bcde4d39e19473ebc4f26980fc0
diff --cc drivers/gpu/drm/i915/i915_dma.c
index 914c0dfabe60,2c09900e3267..8bd7c9a22d01
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@@ -1586,8 -1606,7 +1606,8 @@@ int i915_driver_load(struct drm_device 
  
  	spin_lock_init(&dev_priv->irq_lock);
  	spin_lock_init(&dev_priv->error_lock);
- 	spin_lock_init(&dev_priv->rps_lock);
+ 	spin_lock_init(&dev_priv->rps.lock);
 +	spin_lock_init(&dev_priv->dpio_lock);
  
  	if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
  		dev_priv->num_pipe = 3;
diff --cc drivers/gpu/drm/i915/intel_dp.c
index ace757af9133,143d19c26752..1af6fe821eba
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -2509,34 -2481,35 +2481,31 @@@ intel_dp_init(struct drm_device *dev, i
  	drm_sysfs_connector_add(connector);
  
  	/* Set up the DDC bus. */
- 	switch (output_reg) {
- 		case DP_A:
- 			name = "DPDDC-A";
- 			break;
- 		case DP_B:
- 		case PCH_DP_B:
- 			dev_priv->hotplug_supported_mask |=
- 				DPB_HOTPLUG_INT_STATUS;
- 			name = "DPDDC-B";
- 			break;
- 		case DP_C:
- 		case PCH_DP_C:
- 			dev_priv->hotplug_supported_mask |=
- 				DPC_HOTPLUG_INT_STATUS;
- 			name = "DPDDC-C";
- 			break;
- 		case DP_D:
- 		case PCH_DP_D:
- 			dev_priv->hotplug_supported_mask |=
- 				DPD_HOTPLUG_INT_STATUS;
- 			name = "DPDDC-D";
- 			break;
+ 	switch (port) {
+ 	case PORT_A:
+ 		name = "DPDDC-A";
+ 		break;
+ 	case PORT_B:
+ 		dev_priv->hotplug_supported_mask |= DPB_HOTPLUG_INT_STATUS;
+ 		name = "DPDDC-B";
+ 		break;
+ 	case PORT_C:
+ 		dev_priv->hotplug_supported_mask |= DPC_HOTPLUG_INT_STATUS;
+ 		name = "DPDDC-C";
+ 		break;
+ 	case PORT_D:
+ 		dev_priv->hotplug_supported_mask |= DPD_HOTPLUG_INT_STATUS;
+ 		name = "DPDDC-D";
+ 		break;
+ 	default:
+ 		WARN(1, "Invalid port %c\n", port_name(port));
+ 		break;
  	}
  
 -	intel_dp_i2c_init(intel_dp, intel_connector, name);
 -
  	/* Cache some DPCD data in the eDP case */
  	if (is_edp(intel_dp)) {
 -		bool ret;
  		struct edp_power_seq	cur, vbt;
  		u32 pp_on, pp_off, pp_div;
 -		struct edid *edid;
  
  		pp_on = I915_READ(PCH_PP_ON_DELAYS);
  		pp_off = I915_READ(PCH_PP_OFF_DELAYS);
diff --cc drivers/staging/omapdrm/omap_connector.c
index 55e9c8655850,9c2287b71d29..38be186c249a
--- a/drivers/staging/omapdrm/omap_connector.c
+++ b/drivers/staging/omapdrm/omap_connector.c
@@@ -203,14 -180,11 +203,11 @@@ static int omap_connector_get_modes(str
  		} else {
  			drm_mode_connector_update_edid_property(
  					connector, NULL);
- 			connector->display_info.raw_edid = NULL;
- 			kfree(edid);
  		}
+ 		kfree(edid);
  	} else {
  		struct drm_display_mode *mode = drm_mode_create(dev);
 -		struct omap_video_timings timings;
 +		struct omap_video_timings timings = {0};
  
  		dssdrv->get_timings(dssdev, &timings);