| Message ID | 20241219-amdgpu-fix-enum-float-conversion-again-again-v1-1-ef2c619724b1@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/amd/display: Disable -Wenum-float-conversion for dml2_dpmm_dcn4.c | expand |
On Thu, Dec 19, 2024 at 12:23 PM Nathan Chancellor <nathan@kernel.org> wrote: > > Commit be4e3509314a ("drm/amd/display: DML21 Reintegration For Various > Fixes") blew away commit fdedd77b0eb3 ("drm/amd/display: Reapply > 2fde4fdddc1f"), which itself was a reapplication for the same reason, > which results in that compiler warning returning: > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c:215:58: error: arithmetic between enumeration type 'enum dentist_divider_range' and floating-point type 'double' [-Werror,-Wenum-float-conversion] > 215 | divider = (unsigned int)(DFS_DIVIDER_RANGE_SCALE_FACTOR * (vco_freq_khz / clock_khz)); > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Just disable the warning for the whole file via Makefile to avoid having > to reapply the same fix every time the code syncs from wherever it is > actually maintained. > > Fixes: be4e3509314a ("drm/amd/display: DML21 Reintegration For Various Fixes") > Signed-off-by: Nathan Chancellor <nathan@kernel.org> > --- > If you would prefer reapplying the local fix, feel free to do so, but I > would like for it to be in the upstream source so it does not have to > keep being applied. I've reapplied the original fix and I've confirmed that the fix will be pushed to the DML tree as well this time. Thanks, Alex > --- > drivers/gpu/drm/amd/display/dc/dml2/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dml2/Makefile b/drivers/gpu/drm/amd/display/dc/dml2/Makefile > index d9c27ebe12ee08d6330eb199cd8ca9c8489fa5b2..5c0f93644c5d43c8a0bc12713fc400712d8de50b 100644 > --- a/drivers/gpu/drm/amd/display/dc/dml2/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/dml2/Makefile > @@ -78,7 +78,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.o := $(dml2_ccfla > CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.o := $(dml2_ccflags) > CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.o := $(dml2_ccflags) $(frame_warn_flag) > CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_core/dml2_core_factory.o := $(dml2_ccflags) > -CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.o := $(dml2_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.o := $(dml2_ccflags) $(call cc-disable-warning,enum-float-conversion) > CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.o := $(dml2_ccflags) > CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.o := $(dml2_ccflags) > CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.o := $(dml2_ccflags) > > --- > base-commit: 695c2c745e5dff201b75da8a1d237ce403600d04 > change-id: 20241219-amdgpu-fix-enum-float-conversion-again-again-cbfd9159f76d > > Best regards, > -- > Nathan Chancellor <nathan@kernel.org> >
On Thu, Dec 19, 2024 at 05:21:41PM -0500, Alex Deucher wrote: > On Thu, Dec 19, 2024 at 12:23 PM Nathan Chancellor <nathan@kernel.org> wrote: > > If you would prefer reapplying the local fix, feel free to do so, but I > > would like for it to be in the upstream source so it does not have to > > keep being applied. > > I've reapplied the original fix and I've confirmed that the fix will > be pushed to the DML tree as well this time. Thanks a lot!
diff --git a/drivers/gpu/drm/amd/display/dc/dml2/Makefile b/drivers/gpu/drm/amd/display/dc/dml2/Makefile index d9c27ebe12ee08d6330eb199cd8ca9c8489fa5b2..5c0f93644c5d43c8a0bc12713fc400712d8de50b 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dml2/Makefile @@ -78,7 +78,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.o := $(dml2_ccfla CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.o := $(dml2_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.o := $(dml2_ccflags) $(frame_warn_flag) CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_core/dml2_core_factory.o := $(dml2_ccflags) -CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.o := $(dml2_ccflags) +CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.o := $(dml2_ccflags) $(call cc-disable-warning,enum-float-conversion) CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.o := $(dml2_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.o := $(dml2_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.o := $(dml2_ccflags)
Commit be4e3509314a ("drm/amd/display: DML21 Reintegration For Various Fixes") blew away commit fdedd77b0eb3 ("drm/amd/display: Reapply 2fde4fdddc1f"), which itself was a reapplication for the same reason, which results in that compiler warning returning: drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c:215:58: error: arithmetic between enumeration type 'enum dentist_divider_range' and floating-point type 'double' [-Werror,-Wenum-float-conversion] 215 | divider = (unsigned int)(DFS_DIVIDER_RANGE_SCALE_FACTOR * (vco_freq_khz / clock_khz)); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~ Just disable the warning for the whole file via Makefile to avoid having to reapply the same fix every time the code syncs from wherever it is actually maintained. Fixes: be4e3509314a ("drm/amd/display: DML21 Reintegration For Various Fixes") Signed-off-by: Nathan Chancellor <nathan@kernel.org> --- If you would prefer reapplying the local fix, feel free to do so, but I would like for it to be in the upstream source so it does not have to keep being applied. --- drivers/gpu/drm/amd/display/dc/dml2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 695c2c745e5dff201b75da8a1d237ce403600d04 change-id: 20241219-amdgpu-fix-enum-float-conversion-again-again-cbfd9159f76d Best regards,