* [PATCH 0/2] drm: Fix namespace clashes with 'pixel_format'
@ 2026-03-16 3:46 Hou Wenlong
2026-03-16 3:46 ` [PATCH 1/2] drm/i915/gvt: Rename struct 'pixel_format' to 'gvt_pixel_format' Hou Wenlong
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Hou Wenlong @ 2026-03-16 3:46 UTC (permalink / raw)
To: linux-kernel
Cc: Hou Wenlong, Alex Deucher, Alex Hung, Alvin Lee, amd-gfx,
Ankit Nautiyal, Aurabindo Pillai, Ausef Yousof,
Bhuvanachandra Pinninti, Chaitanya Kumar Borah, Charlene Liu,
Chenyu Chen, Chris Park, Christian König, David Airlie,
Dillon Varone, Dmytro Laktyushkin, dri-devel, Gustavo Sousa,
Harold Sun, Harry Wentland, intel-gfx, Jani Nikula,
Joonas Lahtinen, Jun Lei, Karthi Kandasamy, Leo Chen, Leo Li,
Lohita Mudimela, Lucas De Marchi, Meenakshikumar Somasundaram,
Nicholas Carbones, Ray Wu, Relja Vojvodic, Rodrigo Siqueira,
Rodrigo Vivi, Ryan Seto, Samson Tam, Simona Vetter,
Timur Kristóf, Tvrtko Ursulin, Wayne Lin, Wenjing Liu,
Yan Li, Zhenyu Wang, Zhi Wang
The 'pixel_format' structure is defined in include/video/pixel_format.h.
However, DRM also defines a local structure with the same name, which
leads to namespace clashes as reported in [0]. As suggested in [1],
rename the 'pixel_format' definitions in drivers/drm by adding a prefix
to avoid the conflict.
[0]: https://lore.kernel.org/lkml/aahBPzflrEJ2FPx0@sirena.org.uk
[1]: https://lore.kernel.org/lkml/20260313122808.GAabQC2Bmul9Odt-dX@fat_crate.local
Hou Wenlong (2):
drm/i915/gvt: Rename struct 'pixel_format' to 'gvt_pixel_format'
drm/amd/display: Rename enum 'pixel_format' to 'dc_pixel_format'
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 +-
drivers/gpu/drm/i915/gvt/fb_decoder.c | 6 +++---
8 files changed, 14 insertions(+), 13 deletions(-)
--
2.31.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] drm/i915/gvt: Rename struct 'pixel_format' to 'gvt_pixel_format' 2026-03-16 3:46 [PATCH 0/2] drm: Fix namespace clashes with 'pixel_format' Hou Wenlong @ 2026-03-16 3:46 ` Hou Wenlong 2026-03-16 8:52 ` Jani Nikula 2026-03-16 3:46 ` [PATCH 2/2] drm/amd/display: Rename enum 'pixel_format' to 'dc_pixel_format' Hou Wenlong 2026-03-23 18:50 ` ✗ LGCI.VerificationFailed: failure for drm: Fix namespace clashes with 'pixel_format' Patchwork 2 siblings, 1 reply; 6+ messages in thread From: Hou Wenlong @ 2026-03-16 3:46 UTC (permalink / raw) To: linux-kernel Cc: Hou Wenlong, Alex Deucher, Alex Hung, Alvin Lee, amd-gfx, Ankit Nautiyal, Aurabindo Pillai, Ausef Yousof, Bhuvanachandra Pinninti, Chaitanya Kumar Borah, Charlene Liu, Chenyu Chen, Chris Park, Christian König, David Airlie, Dillon Varone, Dmytro Laktyushkin, dri-devel, Gustavo Sousa, Harold Sun, Harry Wentland, intel-gfx, Jani Nikula, Joonas Lahtinen, Jun Lei, Karthi Kandasamy, Leo Chen, Leo Li, Lohita Mudimela, Lucas De Marchi, Meenakshikumar Somasundaram, Nicholas Carbones, Ray Wu, Relja Vojvodic, Rodrigo Siqueira, Rodrigo Vivi, Ryan Seto, Samson Tam, Simona Vetter, Timur Kristóf, Tvrtko Ursulin, Wayne Lin, Wenjing Liu, Yan Li, Zhenyu Wang, Zhi Wang Rename the local struct 'pixel_format' to 'gvt_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/i915/gvt/fb_decoder.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/fb_decoder.c b/drivers/gpu/drm/i915/gvt/fb_decoder.c index d7abf38df532..25fffc77f138 100644 --- a/drivers/gpu/drm/i915/gvt/fb_decoder.c +++ b/drivers/gpu/drm/i915/gvt/fb_decoder.c @@ -48,13 +48,13 @@ #include "i915_reg.h" #define PRIMARY_FORMAT_NUM 16 -struct pixel_format { +struct gvt_pixel_format { int drm_format; /* Pixel format in DRM definition */ int bpp; /* Bits per pixel, 0 indicates invalid */ const char *desc; /* The description */ }; -static const struct pixel_format bdw_pixel_formats[] = { +static const struct gvt_pixel_format bdw_pixel_formats[] = { {DRM_FORMAT_C8, 8, "8-bit Indexed"}, {DRM_FORMAT_RGB565, 16, "16-bit BGRX (5:6:5 MSB-R:G:B)"}, {DRM_FORMAT_XRGB8888, 32, "32-bit BGRX (8:8:8:8 MSB-X:R:G:B)"}, @@ -67,7 +67,7 @@ static const struct pixel_format bdw_pixel_formats[] = { {} }; -static const struct pixel_format skl_pixel_formats[] = { +static const struct gvt_pixel_format skl_pixel_formats[] = { {DRM_FORMAT_YUYV, 16, "16-bit packed YUYV (8:8:8:8 MSB-V:Y2:U:Y1)"}, {DRM_FORMAT_UYVY, 16, "16-bit packed UYVY (8:8:8:8 MSB-Y2:V:Y1:U)"}, {DRM_FORMAT_YVYU, 16, "16-bit packed YVYU (8:8:8:8 MSB-U:Y2:V:Y1)"}, -- 2.31.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] drm/i915/gvt: Rename struct 'pixel_format' to 'gvt_pixel_format' 2026-03-16 3:46 ` [PATCH 1/2] drm/i915/gvt: Rename struct 'pixel_format' to 'gvt_pixel_format' Hou Wenlong @ 2026-03-16 8:52 ` Jani Nikula 0 siblings, 0 replies; 6+ messages in thread From: Jani Nikula @ 2026-03-16 8:52 UTC (permalink / raw) To: Hou Wenlong, linux-kernel Cc: Hou Wenlong, Alex Deucher, Alex Hung, Alvin Lee, amd-gfx, Ankit Nautiyal, Aurabindo Pillai, Ausef Yousof, Bhuvanachandra Pinninti, Chaitanya Kumar Borah, Charlene Liu, Chenyu Chen, Chris Park, Christian König, David Airlie, Dillon Varone, Dmytro Laktyushkin, dri-devel, Gustavo Sousa, Harold Sun, Harry Wentland, intel-gfx, Joonas Lahtinen, Jun Lei, Karthi Kandasamy, Leo Chen, Leo Li, Lohita Mudimela, Lucas De Marchi, Meenakshikumar Somasundaram, Nicholas Carbones, Ray Wu, Relja Vojvodic, Rodrigo Siqueira, Rodrigo Vivi, Ryan Seto, Samson Tam, Simona Vetter, Timur Kristóf, Tvrtko Ursulin, Wayne Lin, Wenjing Liu, Yan Li, Zhenyu Wang, Zhi Wang On Mon, 16 Mar 2026, Hou Wenlong <houwenlong.hwl@antgroup.com> wrote: > Rename the local struct 'pixel_format' to 'gvt_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: Jani Nikula <jani.nikula@intel.com> and ack for merging via whichever branch you prefer. > --- > drivers/gpu/drm/i915/gvt/fb_decoder.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gvt/fb_decoder.c b/drivers/gpu/drm/i915/gvt/fb_decoder.c > index d7abf38df532..25fffc77f138 100644 > --- a/drivers/gpu/drm/i915/gvt/fb_decoder.c > +++ b/drivers/gpu/drm/i915/gvt/fb_decoder.c > @@ -48,13 +48,13 @@ > #include "i915_reg.h" > > #define PRIMARY_FORMAT_NUM 16 > -struct pixel_format { > +struct gvt_pixel_format { > int drm_format; /* Pixel format in DRM definition */ > int bpp; /* Bits per pixel, 0 indicates invalid */ > const char *desc; /* The description */ > }; > > -static const struct pixel_format bdw_pixel_formats[] = { > +static const struct gvt_pixel_format bdw_pixel_formats[] = { > {DRM_FORMAT_C8, 8, "8-bit Indexed"}, > {DRM_FORMAT_RGB565, 16, "16-bit BGRX (5:6:5 MSB-R:G:B)"}, > {DRM_FORMAT_XRGB8888, 32, "32-bit BGRX (8:8:8:8 MSB-X:R:G:B)"}, > @@ -67,7 +67,7 @@ static const struct pixel_format bdw_pixel_formats[] = { > {} > }; > > -static const struct pixel_format skl_pixel_formats[] = { > +static const struct gvt_pixel_format skl_pixel_formats[] = { > {DRM_FORMAT_YUYV, 16, "16-bit packed YUYV (8:8:8:8 MSB-V:Y2:U:Y1)"}, > {DRM_FORMAT_UYVY, 16, "16-bit packed UYVY (8:8:8:8 MSB-Y2:V:Y1:U)"}, > {DRM_FORMAT_YVYU, 16, "16-bit packed YVYU (8:8:8:8 MSB-U:Y2:V:Y1)"}, -- Jani Nikula, Intel ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] drm/amd/display: Rename enum 'pixel_format' to 'dc_pixel_format' 2026-03-16 3:46 [PATCH 0/2] drm: Fix namespace clashes with 'pixel_format' Hou Wenlong 2026-03-16 3:46 ` [PATCH 1/2] drm/i915/gvt: Rename struct 'pixel_format' to 'gvt_pixel_format' Hou Wenlong @ 2026-03-16 3:46 ` Hou Wenlong 2026-03-20 3:58 ` Alex Hung 2026-03-23 18:50 ` ✗ LGCI.VerificationFailed: failure for drm: Fix namespace clashes with 'pixel_format' Patchwork 2 siblings, 1 reply; 6+ messages in thread From: Hou Wenlong @ 2026-03-16 3:46 UTC (permalink / raw) To: linux-kernel Cc: Hou Wenlong, Alex Deucher, Alex Hung, Alvin Lee, amd-gfx, Ankit Nautiyal, Aurabindo Pillai, Ausef Yousof, Bhuvanachandra Pinninti, Chaitanya Kumar Borah, Charlene Liu, Chenyu Chen, Chris Park, Christian König, David Airlie, Dillon Varone, Dmytro Laktyushkin, dri-devel, Gustavo Sousa, Harold Sun, Harry Wentland, intel-gfx, Jani Nikula, Joonas Lahtinen, Jun Lei, Karthi Kandasamy, Leo Chen, Leo Li, Lohita Mudimela, Lucas De Marchi, Meenakshikumar Somasundaram, Nicholas Carbones, Ray Wu, Relja Vojvodic, Rodrigo Siqueira, Rodrigo Vivi, Ryan Seto, Samson Tam, Simona Vetter, Timur Kristóf, Tvrtko Ursulin, Wayne Lin, Wenjing Liu, Yan Li, Zhenyu Wang, Zhi Wang 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/amd/display: Rename enum 'pixel_format' to 'dc_pixel_format' 2026-03-16 3:46 ` [PATCH 2/2] drm/amd/display: Rename enum 'pixel_format' to 'dc_pixel_format' Hou Wenlong @ 2026-03-20 3:58 ` Alex Hung 0 siblings, 0 replies; 6+ messages in thread From: Alex Hung @ 2026-03-20 3:58 UTC (permalink / raw) To: Hou Wenlong, linux-kernel Cc: Alex Deucher, Alvin Lee, amd-gfx, Ankit Nautiyal, Aurabindo Pillai, Ausef Yousof, Bhuvanachandra Pinninti, Chaitanya Kumar Borah, Charlene Liu, Chenyu Chen, Chris Park, Christian König, David Airlie, Dillon Varone, Dmytro Laktyushkin, dri-devel, Gustavo Sousa, Harold Sun, Harry Wentland, intel-gfx, Jani Nikula, Joonas Lahtinen, Jun Lei, Karthi Kandasamy, Leo Chen, Leo Li, Lohita Mudimela, Lucas De Marchi, Meenakshikumar Somasundaram, Nicholas Carbones, Ray Wu, Relja Vojvodic, Rodrigo Siqueira, Rodrigo Vivi, Ryan Seto, Samson Tam, Simona Vetter, Timur Kristóf, Tvrtko Ursulin, Wayne Lin, Wenjing Liu, Yan Li, Zhenyu Wang, Zhi Wang 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 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* ✗ LGCI.VerificationFailed: failure for drm: Fix namespace clashes with 'pixel_format' 2026-03-16 3:46 [PATCH 0/2] drm: Fix namespace clashes with 'pixel_format' Hou Wenlong 2026-03-16 3:46 ` [PATCH 1/2] drm/i915/gvt: Rename struct 'pixel_format' to 'gvt_pixel_format' Hou Wenlong 2026-03-16 3:46 ` [PATCH 2/2] drm/amd/display: Rename enum 'pixel_format' to 'dc_pixel_format' Hou Wenlong @ 2026-03-23 18:50 ` Patchwork 2 siblings, 0 replies; 6+ messages in thread From: Patchwork @ 2026-03-23 18:50 UTC (permalink / raw) To: Hou Wenlong; +Cc: intel-gfx == Series Details == Series: drm: Fix namespace clashes with 'pixel_format' URL : https://patchwork.freedesktop.org/series/163710/ State : failure == Summary == Address 'houwenlong.hwl@antgroup.com' is not on the allowlist, which prevents CI from being triggered for this patch. If you want Intel GFX CI to accept this address, please contact the script maintainers at i915-ci-infra@lists.freedesktop.org. Exception occurred during validation, bailing out! ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-03-23 18:50 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2026-03-16 3:46 [PATCH 0/2] drm: Fix namespace clashes with 'pixel_format' Hou Wenlong 2026-03-16 3:46 ` [PATCH 1/2] drm/i915/gvt: Rename struct 'pixel_format' to 'gvt_pixel_format' Hou Wenlong 2026-03-16 8:52 ` Jani Nikula 2026-03-16 3:46 ` [PATCH 2/2] drm/amd/display: Rename enum 'pixel_format' to 'dc_pixel_format' Hou Wenlong 2026-03-20 3:58 ` Alex Hung 2026-03-23 18:50 ` ✗ LGCI.VerificationFailed: failure for drm: Fix namespace clashes with 'pixel_format' Patchwork
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox