git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

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