1. Patchew
  2. linux
  3. [PATCH 0/2] drm: Fix namespace clashes with 'pixel_format'
  4. View patch

[PATCH 2/2] drm/amd/display: Rename enum 'pixel_format' to 'dc_pixel_format'

Hou Wenlong posted 2 patches 3 weeks, 1 day ago
[PATCH 2/2] drm/amd/display: Rename enum 'pixel_format' to 'dc_pixel_format'
Posted by Hou Wenlong 3 weeks, 1 day ago 
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>
---
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c           | 4 ++--
 drivers/gpu/drm/amd/display/dc/dc_hw_types.h                | 2 +-
 drivers/gpu/drm/amd/display/dc/dc_spl_translate.c           | 3 ++-
 drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c   | 4 ++--
 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 4 ++--
 drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h           | 2 +-
 drivers/gpu/drm/amd/display/dc/inc/hw/transform.h           | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

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 03d125f794b0..cadc52728108 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -742,10 +742,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 cfa569a7bff1..81d12df8f54e 100644
--- 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 37d1a79e8241..854d50ab1a6c 100644
--- 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 808bca9fb804..0d2c9fcd3362 100644
--- 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 a62c4733ed3b..e2489eaf0004 100644
--- 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 a61d12ec61bc..b4a95807b73b 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
@@ -240,7 +240,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 5a1d9b708a9d..30990355985d 100644
--- 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;
-- 
2.31.1
Re: [PATCH 2/2] drm/amd/display: Rename enum 'pixel_format' to 'dc_pixel_format'
Posted by Alex Hung 2 weeks, 4 days ago 
Reviewed-by: Alex Hung <alex.hung@amd.com>

On 3/15/26 21:46, Hou Wenlong wrote:
> [Some people who received this message don't often get email from houwenlong.hwl@antgroup.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> 
> 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>
> ---
>   drivers/gpu/drm/amd/display/dc/core/dc_resource.c           | 4 ++--
>   drivers/gpu/drm/amd/display/dc/dc_hw_types.h                | 2 +-
>   drivers/gpu/drm/amd/display/dc/dc_spl_translate.c           | 3 ++-
>   drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c   | 4 ++--
>   drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 4 ++--
>   drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h           | 2 +-
>   drivers/gpu/drm/amd/display/dc/inc/hw/transform.h           | 2 +-
>   7 files changed, 11 insertions(+), 10 deletions(-)
> 
> 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 03d125f794b0..cadc52728108 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -742,10 +742,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 cfa569a7bff1..81d12df8f54e 100644
> --- 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 37d1a79e8241..854d50ab1a6c 100644
> --- 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 808bca9fb804..0d2c9fcd3362 100644
> --- 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 a62c4733ed3b..e2489eaf0004 100644
> --- 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 a61d12ec61bc..b4a95807b73b 100644
> --- a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
> +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
> @@ -240,7 +240,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 5a1d9b708a9d..30990355985d 100644
> --- 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;
> --
> 2.31.1
>

Patchew 2.1-devel-ea86937

© 2016 - 2026 Red Hat, Inc.