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

Commit 8652d461 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: fix color component order in sde" into msm-4.9

parents afc16234 da476e13

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

+46 −46
Original line number Diff line number Diff line
@@ -134,217 +134,217 @@ struct sde_media_color_map { 
static const struct sde_format sde_format_map[] = {

	INTERLEAVED_RGB_FMT(ARGB8888,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		true, 4, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(ABGR8888,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		true, 4, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(XBGR8888,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		true, 4, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBA8888,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		true, 4, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGRA8888,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		true, 4, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGRX8888,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		false, 4, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(XRGB8888,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		false, 4, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBX8888,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		false, 4, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGB888,

		0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, 0, 3,

		C1_B_Cb, C0_G_Y, C2_R_Cr, 0, 3,

		false, 3, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGR888,

		0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, 0, 3,

		C2_R_Cr, C0_G_Y, C1_B_Cb, 0, 3,

		false, 3, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGB565,

		0, COLOR_5BIT, COLOR_6BIT, COLOR_5BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, 0, 3,

		C1_B_Cb, C0_G_Y, C2_R_Cr, 0, 3,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGR565,

		0, COLOR_5BIT, COLOR_6BIT, COLOR_5BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, 0, 3,

		C2_R_Cr, C0_G_Y, C1_B_Cb, 0, 3,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(ARGB1555,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(ABGR1555,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBA5551,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGRA5551,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(XRGB1555,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(XBGR1555,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBX5551,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGRX5551,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(ARGB4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(ABGR4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBA4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGRA4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(XRGB4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(XBGR4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBX4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGRX4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGRA1010102,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		true, 4, SDE_FORMAT_FLAG_DX,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBA1010102,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		true, 4, SDE_FORMAT_FLAG_DX,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(ABGR2101010,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		true, 4, SDE_FORMAT_FLAG_DX,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(ARGB2101010,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		true, 4, SDE_FORMAT_FLAG_DX,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(XRGB2101010,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		false, 4, SDE_FORMAT_FLAG_DX,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGRX1010102,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		false, 4, SDE_FORMAT_FLAG_DX,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(XBGR2101010,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		false, 4, SDE_FORMAT_FLAG_DX,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBX1010102,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		false, 4, SDE_FORMAT_FLAG_DX,

		SDE_FETCH_LINEAR, 1),
@@ -492,31 +492,31 @@ static const struct sde_format sde_format_map_tp10_tile[] = { 
 * the data will be passed by user-space.

 */

static const struct sde_format sde_format_map_ubwc[] = {

	INTERLEAVED_RGB_FMT(RGB565,

	INTERLEAVED_RGB_FMT(BGR565,

		0, COLOR_5BIT, COLOR_6BIT, COLOR_5BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, 0, 3,

		false, 2, SDE_FORMAT_FLAG_COMPRESSED,

		SDE_FETCH_UBWC, 2),



	INTERLEAVED_RGB_FMT(RGBA8888,

	INTERLEAVED_RGB_FMT(ABGR8888,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		true, 4, SDE_FORMAT_FLAG_COMPRESSED,

		SDE_FETCH_UBWC, 2),



	INTERLEAVED_RGB_FMT(RGBX8888,

	INTERLEAVED_RGB_FMT(XBGR8888,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		false, 4, SDE_FORMAT_FLAG_COMPRESSED,

		SDE_FETCH_UBWC, 2),



	INTERLEAVED_RGB_FMT(RGBA1010102,

	INTERLEAVED_RGB_FMT(ABGR2101010,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		true, 4, SDE_FORMAT_FLAG_DX | SDE_FORMAT_FLAG_COMPRESSED,

		SDE_FETCH_UBWC, 2),



	INTERLEAVED_RGB_FMT(RGBX1010102,

	INTERLEAVED_RGB_FMT(XBGR2101010,

		COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		true, 4, SDE_FORMAT_FLAG_DX | SDE_FORMAT_FLAG_COMPRESSED,
@@ -590,11 +590,11 @@ static void _sde_get_v_h_subsample_rate( 
static int _sde_format_get_media_color_ubwc(const struct sde_format *fmt)

{

	static const struct sde_media_color_map sde_media_ubwc_map[] = {

		{DRM_FORMAT_RGBA8888, COLOR_FMT_RGBA8888_UBWC},

		{DRM_FORMAT_RGBX8888, COLOR_FMT_RGBA8888_UBWC},

		{DRM_FORMAT_RGBA1010102, COLOR_FMT_RGBA1010102_UBWC},

		{DRM_FORMAT_RGBX1010102, COLOR_FMT_RGBA1010102_UBWC},

		{DRM_FORMAT_RGB565, COLOR_FMT_RGB565_UBWC},

		{DRM_FORMAT_ABGR8888, COLOR_FMT_RGBA8888_UBWC},

		{DRM_FORMAT_XBGR8888, 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},

	};

	int color_fmt = -1;

	int i;

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

+9 −9
Original line number Diff line number Diff line
@@ -16,17 +16,17 @@ static const struct sde_format_extended plane_formats[] = { 
	{DRM_FORMAT_ARGB8888, 0},

	{DRM_FORMAT_ABGR8888, 0},

	{DRM_FORMAT_RGBA8888, 0},

	{DRM_FORMAT_RGBA8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{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_RGBX8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_RGB888, 0},

	{DRM_FORMAT_BGR888, 0},

	{DRM_FORMAT_RGB565, 0},

	{DRM_FORMAT_RGB565, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_BGR565, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_BGR565, 0},

	{DRM_FORMAT_ARGB1555, 0},

	{DRM_FORMAT_ABGR1555, 0},
@@ -52,16 +52,16 @@ static const struct sde_format_extended plane_formats_yuv[] = { 
	{DRM_FORMAT_ABGR8888, 0},

	{DRM_FORMAT_RGBA8888, 0},

	{DRM_FORMAT_BGRX8888, 0},

	{DRM_FORMAT_RGBA8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{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_RGBX8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_RGB888, 0},

	{DRM_FORMAT_BGR888, 0},

	{DRM_FORMAT_RGB565, 0},

	{DRM_FORMAT_RGB565, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_BGR565, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_BGR565, 0},

	{DRM_FORMAT_ARGB1555, 0},

	{DRM_FORMAT_ABGR1555, 0},
@@ -113,14 +113,14 @@ static const struct sde_format_extended cursor_formats[] = { 


static const struct sde_format_extended wb2_formats[] = {

	{DRM_FORMAT_RGB565, 0},

	{DRM_FORMAT_RGB565, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_BGR565, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_RGB888, 0},

	{DRM_FORMAT_ARGB8888, 0},

	{DRM_FORMAT_RGBA8888, 0},

	{DRM_FORMAT_RGBA8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_XRGB8888, 0},

	{DRM_FORMAT_RGBX8888, 0},

	{DRM_FORMAT_RGBX8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_QCOM_COMPRESSED},

	{DRM_FORMAT_ARGB1555, 0},

	{DRM_FORMAT_RGBA5551, 0},

	{DRM_FORMAT_XRGB1555, 0},