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>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 8271b12c1a66d52173cd62ed9a9e677945d36cb9..727bcf08a84fbf68ffbd999c2195bc07ef9400ff 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -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:

diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
index 595e082db281617d6bac219406aff4b36c4ffbfe..c2ca08d26e3711ab7cf691ccdb086425f3242197 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
@@ -218,7 +218,7 @@ enum surface_pixel_format {
 
 
 /* Pixel format */
-enum pixel_format {
+enum dc_pixel_format {
        /*graph*/
        PIXEL_FORMAT_UNINITIALIZED,
        PIXEL_FORMAT_INDEX8,

diff --git a/drivers/gpu/drm/amd/display/dc/dc_spl_translate.c b/drivers/gpu/drm/amd/display/dc/dc_spl_translate.c
index ba7bf23f2b2fd233e5ac0e802590bc100907c0b5..52ed8deebf6355cb55576d9f39eae7a4007aa16f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_spl_translate.c
+++ b/drivers/gpu/drm/amd/display/dc/dc_spl_translate.c
@@ -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;

diff --git a/drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c b/drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c
index 808bca9fb80440b863e59af788bfbcf0f43dd921..0d2c9fcd3362cd278d34b7574b2b7fff5e7a4633 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c
+++ b/drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c
@@ -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)

diff --git a/drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c b/drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c
index 8b6155f9122f8ea748726335a306188deba175d3..8b7e55e337d350cc527dc38f283116a7ab668e79 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c
+++ b/drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c
@@ -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)

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
index b152f68794954d549ecd44ee97c4455e464ecb1c..51581c10fd6bf5cb7719ec7cb24870f753df612f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
@@ -256,7 +256,7 @@ struct default_adjustment {
        enum dc_color_space out_color_space;
        enum dc_color_space in_color_space;
        enum dc_color_depth color_depth;
-       enum pixel_format surface_pixel_format;
+       enum dc_pixel_format surface_pixel_format;
        enum graphics_csc_adjust_type csc_adjust_type;
        bool force_hw_default;
 };

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h b/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
index 5a1d9b708a9d97c4e93adcf24c66953ed46554f0..30990355985dd223ddedb3ffc3095d5233ebfd5c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
@@ -160,7 +160,7 @@ struct scaler_data {
        struct scaling_ratios ratios;
        struct scl_inits inits;
        struct sharpness_adj sharpness;
-       enum pixel_format format;
+       enum dc_pixel_format format;
        struct line_buffer_params lb_params;
        // Below struct holds the scaler values to program hw registers
        struct dscl_prog_data dscl_prog_data;