2019-09-19 14:43:19 +00:00
|
|
|
From 6eb9a89c28590203658c0ebcbf29d5b41eb8596a Mon Sep 17 00:00:00 2001
|
2019-08-09 17:50:30 +00:00
|
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
|
|
|
Date: Tue, 23 Jul 2019 14:10:31 +0100
|
2019-09-19 14:43:19 +00:00
|
|
|
Subject: [PATCH 741/806] drm/modes: Don't apply cmdline's rotation if it
|
2019-08-09 17:50:30 +00:00
|
|
|
wasn't specified
|
|
|
|
|
|
|
|
|
|
Taken from the dri-devel mailing list (11/7/2019) to fixup the cmdline
|
|
|
|
|
parsing, but requires changes as things have moved between 4.19 and 5.2.
|
|
|
|
|
|
|
|
|
|
From: Dmitry Osipenko <digetx@gmail.com>
|
|
|
|
|
|
|
|
|
|
The rotation mode from cmdline shouldn't be taken into account if it
|
|
|
|
|
wasn't specified in the cmdline. This fixes ignored default display
|
|
|
|
|
orientation when display mode is given using cmdline without the
|
|
|
|
|
rotation being specified.
|
|
|
|
|
|
|
|
|
|
Fixes: 1bf4e09227c3 ("drm/modes: Allow to specify rotation and reflection on the commandline")
|
|
|
|
|
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
|
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/drm_fb_helper.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/drm_fb_helper.c
|
|
|
|
|
+++ b/drivers/gpu/drm/drm_fb_helper.c
|
|
|
|
|
@@ -2497,7 +2497,7 @@ static void drm_setup_crtc_rotation(stru
|
|
|
|
|
* simple XOR between the two handle the addition nicely.
|
|
|
|
|
*/
|
|
|
|
|
cmdline = &connector->cmdline_mode;
|
|
|
|
|
- if (cmdline->specified) {
|
|
|
|
|
+ if (cmdline->specified && cmdline->rotation_reflection) {
|
|
|
|
|
unsigned int cmdline_rest, panel_rest;
|
|
|
|
|
unsigned int cmdline_rot, panel_rot;
|
|
|
|
|
unsigned int sum_rot, sum_rest;
|
