Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes

Backmerge drm-intel-fixes because a bunch of atomic patch backporting
we had to do lead to horrible conflicts.

Conflicts:
	drivers/gpu/drm/drm_crtc.c
Just a bit of context conflict between -next and -fixes.
	drivers/gpu/drm/i915/intel_atomic.c
	drivers/gpu/drm/i915/intel_display.c
Atomic conflicts, always pick the code from -next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
Simple merge

diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
Simple merge

diff --cc drivers/gpu/drm/drm_atomic_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_crtc.c
index dfac394,fed7483..ca07765
--- 1/drivers/gpu/drm/drm_crtc.c
--- 2/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@@ -5273,12 -5398,9 +5273,9 @@@ void drm_mode_config_reset(struct drm_d
                if (encoder->funcs->reset)
                        encoder->funcs->reset(encoder);
  
-       drm_for_each_connector(connector, dev) {
-               connector->status = connector_status_unknown;
- 
 -      list_for_each_entry(connector, &dev->mode_config.connector_list, head)
++      drm_for_each_connector(connector, dev)
                if (connector->funcs->reset)
                        connector->funcs->reset(connector);
-       }
  }
  EXPORT_SYMBOL(drm_mode_config_reset);
  

diff --cc drivers/gpu/drm/drm_irq.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

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

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

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

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

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

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

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge

diff --cc include/drm/drm_crtc_helper.h
Simple merge

diff --cc include/uapi/drm/i915_drm.h
Simple merge