target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch

   1 From cc6f4a74861a987e8d95aa36f2d141c777e30425 Mon Sep 17 00:00:00 2001
   2 From: Daniel Stone <daniels@collabora.com>
   3 Date: Tue, 8 Aug 2017 17:44:48 +0100
   4 Subject: [PATCH 354/454] drm/vc4: Advertise supported modifiers for planes
   5
   6 The IN_FORMATS blob allows the kernel to advertise to userspace which
   7 format/modifier combinations are supported, per plane. Use this to
   8 advertise that we support both T_TILED and linear.
   9
  10 v2:
  11   - Only advertise T_TILED for RGB (Eric)
  12   - Actually turn on allow_fb_modifiers (Eric)
  13
  14 Signed-off-by: Daniel Stone <daniels@collabora.com>
  15 Signed-off-by: Eric Anholt <eric@anholt.net>
  16 Reviewed-by: Eric Anholt <eric@anholt.net>
  17 Link: https://patchwork.freedesktop.org/patch/170828/
  18 (cherry picked from commit 423ad7b3cbd1158d080e20119a7a5f93a085a486)
  19 ---
  20  drivers/gpu/drm/vc4/vc4_kms.c   |  1 +
  21  drivers/gpu/drm/vc4/vc4_plane.c | 34 ++++++++++++++++++++++++++++++++-
  22  2 files changed, 34 insertions(+), 1 deletion(-)
  23
  24 --- a/drivers/gpu/drm/vc4/vc4_kms.c
  25 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
  26 @@ -222,6 +222,7 @@ int vc4_kms_load(struct drm_device *dev)
  27         dev->mode_config.funcs = &vc4_mode_funcs;
  28         dev->mode_config.preferred_depth = 24;
  29         dev->mode_config.async_page_flip = true;
  30 +       dev->mode_config.allow_fb_modifiers = true;
  31
  32         drm_mode_config_reset(dev);
  33
  34 --- a/drivers/gpu/drm/vc4/vc4_plane.c
  35 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
  36 @@ -867,6 +867,32 @@ out:
  37                                               ctx);
  38  }
  39
  40 +static bool vc4_format_mod_supported(struct drm_plane *plane,
  41 +                                    uint32_t format,
  42 +                                    uint64_t modifier)
  43 +{
  44 +       /* Support T_TILING for RGB formats only. */
  45 +       switch (format) {
  46 +       case DRM_FORMAT_XRGB8888:
  47 +       case DRM_FORMAT_ARGB8888:
  48 +       case DRM_FORMAT_ABGR8888:
  49 +       case DRM_FORMAT_XBGR8888:
  50 +       case DRM_FORMAT_RGB565:
  51 +       case DRM_FORMAT_BGR565:
  52 +       case DRM_FORMAT_ARGB1555:
  53 +       case DRM_FORMAT_XRGB1555:
  54 +               return true;
  55 +       case DRM_FORMAT_YUV422:
  56 +       case DRM_FORMAT_YVU422:
  57 +       case DRM_FORMAT_YUV420:
  58 +       case DRM_FORMAT_YVU420:
  59 +       case DRM_FORMAT_NV12:
  60 +       case DRM_FORMAT_NV16:
  61 +       default:
  62 +               return (modifier == DRM_FORMAT_MOD_LINEAR);
  63 +       }
  64 +}
  65 +
  66  static const struct drm_plane_funcs vc4_plane_funcs = {
  67         .update_plane = vc4_update_plane,
  68         .disable_plane = drm_atomic_helper_disable_plane,
  69 @@ -875,6 +901,7 @@ static const struct drm_plane_funcs vc4_
  70         .reset = vc4_plane_reset,
  71         .atomic_duplicate_state = vc4_plane_duplicate_state,
  72         .atomic_destroy_state = vc4_plane_destroy_state,
  73 +       .format_mod_supported = vc4_format_mod_supported,
  74  };
  75
  76  struct drm_plane *vc4_plane_init(struct drm_device *dev,
  77 @@ -886,6 +913,11 @@ struct drm_plane *vc4_plane_init(struct
  78         u32 num_formats = 0;
  79         int ret = 0;
  80         unsigned i;
  81 +       static const uint64_t modifiers[] = {
  82 +               DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
  83 +               DRM_FORMAT_MOD_LINEAR,
  84 +               DRM_FORMAT_MOD_INVALID
  85 +       };
  86
  87         vc4_plane = devm_kzalloc(dev->dev, sizeof(*vc4_plane),
  88                                  GFP_KERNEL);
  89 @@ -906,7 +938,7 @@ struct drm_plane *vc4_plane_init(struct
  90         ret = drm_universal_plane_init(dev, plane, 0,
  91                                        &vc4_plane_funcs,
  92                                        formats, num_formats,
  93 -                                      NULL, type, NULL);
  94 +                                      modifiers, type, NULL);
  95
  96         drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
  97