Applied. Thanks!
On Fri, Mar 17, 2023 at 4:23 AM Lee Jones <l...@kernel.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:157:21: > note: in expansion of macro ‘mmCRTC1_DCFE_MEM_LIGHT_SLEEP_CNTL’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_transform.h:170:9: note: in > expansion of macro ‘SRI’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:183:17: > note: in expansion of macro ‘XFM_COMMON_REG_LIST_DCE60’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:188:17: > note: in expansion of macro ‘transform_regs’ > drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_6_0_d.h:722:43: > warning: initialized field overwritten [-Woverride-init] > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:157:21: > note: in expansion of macro ‘mmCRTC2_DCFE_MEM_LIGHT_SLEEP_CNTL’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_transform.h:170:9: note: in > expansion of macro ‘SRI’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:183:17: > note: in expansion of macro ‘XFM_COMMON_REG_LIST_DCE60’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:189:17: > note: in expansion of macro ‘transform_regs’ > drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_6_0_d.h:722:43: note: > (near initialization for ‘xfm_regs[2].DCFE_MEM_LIGHT_SLEEP_CN > > [100 lines snipped for brevity] > > Fixes: ceb3cf476a441 ("drm/amd/display/dc/dce60/Makefile: Ignore > -Woverride-init warning") > Cc: Harry Wentland <harry.wentl...@amd.com> > Cc: Leo Li <sunpeng...@amd.com> > Cc: Rodrigo Siqueira <rodrigo.sique...@amd.com> > Cc: Alex Deucher <alexander.deuc...@amd.com> > Cc: "Christian König" <christian.koe...@amd.com> > Cc: "Pan, Xinhui" <xinhui....@amd.com> > Cc: David Airlie <airl...@gmail.com> > Cc: Daniel Vetter <dan...@ffwll.ch> > Cc: Mauro Rossi <issor.or...@gmail.com> > Cc: amd-gfx@lists.freedesktop.org > Cc: dri-de...@lists.freedesktop.org > Signed-off-by: Lee Jones <l...@kernel.org> > --- > drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dce60/Makefile > b/drivers/gpu/drm/amd/display/dc/dce60/Makefile > index dda596fa1cd76..fee331accc0e7 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce60/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/dce60/Makefile > @@ -23,7 +23,7 @@ > # Makefile for the 'controller' sub-component of DAL. > # It provides the control and status of HW CRTC block. > > -CFLAGS_AMDDALPATH)/dc/dce60/dce60_resource.o = $(call cc-disable-warning, > override-init) > +CFLAGS_$(AMDDALPATH)/dc/dce60/dce60_resource.o = $(call cc-disable-warning, > override-init) > > DCE60 = dce60_timing_generator.o dce60_hw_sequencer.o \ > dce60_resource.o > -- > 2.40.0.rc1.284.g88254d51c5-goog >