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

   1 From 2f04da8b66d1124c4cf9c1fd9733821801a01a5d Mon Sep 17 00:00:00 2001
   2 From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
   3 Date: Thu, 15 Jul 2021 01:08:11 +0200
   4 Subject: [PATCH 0012/1085] drm/vc4: Make VEC progressive modes readily
   5  accessible
   6
   7 Add predefined modelines for the 240p (NTSC) and 288p (PAL) progressive
   8 modes, and report them through vc4_vec_connector_get_modes().
   9
  10 Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
  11 ---
  12  drivers/gpu/drm/vc4/vc4_vec.c | 36 ++++++++++++++++++++++++++++++++++-
  13  1 file changed, 35 insertions(+), 1 deletion(-)
  14
  15 --- a/drivers/gpu/drm/vc4/vc4_vec.c
  16 +++ b/drivers/gpu/drm/vc4/vc4_vec.c
  17 @@ -273,6 +273,18 @@ static const struct debugfs_reg32 vec_re
  18         VC4_REG32(VEC_DAC_MISC),
  19  };
  20
  21 +static const struct drm_display_mode drm_mode_240p = {
  22 +       DRM_MODE("720x240", DRM_MODE_TYPE_DRIVER, 13500,
  23 +                720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0,
  24 +                240, 240 + 3, 240 + 3 + 3, 262, 0, 0)
  25 +};
  26 +
  27 +static const struct drm_display_mode drm_mode_288p = {
  28 +       DRM_MODE("720x288", DRM_MODE_TYPE_DRIVER, 13500,
  29 +                720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0,
  30 +                288, 288 + 2, 288 + 2 + 3, 312, 0, 0)
  31 +};
  32 +
  33  static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = {
  34         {
  35                 .mode = DRM_MODE_TV_MODE_NTSC,
  36 @@ -507,9 +519,31 @@ static const struct drm_connector_funcs
  37         .atomic_set_property = vc4_vec_connector_set_property,
  38  };
  39
  40 +static int vc4_vec_connector_get_modes(struct drm_connector *connector)
  41 +{
  42 +       struct drm_display_mode *mode;
  43 +       int count = drm_connector_helper_tv_get_modes(connector);
  44 +
  45 +       mode = drm_mode_duplicate(connector->dev, &drm_mode_240p);
  46 +       if (!mode)
  47 +               return -ENOMEM;
  48 +
  49 +       drm_mode_probed_add(connector, mode);
  50 +       count++;
  51 +
  52 +       mode = drm_mode_duplicate(connector->dev, &drm_mode_288p);
  53 +       if (!mode)
  54 +               return -ENOMEM;
  55 +
  56 +       drm_mode_probed_add(connector, mode);
  57 +       count++;
  58 +
  59 +       return count;
  60 +}
  61 +
  62  static const struct drm_connector_helper_funcs vc4_vec_connector_helper_funcs = {
  63         .atomic_check = drm_atomic_helper_connector_tv_check,
  64 -       .get_modes = drm_connector_helper_tv_get_modes,
  65 +       .get_modes = vc4_vec_connector_get_modes,
  66  };
  67
  68  static int vc4_vec_connector_init(struct drm_device *dev, struct vc4_vec *vec)