On Thu, Dec 03, 2015 at 11:14:08PM +0200, ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Turns out I broke mode pruning when the connector mode lists changes > without the connector getting disconnected in between. Mostly a problem > for i-g-t EDID forcing stuff I suppose, but maybe someone is fast enough > that they can swap cables without the system noticing until the new > cable is plugged in. > > Anyway here's the fix, and I also ended up reviewing the way we merge > new and old modes together, and made some changes there. Pulled in the entire series except patch 3 into drm-misc. Thanks, Daniel > > Ville Syrjälä (7): > drm: Don't overwrite UNVERFIED mode status to OK > drm: Rename MODE_UNVERIFIED to MODE_STALE > drm: Reindent enum drm_mode_status > drm: Flatten drm_mode_connector_list_update() a bit > drm: Only merge mode type bits between new probed modes > drm: Drop drm_helper_probe_single_connector_modes_nomerge() > drm/sti: Drop bogus drm_mode_sort() call > > drivers/gpu/drm/drm_modes.c | 56 +++++++++++++--------- > drivers/gpu/drm/drm_probe_helper.c | 72 ++++++++++------------------ > drivers/gpu/drm/qxl/qxl_display.c | 2 +- > drivers/gpu/drm/sti/sti_hda.c | 2 - > drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- > include/drm/drm_crtc_helper.h | 4 -- > include/drm/drm_modes.h | 80 ++++++++++++++++---------------- > 8 files changed, 103 insertions(+), 117 deletions(-) > > -- > 2.4.10 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
