Skip to contentSkip to conversation

drm/msm/dpu: Add UBWC support for RGB8888 formats

PATCH In review Fritz Koenig 4 participants 4 messages Nov 6, 2019 – Nov 7, 2019 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/msm/dpu: Add UBWC support for RGB8888 formats

Hardware only natively supports BGR8888 UBWC.
UBWC support for RGB8888 can be had by pretending
that the buffer is BGR.

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c    | 18 ++++++++++++++++++
 .../drm/msm/disp/dpu1/dpu_hw_catalog_format.h  |  2 ++
 2 files changed, 20 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c +18 -0
index 24ab6249083a..528632690f1e 100644
@@ -489,12 +489,28 @@ static const struct dpu_format dpu_format_map_ubwc[] = {
 		true, 4, DPU_FORMAT_FLAG_COMPRESSED,
 		DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC),
 
+	/* ARGB8888 and ABGR8888 purposely have the same color
+	 * ordering.  The hardware only supports ABGR8888 UBWC
+	 * natively.
+	 */
+	INTERLEAVED_RGB_FMT_TILED(ARGB8888,
+		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,
+		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
+		true, 4, DPU_FORMAT_FLAG_COMPRESSED,
+		DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC),
+
 	INTERLEAVED_RGB_FMT_TILED(XBGR8888,
 		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,
 		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
 		false, 4, DPU_FORMAT_FLAG_COMPRESSED,
 		DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC),
 
