drm/amdgpu/display: provide ASSERT macros unconditionally
Subsystems (3)
PATCH 1/3 drm/amdgpu/display: provide ASSERT macros unconditionally
It seems impossible to build this driver without setting either CONFIG_DEBUG_KERNEL or CONFIG_DEBUG_DRIVER:
drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h: In function 'set_reg_field_value_ex':drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h:132:2: error: implicit declaration of function 'ASSERT'; did you mean 'IS_ERR'? [-Werror=implicit-function-declaration]
This moves the ASSERT() macro and related helpers outside of the #ifdef to get it to build again.
--- drivers/gpu/drm/amd/display/dc/os_types.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/os_types.h +1 -5
@@ -61,8 +61,6 @@* general debug capabilities * */ -#if defined(CONFIG_DEBUG_KERNEL ) || defined(CONFIG_DEBUG_DRIVER ) -#if defined(CONFIG_HAVE_KGDB ) || defined(CONFIG_KGDB )#define ASSERT_CRITICAL (expr) do { \ if (WARN_ON(!(expr))) { \
@@ -75,7 +73,7 @@ ; \ } \ } while (0) -#endif +#endif /* CONFIG_DEBUG_KERNEL || CONFIG_DEBUG_DRIVER */ #if defined(CONFIG_DEBUG_KERNEL_DC )#define ASSERT (expr) ASSERT_CRITICAL(expr)
@@ -86,8 +84,6 @@#define BREAK_TO_DEBUGGER () ASSERT(0) -#endif /* CONFIG_DEBUG_KERNEL || CONFIG_DEBUG_DRIVER */ -#define DC_ERR (...) do { \ dm_error(__VA_ARGS__); \ BREAK_TO_DEBUGGER(); \
Signature · 6 lines
2.9.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/3 drm/amdgpu/display: remove unused REG_OFFSET macro
The name conflicts with another macro of the same name on the ARM ixp4xx platform, leading to build errors.
Neither of the users actually should use a name that generic, but the other one was here first and the dc driver doesn't actually use it.
--- drivers/gpu/drm/amd/display/dc/dm_services.h | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dm_services.h +0 -3
@@ -160,9 +160,6 @@ unsigned int generic_reg_wait(const struct dc_context *ctx,/* These macros need to be used with soc15 registers in order to retrieve * the actual offset. */ -#define REG_OFFSET (reg) (reg + DCE_BASE.instance[0].segment[reg##_BASE_IDX]) -#define REG_BIF_OFFSET (reg) (reg + NBIF_BASE.instance[0].segment[reg##_BASE_IDX]) -#define dm_write_reg_soc15 (ctx, reg, inst_offset, value) \ dm_write_reg_func(ctx, reg + DCE_BASE.instance[0].segment[reg##_BASE_IDX] + inst_offset, value, __func__)
Signature · 6 lines
2.9.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/3 drm/amdgpu/display: fix integer arithmetic problem
In reply to Arnd Bergmanngcc warns about an ambiguous integer calculation:
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c: In function 'calculate_bandwidth':drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c:534:5: error: this decimal constant is unsigned only in ISO C90 [-Werror]
data->lb_line_pitch = bw_ceil2(bw_mul(bw_div(bw_frc_to_fixed(2401171875, 100000000), bw_int_to_fixed(3)), bw_ceil2(data->source_width_in_lb, bw_int_to_fixed(8))), bw_int_to_fixed(48));
^~~~Marking the constant as explicitly unsigned makes it work fine everywhere without warnings.
--- drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +1 -1
@@ -531,7 +531,7 @@ static void calculate_bandwidth( }switch (data->lb_bpc[i]) {case 8 : - data->lb_line_pitch =bw_ceil2 (bw_mul (bw_div (bw_frc_to_fixed (2401171875 ,100000000 ),bw_int_to_fixed (3 )),bw_ceil2 (data->source_width_in_lb,bw_int_to_fixed (8 ))),bw_int_to_fixed (48 )); + data->lb_line_pitch =bw_ceil2 (bw_mul (bw_div (bw_frc_to_fixed (2401171875ul ,100000000 ),bw_int_to_fixed (3 )),bw_ceil2 (data->source_width_in_lb,bw_int_to_fixed (8 ))),bw_int_to_fixed (48 ));break ;case 10 : data->lb_line_pitch =bw_ceil2 (bw_mul (bw_div (bw_frc_to_fixed (300234375 ,10000000 ),bw_int_to_fixed (3 )),bw_ceil2 (data->source_width_in_lb,bw_int_to_fixed (8 ))),bw_int_to_fixed (48 ));
Signature · 6 lines
2.9.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/3] drm/amdgpu/display: fix integer arithmetic problem
Quoted 11 lines · Arnd Bergmann
gcc warns about an ambiguous integer calculation:
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c: In function 'calculate_bandwidth':drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c:534:5: error: this decimal constant is unsigned only in ISO C90 [-Werror]data->lb_line_pitch = bw_ceil2(bw_mul(bw_div(bw_frc_to_fixed(2401171875, 100000000), bw_int_to_fixed(3)), bw_ceil2(data->source_width_in_lb, bw_int_to_fixed(8))), bw_int_to_fixed(48)); ^~~~Marking the constant as explicitly unsigned makes it work fine everywhere without warnings.
Signed-off-by Arnd Bergmann <[email protected]>
Thanks for these fixes.
Series is
Harry
Quoted 10 lines
--- drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +0
-0
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c static void calculate_bandwidth( · line 537
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +1
-1@@ -531,7 +531,7 @@ static void calculate_bandwidth( }switch (data->lb_bpc[i]) {case 8 : - data->lb_line_pitch =bw_ceil2 (bw_mul (bw_div (bw_frc_to_fixed (2401171875 ,100000000 ),bw_int_to_fixed (3 )),bw_ceil2 (data->source_width_in_lb,bw_int_to_fixed (8 ))),bw_int_to_fixed (48 )); + data->lb_line_pitch =bw_ceil2 (bw_mul (bw_div (bw_frc_to_fixed (2401171875ul ,100000000 ),bw_int_to_fixed (3 )),bw_ceil2 (data->source_width_in_lb,bw_int_to_fixed (8 ))),bw_int_to_fixed (48 ));break ;case 10 : data->lb_line_pitch =bw_ceil2 (bw_mul (bw_div (bw_frc_to_fixed (300234375 ,10000000 ),bw_int_to_fixed (3 )),bw_ceil2 (data->source_width_in_lb,bw_int_to_fixed (8 ))),bw_int_to_fixed (48 ));
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 28 lines · Arnd Bergmann
It seems impossible to build this driver without setting either
CONFIG_DEBUG_KERNELorCONFIG_DEBUG_DRIVER:
drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h: In function 'set_reg_field_value_ex':drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h:132:2: error: implicit declaration of function 'ASSERT'; did you mean 'IS_ERR'? [-Werror=implicit-function-declaration]This moves the
ASSERT()macro and related helpers outside of the #ifdef to get it to build again.Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/amd/display/dc/os_types.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/gpu/drm/amd/display/dc/os_types.h +0
-2@@ -61,8 +61,6 @@* general debug capabilities * */ -#if defined(CONFIG_DEBUG_KERNEL ) || defined(CONFIG_DEBUG_DRIVER ) -#if defined(CONFIG_HAVE_KGDB ) || defined(CONFIG_KGDB )#define ASSERT_CRITICAL (expr) do { \ if (WARN_ON(!(expr))) { \
drivers/gpu/drm/amd/display/dc/os_types.h line 76
Quoted 5 lines
drivers/gpu/drm/amd/display/dc/os_types.h +1
-1@@ -75,7 +73,7 @@ ; \ } \ }while (0 ) -#endif +#endif /* CONFIG_DEBUG_KERNEL || CONFIG_DEBUG_DRIVER */
Is this the right comment here? Looks like it should be /* defined(CONFIG_HAVE_KGDB) || defined(CONFIG_KGDB) */.
Regards,
Felix
drivers/gpu/drm/amd/display/dc/os_types.h line 89
Quoted 12 lines
drivers/gpu/drm/amd/display/dc/os_types.h +0
-2#if defined(CONFIG_DEBUG_KERNEL_DC )#define ASSERT (expr) ASSERT_CRITICAL(expr)@@ -86,8 +84,6 @@#define BREAK_TO_DEBUGGER () ASSERT(0) -#endif /* CONFIG_DEBUG_KERNEL || CONFIG_DEBUG_DRIVER */ -#define DC_ERR (...) do { \ dm_error(__VA_ARGS__); \ BREAK_TO_DEBUGGER(); \
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 29 lines · Felix Kuehling
Quoted 28 lines · Arnd Bergmann
It seems impossible to build this driver without setting either
CONFIG_DEBUG_KERNELorCONFIG_DEBUG_DRIVER:
drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h: In function 'set_reg_field_value_ex':drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h:132:2: error: implicit declaration of function 'ASSERT'; did you mean 'IS_ERR'? [-Werror=implicit-function-declaration]This moves the
ASSERT()macro and related helpers outside of the #ifdef to get it to build again.Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/amd/display/dc/os_types.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/gpu/drm/amd/display/dc/os_types.h +0
-2@@ -61,8 +61,6 @@* general debug capabilities * */ -#if defined(CONFIG_DEBUG_KERNEL ) || defined(CONFIG_DEBUG_DRIVER ) -#if defined(CONFIG_HAVE_KGDB ) || defined(CONFIG_KGDB )#define ASSERT_CRITICAL (expr) do { \ if (WARN_ON(!(expr))) { \@@ -75,7 +73,7 @@
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/os_types.h line 76
Quoted 5 lines
drivers/gpu/drm/amd/display/dc/os_types.h +1
-1; \ } \ }while (0 ) -#endif +#endif /* CONFIG_DEBUG_KERNEL || CONFIG_DEBUG_DRIVER */Is this the right comment here? Looks like it should be /*
defined(CONFIG_HAVE_KGDB)||defined(CONFIG_KGDB)*/.
Right, my mistake. I had tried a couple of different versions before I found one that built in all configurations. This slipped through. I'll send a fixed version of this one patch but not the other two in the series if that's ok.
Arnd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 39 lines · Arnd Bergmann
Quoted 29 lines · Felix Kuehling
Quoted 28 lines · Arnd Bergmann
It seems impossible to build this driver without setting either
CONFIG_DEBUG_KERNELorCONFIG_DEBUG_DRIVER:
drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h: In function 'set_reg_field_value_ex':drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h:132:2: error: implicit declaration of function 'ASSERT'; did you mean 'IS_ERR'? [-Werror=implicit-function-declaration]This moves the
ASSERT()macro and related helpers outside of the #ifdef to get it to build again.Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/amd/display/dc/os_types.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/gpu/drm/amd/display/dc/os_types.h +0
-2@@ -61,8 +61,6 @@* general debug capabilities * */ -#if defined(CONFIG_DEBUG_KERNEL ) || defined(CONFIG_DEBUG_DRIVER ) -#if defined(CONFIG_HAVE_KGDB ) || defined(CONFIG_KGDB )#define ASSERT_CRITICAL (expr) do { \ if (WARN_ON(!(expr))) { \@@ -75,7 +73,7 @@Quoted 8 lines
drivers/gpu/drm/amd/display/dc/os_types.h line 76
Quoted 5 lines
drivers/gpu/drm/amd/display/dc/os_types.h +1
-1; \ } \ }while (0 ) -#endif +#endif /* CONFIG_DEBUG_KERNEL || CONFIG_DEBUG_DRIVER */Is this the right comment here? Looks like it should be /*
defined(CONFIG_HAVE_KGDB)||defined(CONFIG_KGDB)*/.
Quoted 3 lines
Right, my mistake. I had tried a couple of different versions before I found one that built in all configurations. This slipped through. I'll send a fixed version of this one patch but not the other two in the series if that's ok.
Sounds good. Thanks!
Alex
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel