diff --git a/drivers/drm/meson_fb.c b/drivers/drm/meson_fb.c index 7625114e0..0eacfb296 100644 --- a/drivers/drm/meson_fb.c +++ b/drivers/drm/meson_fb.c @@ -9,7 +9,7 @@ #include "meson_vpu.h" static const struct drm_format_info meson_formats[] = { - { .format = DRM_FORMAT_RGBA10101010, .depth = 40, .num_planes = 1, + { .format = DRM_FORMAT_ABGR10101010, .depth = 40, .num_planes = 1, .cpp = { 5, 0, 0 }, .hsub = 1, .vsub = 1, .has_alpha = true }, }; diff --git a/drivers/drm/meson_plane.c b/drivers/drm/meson_plane.c index 8d5621de3..60eed29df 100644 --- a/drivers/drm/meson_plane.c +++ b/drivers/drm/meson_plane.c @@ -158,11 +158,8 @@ u32 supported_drm_formats_v4[] = { /* default groups + 10101010 format for s7d*/ u32 supported_drm_formats_v5[] = { - DRM_FORMAT_RGBA10101010, - DRM_FORMAT_RGBA1010102, - DRM_FORMAT_ARGB2101010, + DRM_FORMAT_ABGR10101010, DRM_FORMAT_ABGR2101010, - DRM_FORMAT_BGRA1010102, DRM_FORMAT_XRGB8888, DRM_FORMAT_XBGR8888, DRM_FORMAT_RGBX8888, @@ -1030,8 +1027,7 @@ bool am_meson_vpu_check_format_mod(struct drm_plane *plane, case DRM_FORMAT_XBGR8888: case DRM_FORMAT_ABGR8888: case DRM_FORMAT_ABGR2101010: - case DRM_FORMAT_RGBA10101010: - case DRM_FORMAT_RGBA1010102: + case DRM_FORMAT_ABGR10101010: case DRM_FORMAT_RGBA8888: return true; case DRM_FORMAT_RGB888: diff --git a/drivers/drm/vpu-hw/meson_vpu_osd_mif.c b/drivers/drm/vpu-hw/meson_vpu_osd_mif.c index b039b6b71..b4f23779e 100644 --- a/drivers/drm/vpu-hw/meson_vpu_osd_mif.c +++ b/drivers/drm/vpu-hw/meson_vpu_osd_mif.c @@ -642,7 +642,7 @@ const struct meson_drm_format_info *__meson_drm_gfcd_format_info(u32 format) .gfcd_hw_blkmode_afbc = GFCD_AFBC_BLOCK_MODE_RGBA8888, .gfcd_hw_blkmode_afrc = GFCD_AFRC_BLOCK_MODE_RGBA8888, .alpha_replace = 0 }, - { .format = DRM_FORMAT_RGBA1010102, + { .format = DRM_FORMAT_ABGR2101010, .gfcd_hw_blkmode_afbc = GFCD_AFBC_BLOCK_MODE_RGBA1010102, .gfcd_hw_blkmode_afrc = BLOCK_MODE_RESERVED, .alpha_replace = 0 }, @@ -650,7 +650,7 @@ const struct meson_drm_format_info *__meson_drm_gfcd_format_info(u32 format) .gfcd_hw_blkmode_afbc = GFCD_AFBC_BLOCK_MODE_RGB888, .gfcd_hw_blkmode_afrc = BLOCK_MODE_RESERVED, .alpha_replace = 1 }, - { .format = DRM_FORMAT_RGBA10101010, + { .format = DRM_FORMAT_ABGR10101010, .gfcd_hw_blkmode_afbc = GFCD_AFBC_BLOCK_MODE_RGBA10101010, .gfcd_hw_blkmode_afrc = GFCD_AFRC_BLOCK_MODE_RGBA10101010, .alpha_replace = 0 }, diff --git a/include/uapi/amlogic/drm/meson_drm.h b/include/uapi/amlogic/drm/meson_drm.h index 311e6c91a..c9f89bf2a 100644 --- a/include/uapi/amlogic/drm/meson_drm.h +++ b/include/uapi/amlogic/drm/meson_drm.h @@ -28,7 +28,7 @@ #define MAX_VRR_MODE_GROUP 12 /* 40 bpp RGB */ -#define DRM_FORMAT_RGBA10101010 fourcc_code('A', 'B', '4', '0') +#define DRM_FORMAT_ABGR10101010 fourcc_code('A', 'B', '4', '0') /* [39:0] A:B:G:R 10:10:10:10 little endian */ /**