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

Conflicts:
	drivers/gpu/drm/i915/intel_sdvo.c

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
index 56746dcac40f116fe58c25e648ee9887a0f63a39,dff9d4e5b92b15ba985d6153e949c7b970dac0f3..6eb99e13c37d03b86325e5e5a24fb70f0c2c1503
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -7934,14 -8175,8 +8175,13 @@@ intel_modeset_check_state(struct drm_de
                     "crtc's computed enabled state doesn't match tracked enabled state "
                     "(expected %i, found %i)\n", enabled, crtc->base.enabled);
  
-               memset(&pipe_config, 0, sizeof(pipe_config));
                active = dev_priv->display.get_pipe_config(crtc,
                                                           &pipe_config);
 +
 +              /* hw state is inconsistent with the pipe A quirk */
 +              if (crtc->pipe == PIPE_A && dev_priv->quirks & QUIRK_PIPEA_FORCE)
 +                      active = crtc->active;
 +
                WARN(crtc->active != active,
                     "crtc active state doesn't match with hw state "
                     "(expected %i, found %i)\n", crtc->active, active);

diff --cc drivers/gpu/drm/i915/intel_lvds.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_sdvo.c
index d4ea6c265ce113ca4a179f41ff2ba061ceff62e0,7068195376ef0c7ab2a912d08d45ece43d3b488d..7d31165e1904504b1a483d4aa16c98a5572a249b
--- 1/drivers/gpu/drm/i915/intel_sdvo.c
--- 2/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 |

diff --cc drivers/gpu/drm/mgag200/mgag200_mode.c
Simple merge