From: Daniel Vetter Date: Fri, 14 Aug 2015 16:10:35 +0000 (+0200) Subject: Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes X-Git-Tag: firefly_0821_release~176^2~721^2~33^2~147 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=622147fdad5425f6f572f84ce709303e5e0500b7;p=firefly-linux-kernel-4.4.55.git 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 --- 622147fdad5425f6f572f84ce709303e5e0500b7 diff --cc drivers/gpu/drm/drm_crtc.c index dfac394d0602,fed748311b92..ca077657604e --- a/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);