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

   1 From e229805297bd5ff53b5fc63d08c5f37c2404c2d6 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Mon, 6 Jun 2022 12:23:28 +0100
   4 Subject: [PATCH] drm: vc4: Omit pixel_order from the hvs_format for
   5  hvs5 only formats
   6
   7 pixel_order is used for the earlier versions of the HVS, so is
   8 redundant on the 10:10:10:2 and 10bit YUV formats that are only
   9 supported on HVS5.
  10 Remove the assignment from the table to avoid confusion.
  11
  12 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  13 ---
  14  drivers/gpu/drm/vc4/vc4_plane.c | 5 -----
  15  1 file changed, 5 deletions(-)
  16
  17 --- a/drivers/gpu/drm/vc4/vc4_plane.c
  18 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
  19 @@ -148,35 +148,30 @@ static const struct hvs_format {
  20         {
  21                 .drm = DRM_FORMAT_P030,
  22                 .hvs = HVS_PIXEL_FORMAT_YCBCR_10BIT,
  23 -               .pixel_order = HVS_PIXEL_ORDER_XYCBCR,
  24                 .pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCBCR,
  25                 .hvs5_only = true,
  26         },
  27         {
  28                 .drm = DRM_FORMAT_XRGB2101010,
  29                 .hvs = HVS_PIXEL_FORMAT_RGBA1010102,
  30 -               .pixel_order = HVS_PIXEL_ORDER_ABGR,
  31                 .pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
  32                 .hvs5_only = true,
  33         },
  34         {
  35                 .drm = DRM_FORMAT_ARGB2101010,
  36                 .hvs = HVS_PIXEL_FORMAT_RGBA1010102,
  37 -               .pixel_order = HVS_PIXEL_ORDER_ABGR,
  38                 .pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
  39                 .hvs5_only = true,
  40         },
  41         {
  42                 .drm = DRM_FORMAT_ABGR2101010,
  43                 .hvs = HVS_PIXEL_FORMAT_RGBA1010102,
  44 -               .pixel_order = HVS_PIXEL_ORDER_ARGB,
  45                 .pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
  46                 .hvs5_only = true,
  47         },
  48         {
  49                 .drm = DRM_FORMAT_XBGR2101010,
  50                 .hvs = HVS_PIXEL_FORMAT_RGBA1010102,
  51 -               .pixel_order = HVS_PIXEL_ORDER_ARGB,
  52                 .pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
  53                 .hvs5_only = true,
  54         },