1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index f6b7c0e36a1a..e82b61e08f8c 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -1611,7 +1611,13 @@ int drm_mode_convert_umode(struct drm_device *dev,
         out->vscan = in->vscan;
         out->vrefresh = in->vrefresh;
         out->flags = in->flags;
-        out->type = in->type;
+        /*
+         * Old xf86-video-vmware (possibly others too) used to
+         * leave 'type' unititialized. Just ignore any bits we
+         * don't like. It's a just hint after all, and more
+         * useful for the kernel->userspace direction anyway.
+         */
+        out->type = in->type & DRM_MODE_TYPE_ALL;
         strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);
         out->name[DRM_DISPLAY_MODE_LEN-1] = 0;