git.ipfire.org Git - thirdparty/openwrt.git/blob

   1 From 29f7f01091f9aaa6b0c45f5c2e3db1792d381e9d Mon Sep 17 00:00:00 2001
   2 From: Jan Kehren <jan.kehren@emteria.com>
   3 Date: Tue, 20 Aug 2024 08:16:06 +0000
   4 Subject: [PATCH 1224/1350] drm: rp1: rp1-vec: Add DRM_FORMAT_ARGB8888 and
   5  DRM_FORMAT_ABGR8888
   6
   7 Android requires this.
   8 As the underlying hardware doesn't support alpha blending,
   9 we ignore the alpha value.
  10
  11 Signed-off-by: Jan Kehren <jan.kehren@emteria.com>
  12 ---
  13  drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c    |  2 ++
  14  drivers/gpu/drm/rp1/rp1-vec/rp1_vec_hw.c | 12 ++++++++++++
  15  2 files changed, 14 insertions(+)
  16
  17 --- a/drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c
  18 +++ b/drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c
  19 @@ -420,6 +420,8 @@ static const struct drm_mode_config_func
  20  static const u32 rp1vec_formats[] = {
  21         DRM_FORMAT_XRGB8888,
  22         DRM_FORMAT_XBGR8888,
  23 +       DRM_FORMAT_ARGB8888,
  24 +       DRM_FORMAT_ABGR8888,
  25         DRM_FORMAT_RGB888,
  26         DRM_FORMAT_BGR888,
  27         DRM_FORMAT_RGB565
  28 --- a/drivers/gpu/drm/rp1/rp1-vec/rp1_vec_hw.c
  29 +++ b/drivers/gpu/drm/rp1/rp1-vec/rp1_vec_hw.c
  30 @@ -63,6 +63,18 @@ static const struct rp1vec_ipixfmt my_fo
  31                 .rgbsz  = BITS(VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1, 3),
  32         },
  33         {
  34 +               .format = DRM_FORMAT_ARGB8888,
  35 +               .mask   = MASK_RGB(0x3fc, 0x3fc, 0x3fc),
  36 +               .shift  = SHIFT_RGB(23, 15, 7),
  37 +               .rgbsz  = BITS(VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1, 3),
  38 +       },
  39 +       {
  40 +               .format = DRM_FORMAT_ABGR8888,
  41 +               .mask   = MASK_RGB(0x3fc, 0x3fc, 0x3fc),
  42 +               .shift  = SHIFT_RGB(7, 15, 23),
  43 +               .rgbsz  = BITS(VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1, 3),
  44 +       },
  45 +       {
  46                 .format = DRM_FORMAT_RGB888,
  47                 .mask   = MASK_RGB(0x3fc, 0x3fc, 0x3fc),
  48                 .shift  = SHIFT_RGB(23, 15, 7),