target/linux/bcm27xx/patches-4.19/950-0694-drm-vc4-Fix-for-margins-in-composite-SDTV-mode-3223.patch

   1 From 1e37bc9f0ea83fa4b3f1714b4382edb7b256a251 Mon Sep 17 00:00:00 2001
   2 From: James Hughes <JamesH65@users.noreply.github.com>
   3 Date: Wed, 11 Sep 2019 14:57:18 +0100
   4 Subject: [PATCH] drm/vc4: Fix for margins in composite/SDTV mode
   5  (#3223)
   6
   7 Margins were incorrectly assumed to be setup in SDTV mode, but were
   8 not actually done, so this make the setup non-conditional on mode.
   9
  10 Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
  11 ---
  12  drivers/gpu/drm/vc4/vc4_firmware_kms.c | 11 +++--------
  13  1 file changed, 3 insertions(+), 8 deletions(-)
  14
  15 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
  16 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
  17 @@ -1588,14 +1588,9 @@ vc4_fkms_connector_init(struct drm_devic
  18                 connector->interlace_allowed = 0;
  19         }
  20
  21 -       /* Create and attach TV margin props to this connector.
  22 -        * Already done for SDTV outputs.
  23 -        */
  24 -       if (fkms_connector->display_type != DRM_MODE_ENCODER_TVDAC) {
  25 -               ret = drm_mode_create_tv_margin_properties(dev);
  26 -               if (ret)
  27 -                       goto fail;
  28 -       }
  29 +       ret = drm_mode_create_tv_margin_properties(dev);
  30 +       if (ret)
  31 +               goto fail;
  32
  33         drm_connector_attach_tv_margin_properties(connector);
  34