summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-01-14 02:50:49 (GMT)
committerDave Airlie <airlied@redhat.com>2014-01-14 02:50:49 (GMT)
commitabce1ec9b08a4f318f431e6b9a12524227ae7109 (patch)
tree88b4b5d4554b4aafd7d69dadd272bf66b65c0ffc
parentc0eeb856e96982874ebd61b3af88b493d3f665cd (diff)
downloadlinux-abce1ec9b08a4f318f431e6b9a12524227ae7109.tar.xz
Revert "drm: copy mode type in drm_mode_connector_list_update()"
This reverts commit 3fbd6439e4639ecaeaae6c079e0aa497a1ac3482. This caused some strange booting lockup issues on an Intel G33 belonging to Daniel Vetter, very unusual, I was hoping Daniel would track this down, but it looks like instead I'll have to hack a different fix for -next. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_modes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 85071a1..b073315 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;