This reverts commit 3fbd6439e4639ecaeaae6c079e0aa497a1ac3482.

This breaks the boot on my g33 here, right when the initial modeset happens. The modeset seems to complete (the external screen lights up at the native resolution), but then the box is dead.

Strangely enough when delaying disabling modesetting and manually loading the driver later on everything is perfectly fine. I've run out of clues, ideas highly welcome. At least the revert here gets my box going again.

Cc: Marc-André Lureau marcandre.lureau@redhat.com Cc: Dave Airlie airlied@redhat.com Signed-off-by: Daniel Vetter daniel.vetter@ffwll.ch --- drivers/gpu/drm/drm_modes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 85071a1c4547..b0733153dfd2 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1041,7 +1041,7 @@ void drm_mode_connector_list_update(struct drm_connector *connector) /* if equal delete the probed mode */ mode->status = pmode->status; /* Merge type bits together */ - mode->type = pmode->type; + mode->type |= pmode->type; list_del(&pmode->head); drm_mode_destroy(connector->dev, pmode); break;