Merge drm-fixes into drm-next.

Nouveau wanted this to avoid some worse conflicts when I merge that.
This commit is contained in:
Dave Airlie
2016-03-14 09:42:34 +10:00
1064 changed files with 12863 additions and 8130 deletions

View File

@@ -6043,7 +6043,6 @@ intel_dp_init(struct drm_device *dev,
}
intel_dig_port->port = port;
dev_priv->dig_port_map[port] = intel_encoder;
intel_dig_port->dp.output_reg = output_reg;
intel_dig_port->max_lanes = 4;