Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51f21bde authored by Ingrid Gallardo's avatar Ingrid Gallardo
Browse files

drm/msm/sde: cleanup sde hw formats parsing 



Simplify logic to parse the supported formats
for the different types of hw pipes.

Change-Id: I8e4783a4f85af111178cd26e86152e2378fbc77b
Signed-off-by: default avatarIngrid Gallardo <ingridg@codeaurora.org>
parent 7f9a1ea3

drivers/gpu/drm/msm/sde/sde_hw_catalog.c

+5 −33
Original line number Diff line number Diff line
@@ -3339,21 +3339,12 @@ static int sde_hardware_format_caps(struct sde_mdss_cfg *sde_cfg, 
	}



	dma_list_size = ARRAY_SIZE(plane_formats);

	vig_list_size = ARRAY_SIZE(plane_formats_yuv);

	virt_vig_list_size = ARRAY_SIZE(plane_formats);

	wb2_list_size = ARRAY_SIZE(wb2_formats);



	dma_list_size += ARRAY_SIZE(rgb_10bit_formats);

	vig_list_size += ARRAY_SIZE(rgb_10bit_formats)

		+ ARRAY_SIZE(tp10_ubwc_formats)

		+ ARRAY_SIZE(p010_formats);

	virt_vig_list_size += ARRAY_SIZE(rgb_10bit_formats);



	vig_list_size = ARRAY_SIZE(plane_formats_vig);

	if (sde_cfg->has_vig_p010)

		vig_list_size += ARRAY_SIZE(p010_ubwc_formats);

	virt_vig_list_size = ARRAY_SIZE(plane_formats);

	wb2_list_size = ARRAY_SIZE(wb2_formats);



	wb2_list_size += ARRAY_SIZE(rgb_10bit_formats)

		+ ARRAY_SIZE(tp10_ubwc_formats);



	sde_cfg->dma_formats = kcalloc(dma_list_size,

		sizeof(struct sde_format_extended), GFP_KERNEL);
@@ -3386,39 +3377,20 @@ static int sde_hardware_format_caps(struct sde_mdss_cfg *sde_cfg, 


	index = sde_copy_formats(sde_cfg->dma_formats, dma_list_size,

		0, plane_formats, ARRAY_SIZE(plane_formats));

	index += sde_copy_formats(sde_cfg->dma_formats, dma_list_size,

		index, rgb_10bit_formats,

		ARRAY_SIZE(rgb_10bit_formats));



	index = sde_copy_formats(sde_cfg->vig_formats, vig_list_size,

		0, plane_formats_yuv, ARRAY_SIZE(plane_formats_yuv));

	index += sde_copy_formats(sde_cfg->vig_formats, vig_list_size,

		index, rgb_10bit_formats,

		ARRAY_SIZE(rgb_10bit_formats));

	index += sde_copy_formats(sde_cfg->vig_formats, vig_list_size,

		index, p010_formats, ARRAY_SIZE(p010_formats));

		0, plane_formats_vig, ARRAY_SIZE(plane_formats_vig));

	if (sde_cfg->has_vig_p010)

		index += sde_copy_formats(sde_cfg->vig_formats,

			vig_list_size, index, p010_ubwc_formats,

			ARRAY_SIZE(p010_ubwc_formats));

	index += sde_copy_formats(sde_cfg->vig_formats, vig_list_size,

		index, tp10_ubwc_formats,

		ARRAY_SIZE(tp10_ubwc_formats));



	index = sde_copy_formats(sde_cfg->virt_vig_formats, virt_vig_list_size,

		0, plane_formats, ARRAY_SIZE(plane_formats));

	index += sde_copy_formats(sde_cfg->virt_vig_formats, virt_vig_list_size,

		index, rgb_10bit_formats,

		ARRAY_SIZE(rgb_10bit_formats));



	index = sde_copy_formats(sde_cfg->wb_formats, wb2_list_size,

		0, wb2_formats, ARRAY_SIZE(wb2_formats));

	index += sde_copy_formats(sde_cfg->wb_formats, wb2_list_size,

		index, rgb_10bit_formats,

		ARRAY_SIZE(rgb_10bit_formats));

	index += sde_copy_formats(sde_cfg->wb_formats, wb2_list_size,

		index, tp10_ubwc_formats,

		ARRAY_SIZE(tp10_ubwc_formats));



end:

	return rc;

}

drivers/gpu/drm/msm/sde/sde_hw_catalog_format.h

