Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Hou Wenlong <houwenlong.hwl@antgroup.com>
Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Hou Wenlong and committed by
Alex Deucher
d31ed58e 7aaa09ab

+11 -10
+2 -2
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
··· 749 749 return NULL; 750 750 } 751 751 752 - static enum pixel_format convert_pixel_format_to_dalsurface( 752 + static enum dc_pixel_format convert_pixel_format_to_dalsurface( 753 753 enum surface_pixel_format surface_pixel_format) 754 754 { 755 - enum pixel_format dal_pixel_format = PIXEL_FORMAT_UNKNOWN; 755 + enum dc_pixel_format dal_pixel_format = PIXEL_FORMAT_UNKNOWN; 756 756 757 757 switch (surface_pixel_format) { 758 758 case SURFACE_PIXEL_FORMAT_GRPH_PALETA_256_COLORS:
+1 -1
drivers/gpu/drm/amd/display/dc/dc_hw_types.h
··· 218 218 219 219 220 220 /* Pixel format */ 221 - enum pixel_format { 221 + enum dc_pixel_format { 222 222 /*graph*/ 223 223 PIXEL_FORMAT_UNINITIALIZED, 224 224 PIXEL_FORMAT_INDEX8,
+2 -1
drivers/gpu/drm/amd/display/dc/dc_spl_translate.c
··· 63 63 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); 64 64 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); 65 65 } 66 - static void populate_splformat_from_format(enum spl_pixel_format *spl_pixel_format, const enum pixel_format pixel_format) 66 + static void populate_splformat_from_format(enum spl_pixel_format *spl_pixel_format, 67 + const enum dc_pixel_format pixel_format) 67 68 { 68 69 if (pixel_format < PIXEL_FORMAT_INVALID) 69 70 *spl_pixel_format = (enum spl_pixel_format)pixel_format;
+2 -2
drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c
··· 102 102 } 103 103 } 104 104 105 - static bool dpp1_dscl_is_video_format(enum pixel_format format) 105 + static bool dpp1_dscl_is_video_format(enum dc_pixel_format format) 106 106 { 107 107 if (format >= PIXEL_FORMAT_VIDEO_BEGIN 108 108 && format <= PIXEL_FORMAT_VIDEO_END) ··· 111 111 return false; 112 112 } 113 113 114 - static bool dpp1_dscl_is_420_format(enum pixel_format format) 114 + static bool dpp1_dscl_is_420_format(enum dc_pixel_format format) 115 115 { 116 116 if (format == PIXEL_FORMAT_420BPP8 || 117 117 format == PIXEL_FORMAT_420BPP10)
+2 -2
drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c
··· 94 94 } 95 95 } 96 96 97 - static bool dpp401_dscl_is_video_format(enum pixel_format format) 97 + static bool dpp401_dscl_is_video_format(enum dc_pixel_format format) 98 98 { 99 99 if (format >= PIXEL_FORMAT_VIDEO_BEGIN 100 100 && format <= PIXEL_FORMAT_VIDEO_END) ··· 103 103 return false; 104 104 } 105 105 106 - static bool dpp401_dscl_is_420_format(enum pixel_format format) 106 + static bool dpp401_dscl_is_420_format(enum dc_pixel_format format) 107 107 { 108 108 if (format == PIXEL_FORMAT_420BPP8 || 109 109 format == PIXEL_FORMAT_420BPP10)
+1 -1
drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
··· 256 256 enum dc_color_space out_color_space; 257 257 enum dc_color_space in_color_space; 258 258 enum dc_color_depth color_depth; 259 - enum pixel_format surface_pixel_format; 259 + enum dc_pixel_format surface_pixel_format; 260 260 enum graphics_csc_adjust_type csc_adjust_type; 261 261 bool force_hw_default; 262 262 };
+1 -1
drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
··· 160 160 struct scaling_ratios ratios; 161 161 struct scl_inits inits; 162 162 struct sharpness_adj sharpness; 163 - enum pixel_format format; 163 + enum dc_pixel_format format; 164 164 struct line_buffer_params lb_params; 165 165 // Below struct holds the scaler values to program hw registers 166 166 struct dscl_prog_data dscl_prog_data;