projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/oss' into for-linus
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
drm_modes.c
diff --git
a/drivers/gpu/drm/drm_modes.c
b/drivers/gpu/drm/drm_modes.c
index 54f492a488a93c68387bc388a6579c92edb7f988..7914097b09c61b5cad674dfdf7c98dc485fd82f2 100644
(file)
--- a/
drivers/gpu/drm/drm_modes.c
+++ b/
drivers/gpu/drm/drm_modes.c
@@
-566,6
+566,8
@@
void drm_mode_connector_list_update(struct drm_connector *connector)
found_it = 1;
/* if equal delete the probed mode */
mode->status = pmode->status;
+ /* Merge type bits together */
+ mode->type |= pmode->type;
list_del(&pmode->head);
drm_mode_destroy(connector->dev, pmode);
break;