+61 −85
Original line number Diff line number Diff line
@@ -5,73 +5,63 @@ 


#include "sde_hw_mdss.h"



#define RGB_10BIT_FMTS	{DRM_FORMAT_BGRA1010102, 0}, \

	{DRM_FORMAT_BGRX1010102, 0}, \

	{DRM_FORMAT_RGBA1010102, 0}, \

	{DRM_FORMAT_RGBX1010102, 0}, \

	{DRM_FORMAT_ABGR2101010, 0}, \

	{DRM_FORMAT_ABGR2101010, DRM_FORMAT_MOD_QCOM_COMPRESSED}, \

	{DRM_FORMAT_XBGR2101010, 0}, \

	{DRM_FORMAT_XBGR2101010, DRM_FORMAT_MOD_QCOM_COMPRESSED}, \

	{DRM_FORMAT_ARGB2101010, 0}, \

	{DRM_FORMAT_XRGB2101010, 0}



#define RGB_FMTS	{DRM_FORMAT_ARGB8888, 0}, \

	{DRM_FORMAT_ABGR8888, 0}, \

	{DRM_FORMAT_RGBA8888, 0}, \

	{DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_QCOM_COMPRESSED}, \

	{DRM_FORMAT_BGRA8888, 0}, \

	{DRM_FORMAT_XRGB8888, 0}, \

	{DRM_FORMAT_RGBX8888, 0}, \

	{DRM_FORMAT_BGRX8888, 0}, \

	{DRM_FORMAT_XBGR8888, 0}, \

	{DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_QCOM_COMPRESSED}, \

	{DRM_FORMAT_RGB888, 0}, \

	{DRM_FORMAT_BGR888, 0}, \

	{DRM_FORMAT_RGB565, 0}, \

	{DRM_FORMAT_BGR565, DRM_FORMAT_MOD_QCOM_COMPRESSED}, \

	{DRM_FORMAT_BGR565, 0}, \

	{DRM_FORMAT_ARGB1555, 0}, \

	{DRM_FORMAT_ABGR1555, 0}, \

	{DRM_FORMAT_RGBA5551, 0}, \

	{DRM_FORMAT_BGRA5551, 0}, \

	{DRM_FORMAT_XRGB1555, 0}, \

	{DRM_FORMAT_XBGR1555, 0}, \

	{DRM_FORMAT_RGBX5551, 0}, \

	{DRM_FORMAT_BGRX5551, 0}, \

	{DRM_FORMAT_ARGB4444, 0}, \

	{DRM_FORMAT_ABGR4444, 0}, \

	{DRM_FORMAT_RGBA4444, 0}, \

	{DRM_FORMAT_BGRA4444, 0}, \

	{DRM_FORMAT_XRGB4444, 0}, \

	{DRM_FORMAT_XBGR4444, 0}, \

	{DRM_FORMAT_RGBX4444, 0}, \

	{DRM_FORMAT_BGRX4444, 0}



#define TP10_UBWC_FMTS	{DRM_FORMAT_NV12, DRM_FORMAT_MOD_QCOM_COMPRESSED | \

		DRM_FORMAT_MOD_QCOM_DX | DRM_FORMAT_MOD_QCOM_TIGHT}



#define P010_FMTS	{DRM_FORMAT_NV12, DRM_FORMAT_MOD_QCOM_DX}





static const struct sde_format_extended plane_formats[] = {

	{DRM_FORMAT_ARGB8888, 0},

	{DRM_FORMAT_ABGR8888, 0},

	{DRM_FORMAT_RGBA8888, 0},

	{DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_BGRA8888, 0},

	{DRM_FORMAT_XRGB8888, 0},

	{DRM_FORMAT_RGBX8888, 0},

	{DRM_FORMAT_BGRX8888, 0},

	{DRM_FORMAT_XBGR8888, 0},

	{DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_RGB888, 0},

	{DRM_FORMAT_BGR888, 0},

	{DRM_FORMAT_RGB565, 0},

	{DRM_FORMAT_BGR565, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_BGR565, 0},

	{DRM_FORMAT_ARGB1555, 0},

	{DRM_FORMAT_ABGR1555, 0},

	{DRM_FORMAT_RGBA5551, 0},

	{DRM_FORMAT_BGRA5551, 0},

	{DRM_FORMAT_XRGB1555, 0},

	{DRM_FORMAT_XBGR1555, 0},

	{DRM_FORMAT_RGBX5551, 0},

	{DRM_FORMAT_BGRX5551, 0},

	{DRM_FORMAT_ARGB4444, 0},

	{DRM_FORMAT_ABGR4444, 0},

	{DRM_FORMAT_RGBA4444, 0},

	{DRM_FORMAT_BGRA4444, 0},

	{DRM_FORMAT_XRGB4444, 0},

	{DRM_FORMAT_XBGR4444, 0},

	{DRM_FORMAT_RGBX4444, 0},

	{DRM_FORMAT_BGRX4444, 0},

	RGB_FMTS,

	RGB_10BIT_FMTS,

	{0, 0},

};



static const struct sde_format_extended plane_formats_yuv[] = {

	{DRM_FORMAT_ARGB8888, 0},

	{DRM_FORMAT_ABGR8888, 0},

	{DRM_FORMAT_RGBA8888, 0},

	{DRM_FORMAT_BGRX8888, 0},

	{DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_BGRA8888, 0},

	{DRM_FORMAT_XRGB8888, 0},

	{DRM_FORMAT_XBGR8888, 0},

	{DRM_FORMAT_RGBX8888, 0},

	{DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_RGB888, 0},

	{DRM_FORMAT_BGR888, 0},

	{DRM_FORMAT_RGB565, 0},

	{DRM_FORMAT_BGR565, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_BGR565, 0},

	{DRM_FORMAT_ARGB1555, 0},

	{DRM_FORMAT_ABGR1555, 0},

	{DRM_FORMAT_RGBA5551, 0},

	{DRM_FORMAT_BGRA5551, 0},

	{DRM_FORMAT_XRGB1555, 0},

	{DRM_FORMAT_XBGR1555, 0},

	{DRM_FORMAT_RGBX5551, 0},

	{DRM_FORMAT_BGRX5551, 0},

	{DRM_FORMAT_ARGB4444, 0},

	{DRM_FORMAT_ABGR4444, 0},

	{DRM_FORMAT_RGBA4444, 0},

	{DRM_FORMAT_BGRA4444, 0},

	{DRM_FORMAT_XRGB4444, 0},

	{DRM_FORMAT_XBGR4444, 0},

	{DRM_FORMAT_RGBX4444, 0},

	{DRM_FORMAT_BGRX4444, 0},

static const struct sde_format_extended plane_formats_vig[] = {

	RGB_FMTS,



	{DRM_FORMAT_NV12, 0},

	{DRM_FORMAT_NV12, DRM_FORMAT_MOD_QCOM_COMPRESSED},
@@ -84,6 +74,11 @@ static const struct sde_format_extended plane_formats_yuv[] = { 
	{DRM_FORMAT_YVYU, 0},

	{DRM_FORMAT_YUV420, 0},

	{DRM_FORMAT_YVU420, 0},



	RGB_10BIT_FMTS,

	TP10_UBWC_FMTS,

	P010_FMTS,



	{0, 0},

};
@@ -144,32 +139,13 @@ static const struct sde_format_extended wb2_formats[] = { 
	{DRM_FORMAT_NV16, 0},

	{DRM_FORMAT_YUYV, 0},



	{0, 0},

};

	RGB_10BIT_FMTS,

	TP10_UBWC_FMTS,



static const struct sde_format_extended rgb_10bit_formats[] = {

	{DRM_FORMAT_BGRA1010102, 0},

	{DRM_FORMAT_BGRX1010102, 0},

	{DRM_FORMAT_RGBA1010102, 0},

	{DRM_FORMAT_RGBX1010102, 0},

	{DRM_FORMAT_ABGR2101010, 0},

	{DRM_FORMAT_ABGR2101010, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_XBGR2101010, 0},

	{DRM_FORMAT_XBGR2101010, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_ARGB2101010, 0},

	{DRM_FORMAT_XRGB2101010, 0},

};



static const struct sde_format_extended p010_formats[] = {

	{DRM_FORMAT_NV12, DRM_FORMAT_MOD_QCOM_DX},

	{0, 0},

};



static const struct sde_format_extended p010_ubwc_formats[] = {

	{DRM_FORMAT_NV12, DRM_FORMAT_MOD_QCOM_DX |

		DRM_FORMAT_MOD_QCOM_COMPRESSED},

};
 


static const struct sde_format_extended tp10_ubwc_formats[] = {

	{DRM_FORMAT_NV12, DRM_FORMAT_MOD_QCOM_COMPRESSED |

		DRM_FORMAT_MOD_QCOM_DX | DRM_FORMAT_MOD_QCOM_TIGHT},

};