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

Commit 41ee0cf8 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: reverse color component order for 16bits formats"

parents bca4c93b 3a2c57a2

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

+18 −18
Original line number Diff line number Diff line
@@ -263,109 +263,109 @@ static const struct sde_format sde_format_map[] = { 


	INTERLEAVED_RGB_FMT(RGB565,

		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(BGR565,

		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(ARGB1555,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(ABGR1555,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBA5551,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGRA5551,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(XRGB1555,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(XBGR1555,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBX5551,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGRX5551,

		COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(ARGB4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(ABGR4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBA4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGRA4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		true, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(XRGB4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(XBGR4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4,

		C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(RGBX4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),



	INTERLEAVED_RGB_FMT(BGRX4444,

		COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT,

		C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4,

		C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4,

		false, 2, 0,

		SDE_FETCH_LINEAR, 1),