Commit 8693049a authored by Tony Cheng's avatar Tony Cheng Committed by Alex Deucher
Browse files

drm/amd/display: rename BGRA8888 to ABGR8888 



DC actually support ABGR8888 instead of BGRA8888 (R/B swap rather than endian swap) ,
rename to avoid confusion

Signed-off-by: default avatarTony Cheng <tony.cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Reviewed-by: default avatarYongqiang Sun <yongqiang.sun@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 031ec276

drivers/gpu/drm/amd/display/dc/calcs/bandwidth_calcs.c

+2 −2
Original line number Diff line number Diff line
@@ -2530,7 +2530,7 @@ static void populate_initial_data( 
			data->bytes_per_pixel[num_displays + 4] = 2;

			break;

		case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:

		case SURFACE_PIXEL_FORMAT_GRPH_BGRA8888:

		case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:

		case SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010:

		case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010:

		case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010_XR_BIAS:
@@ -2626,7 +2626,7 @@ static void populate_initial_data( 
				data->bytes_per_pixel[num_displays + 4] = 2;

				break;

			case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:

			case SURFACE_PIXEL_FORMAT_GRPH_BGRA8888:

			case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:

			case SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010:

			case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010:

			case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010_XR_BIAS:

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static enum pixel_format convert_pixel_format_to_dalsurface( 
	case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:

		dal_pixel_format = PIXEL_FORMAT_ARGB8888;

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_BGRA8888:

	case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:

		dal_pixel_format = PIXEL_FORMAT_ARGB8888;

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010:

drivers/gpu/drm/amd/display/dc/dc_hw_types.h

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ enum surface_pixel_format { 
	/*32 bpp*/

	SURFACE_PIXEL_FORMAT_GRPH_ARGB8888,

	/*32 bpp swaped*/

	SURFACE_PIXEL_FORMAT_GRPH_BGRA8888,

	SURFACE_PIXEL_FORMAT_GRPH_ABGR8888,



	SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010,

	/*swaped*/

drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c

+2 −2
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static void program_grph_pixel_format( 
	uint32_t grph_depth, grph_format;

	uint32_t sign = 0, floating = 0;



	if (format == SURFACE_PIXEL_FORMAT_GRPH_BGRA8888 ||

	if (format == SURFACE_PIXEL_FORMAT_GRPH_ABGR8888 ||

			/*todo: doesn't look like we handle BGRA here,

			 *  should problem swap endian*/

		format == SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010 ||
@@ -331,7 +331,7 @@ static void program_grph_pixel_format( 
		grph_format = 1;

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:

	case SURFACE_PIXEL_FORMAT_GRPH_BGRA8888:

	case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:

		grph_depth = 2;

		grph_format = 0;

		break;

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static void build_prescale_params(struct ipp_prescale_params *prescale_params, 


	switch (surface->public.format) {

	case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:

	case SURFACE_PIXEL_FORMAT_GRPH_BGRA8888:

	case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:

		prescale_params->scale = 0x2020;

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010:

CRA Git | Maintained and supported by SUSTech CRA and CCSE