diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-07-24 11:52:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-07-24 11:52:35 +1000 |
| commit | b37b425f2e51d1e716836bdd14fb344c38606a3d (patch) | |
| tree | b294f902e56a371e4a8faca79a509fd5b52b453c /drivers | |
| parent | 4db9a82f1efa18304e51d68ef056b045050b9153 (diff) | |
| parent | 5677d67ae3949f09f57357241b88222d49b8c782 (diff) | |
| download | linux-b37b425f2e51d1e716836bdd14fb344c38606a3d.tar.bz2 | |
Merge tag 'topic/drm-fixes-2015-07-23' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Regression fix for systemd getting confused about unknown connector state
after resume. Just stop setting the state to unknown, turned out to be a
silly idea anyway. What drivers imo really should do (and i915 still does
that) is forcing a full reprobe on resume to make sure connector changes
while suspended are caught. Most drivers seem to get this wrong. Otoh it
took us years to get fixes merged where some probe races resulted in
eating uevents, I guess userspace expectations for reliable hpd are just
really low :(
* tag 'topic/drm-fixes-2015-07-23' of git://anongit.freedesktop.org/drm-intel:
drm: Stop resetting connector state to unknown
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 357bd04a173b..fed748311b92 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -5398,12 +5398,9 @@ void drm_mode_config_reset(struct drm_device *dev) if (encoder->funcs->reset) encoder->funcs->reset(encoder); - list_for_each_entry(connector, &dev->mode_config.connector_list, head) { - connector->status = connector_status_unknown; - + list_for_each_entry(connector, &dev->mode_config.connector_list, head) if (connector->funcs->reset) connector->funcs->reset(connector); - } } EXPORT_SYMBOL(drm_mode_config_reset); |