+	INTERLEAVED_RGB_FMT_TILED(XRGB8888,
+		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,
+		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
+		false, 4, DPU_FORMAT_FLAG_COMPRESSED,
+		DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC),
+
 	INTERLEAVED_RGB_FMT_TILED(ABGR2101010,
 		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,
 		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
@@ -550,7 +566,9 @@ static int _dpu_format_get_media_color_ubwc(const struct dpu_format *fmt)
 {
 	static const struct dpu_media_color_map dpu_media_ubwc_map[] = {
 		{DRM_FORMAT_ABGR8888, COLOR_FMT_RGBA8888_UBWC},
+		{DRM_FORMAT_ARGB8888, COLOR_FMT_RGBA8888_UBWC},
 		{DRM_FORMAT_XBGR8888, COLOR_FMT_RGBA8888_UBWC},
+		{DRM_FORMAT_XRGB8888, COLOR_FMT_RGBA8888_UBWC},
 		{DRM_FORMAT_ABGR2101010, COLOR_FMT_RGBA1010102_UBWC},
 		{DRM_FORMAT_XBGR2101010, COLOR_FMT_RGBA1010102_UBWC},
 		{DRM_FORMAT_BGR565, COLOR_FMT_RGB565_UBWC},
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h +2 -0
index bb6112c949ae..fbcb3c4bbfee 100644
@@ -6,7 +6,9 @@
 
 static const uint32_t qcom_compressed_supported_formats[] = {
 	DRM_FORMAT_ABGR8888,
+	DRM_FORMAT_ARGB8888,
 	DRM_FORMAT_XBGR8888,
+	DRM_FORMAT_XRGB8888,
 	DRM_FORMAT_BGR565,
 };
 
Signature · 6 lines
2.24.0.432.g9d3f5f5b63-goog

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Fritz Koenig

Hardware only natively supports BGR8888 UBWC.
UBWC support for RGB8888 can be had by pretending
that the buffer is BGR.

Just to expand, this aligns with how we handle RGB component order in mesa for tiled or tiled+ubwc. If uncompressed to linear the component order is RGB, but in tiled or tiled+ubwc, the component order is always the hw "native" order (BGR) regardless of what the outside world thinks. But that detail kinda doesn't matter, it's not like generic code is going to understand the tiled or tiled+ubwc format in the first place.. and code that does understand it, knows enough to know that tiled/tiled+ubwc is always in the native component order.

Quoted 1 line
Quoted 63 lines
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c    | 18 ++++++++++++++++++
 .../drm/msm/disp/dpu1/dpu_hw_catalog_format.h  |  2 ++
 2 files changed, 20 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c +18 -0
index 24ab6249083a..528632690f1e 100644
@@ -489,12 +489,28 @@ static const struct dpu_format dpu_format_map_ubwc[] = {
                true, 4, DPU_FORMAT_FLAG_COMPRESSED,
                DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC),
 
+       /* ARGB8888 and ABGR8888 purposely have the same color
+        * ordering.  The hardware only supports ABGR8888 UBWC
+        * natively.
+        */
+       INTERLEAVED_RGB_FMT_TILED(ARGB8888,
+               COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,
+               C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
+               true, 4, DPU_FORMAT_FLAG_COMPRESSED,
+               DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC),
+
        INTERLEAVED_RGB_FMT_TILED(XBGR8888,
                COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,
                C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
                false, 4, DPU_FORMAT_FLAG_COMPRESSED,
                DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC),
 
+       INTERLEAVED_RGB_FMT_TILED(XRGB8888,
+               COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,
+               C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
+               false, 4, DPU_FORMAT_FLAG_COMPRESSED,
+               DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC),
+
        INTERLEAVED_RGB_FMT_TILED(ABGR2101010,
                COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,
                C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,
@@ -550,7 +566,9 @@ static int _dpu_format_get_media_color_ubwc(const struct dpu_format *fmt)
 {
        static const struct dpu_media_color_map dpu_media_ubwc_map[] = {
                {DRM_FORMAT_ABGR8888, COLOR_FMT_RGBA8888_UBWC},
+               {DRM_FORMAT_ARGB8888, COLOR_FMT_RGBA8888_UBWC},
                {DRM_FORMAT_XBGR8888, COLOR_FMT_RGBA8888_UBWC},
+               {DRM_FORMAT_XRGB8888, COLOR_FMT_RGBA8888_UBWC},
                {DRM_FORMAT_ABGR2101010, COLOR_FMT_RGBA1010102_UBWC},
                {DRM_FORMAT_XBGR2101010, COLOR_FMT_RGBA1010102_UBWC},
                {DRM_FORMAT_BGR565, COLOR_FMT_RGB565_UBWC},
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h +2 -1
index bb6112c949ae..fbcb3c4bbfee 100644
@@ -6,7 +6,9 @@
 
 static const uint32_t qcom_compressed_supported_formats[] = {
        DRM_FORMAT_ABGR8888,
+       DRM_FORMAT_ARGB8888,
        DRM_FORMAT_XBGR8888,
+       DRM_FORMAT_XRGB8888,
        DRM_FORMAT_BGR565,
 };
 
--
Quoted 2 lines

2.24.0.432.g9d3f5f5b63-goog

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reviewed-by
#2 lore raw
Quoted 15 lines · Rob Clark
Quoted 4 lines · Fritz Koenig

Hardware only natively supports BGR8888 UBWC.
UBWC support for RGB8888 can be had by pretending
that the buffer is BGR.

Just to expand, this aligns with how we handle RGB component order in mesa for tiled or tiled+ubwc. If uncompressed to linear the component order is RGB, but in tiled or tiled+ubwc, the component order is always the hw "native" order (BGR) regardless of what the outside world thinks. But that detail kinda doesn't matter, it's not like generic code is going to understand the tiled or tiled+ubwc format in the first place.. and code that does understand it, knows enough to know that tiled/tiled+ubwc is always in the native component order.

Quoted 3 lines
Quoted 1 line

Seems like a reasonable workaround to me, and permissible by our fourcc modifier rules ("you just have to have one way to address the pixels given a fourcc and a modifier").

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

A message that is not in the archive (sent off-list or not yet received): [email protected]

Acked-by
#4 lore raw
Quoted 16 lines · Eric Anholt
Quoted 15 lines · Rob Clark
Quoted 4 lines · Fritz Koenig

Hardware only natively supports BGR8888 UBWC.
UBWC support for RGB8888 can be had by pretending
that the buffer is BGR.

Just to expand, this aligns with how we handle RGB component order in mesa for tiled or tiled+ubwc. If uncompressed to linear the component order is RGB, but in tiled or tiled+ubwc, the component order is always the hw "native" order (BGR) regardless of what the outside world thinks. But that detail kinda doesn't matter, it's not like generic code is going to understand the tiled or tiled+ubwc format in the first place.. and code that does understand it, knows enough to know that tiled/tiled+ubwc is always in the native component order.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Seems like a reasonable workaround to me, and permissible by our fourcc modifier rules ("you just have to have one way to address the pixels given a fourcc and a modifier").

Yeah we have some other aliasing going on already I think. And since for interopt you just need to pick matching (fourcc, modifier) pairs worst case that means drivers need to add a bunch of dummies/duplicates. Like we do here.

Cheers, Daniel

Quoted 9 lines

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno