Skip to content

Commit fdf35a6

Browse files
tiwaivsyrjala
authored andcommitted
drm: Fix broken VT switch with video=1366x768 option
I noticed that the VT switch doesn't work any longer with a Dell laptop with 1366x768 eDP when the machine is connected with a DP monitor. It behaves as if VT were switched, but the graphics remain frozen. Actually the keyboard works, so I could switch back to VT7 again. I tried to track down the problem, and encountered a long story until we reach to this error: - The machine is booted with video=1366x768 option (the distro installer seems to add it as default). - Recently, drm_helper_probe_single_connector_modes() deals with cmdline modes, and it tries to create a new mode when no matching mode is found. - The drm_mode_create_from_cmdline_mode() creates a mode based on either CVT of GFT according to the given cmdline mode; in our case, it's 1366x768. - Since both CVT and GFT can't express the width 1366 due to alignment, the resultant mode becomes 1368x768, slightly larger than the given size. - Later on, the atomic commit is performed, and in drm_atomic_check_only(), the size of each plane is checked. - The size check of 1366x768 fails due to the above, and eventually the whole VT switch fails. Back in the history, we've had a manual fix-up of 1368x768 in various places via c09dedb ("drm/edid: Add a workaround for 1366x768 HD panel"), but they have been all in drm_edid.c at probing the modes from EDID. For addressing the problem above, we need a similar hack to the mode newly created from cmdline, manually adjusting the width when the expected size is 1366 while we get 1368 instead. Fixes: eaf99c7 ("drm: Perform cmdline mode parsing during...") Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]>
1 parent 68f458e commit fdf35a6

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

drivers/gpu/drm/drm_modes.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,6 +1460,13 @@ drm_mode_create_from_cmdline_mode(struct drm_device *dev,
14601460
return NULL;
14611461

14621462
mode->type |= DRM_MODE_TYPE_USERDEF;
1463+
/* fix up 1368x768: GFT/CVT can't express 1366 width due to alignment */
1464+
if (cmd->xres == 1366 && mode->hdisplay == 1368) {
1465+
mode->hdisplay = 1366;
1466+
mode->hsync_start--;
1467+
mode->hsync_end--;
1468+
drm_mode_set_name(mode);
1469+
}
14631470
drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
14641471
return mode;
14651472
}

0 commit comments

Comments
 (0)