Commit d31ed58e authored by Hou Wenlong's avatar Hou Wenlong Committed by Alex Deucher
Browse files

drm/amd/display: Rename enum 'pixel_format' to 'dc_pixel_format' 



Rename the enum 'pixel_format' to 'dc_pixel_format' to avoid potential
name conflicts with the pixel_format struct defined in
include/video/pixel_format.h.

Signed-off-by: default avatarHou Wenlong <houwenlong.hwl@antgroup.com>
Reviewed-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7aaa09ab

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

+2 −2
Original line number Diff line number Diff line
@@ -749,10 +749,10 @@ struct clock_source *resource_find_used_clk_src_for_sharing( 
	return NULL;

}



static enum pixel_format convert_pixel_format_to_dalsurface(

static enum dc_pixel_format convert_pixel_format_to_dalsurface(

		enum surface_pixel_format surface_pixel_format)

{

	enum pixel_format dal_pixel_format = PIXEL_FORMAT_UNKNOWN;

	enum dc_pixel_format dal_pixel_format = PIXEL_FORMAT_UNKNOWN;



	switch (surface_pixel_format) {

	case SURFACE_PIXEL_FORMAT_GRPH_PALETA_256_COLORS:

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

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ enum surface_pixel_format { 




/* Pixel format */

enum pixel_format {

enum dc_pixel_format {

	/*graph*/

	PIXEL_FORMAT_UNINITIALIZED,

	PIXEL_FORMAT_INDEX8,

drivers/gpu/drm/amd/display/dc/dc_spl_translate.c

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ static void populate_inits_from_splinits(struct scl_inits *inits, 
	inits->h_c = dc_fixpt_from_int_dy(spl_inits->h_filter_init_int_c, spl_inits->h_filter_init_frac_c >> 5, 0, 19);

	inits->v_c = dc_fixpt_from_int_dy(spl_inits->v_filter_init_int_c, spl_inits->v_filter_init_frac_c >> 5, 0, 19);

}

static void populate_splformat_from_format(enum spl_pixel_format *spl_pixel_format, const enum pixel_format pixel_format)

static void populate_splformat_from_format(enum spl_pixel_format *spl_pixel_format,

					   const enum dc_pixel_format pixel_format)

{

	if (pixel_format < PIXEL_FORMAT_INVALID)

		*spl_pixel_format = (enum spl_pixel_format)pixel_format;

drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int dpp1_dscl_get_pixel_depth_val(enum lb_pixel_depth depth) 
	}

}



static bool dpp1_dscl_is_video_format(enum pixel_format format)

static bool dpp1_dscl_is_video_format(enum dc_pixel_format format)

{

	if (format >= PIXEL_FORMAT_VIDEO_BEGIN

			&& format <= PIXEL_FORMAT_VIDEO_END)
@@ -111,7 +111,7 @@ static bool dpp1_dscl_is_video_format(enum pixel_format format) 
		return false;

}



static bool dpp1_dscl_is_420_format(enum pixel_format format)

static bool dpp1_dscl_is_420_format(enum dc_pixel_format format)

{

	if (format == PIXEL_FORMAT_420BPP8 ||

			format == PIXEL_FORMAT_420BPP10)

drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int dpp401_dscl_get_pixel_depth_val(enum lb_pixel_depth depth) 
	}

}



static bool dpp401_dscl_is_video_format(enum pixel_format format)

static bool dpp401_dscl_is_video_format(enum dc_pixel_format format)

{

	if (format >= PIXEL_FORMAT_VIDEO_BEGIN

			&& format <= PIXEL_FORMAT_VIDEO_END)
@@ -103,7 +103,7 @@ static bool dpp401_dscl_is_video_format(enum pixel_format format) 
		return false;

}



static bool dpp401_dscl_is_420_format(enum pixel_format format)

static bool dpp401_dscl_is_420_format(enum dc_pixel_format format)

{

	if (format == PIXEL_FORMAT_420BPP8 ||

			format == PIXEL_FORMAT_420BPP10)