Applied. Thanks!
On Wed, May 26, 2021 at 4:48 AM Lee Jones <[email protected]> wrote: > > Fixes the following W=1 kernel build warning(s): > > In file included from > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:29: > > drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_6_0_sh_mask.h:7270:45: > warning: initialized field overwritten [-Woverride-init] > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_mem_input.h:155:28: note: > in expansion of macro ‘GRPH_CONTROL__GRPH_NUM_BANKS__SHIFT’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_mem_input.h:159:2: note: in > expansion of macro ‘SFB’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_mem_input.h:265:2: note: in > expansion of macro ‘MI_GFX6_TILE_MASK_SH_LIST’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:657:3: note: > in expansion of macro ‘MI_DCE6_MASK_SH_LIST’ > > drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_6_0_sh_mask.h:7270:45: > note: (near initialization for ‘mi_shifts.GRPH_NUM_BANKS’) > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_mem_input.h:155:28: note: > in expansion of macro ‘GRPH_CONTROL__GRPH_NUM_BANKS__SHIFT’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_mem_input.h:159:2: note: in > expansion of macro ‘SFB’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_mem_input.h:265:2: note: in > expansion of macro ‘MI_GFX6_TILE_MASK_SH_LIST’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:657:3: note: > in expansion of macro ‘MI_DCE6_MASK_SH_LIST’ > > drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_6_0_sh_mask.h:7269:43: > warning: initialized field overwritten [-Woverride-init] > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_mem_input.h:155:28: note: > in expansion of macro ‘GRPH_CONTROL__GRPH_NUM_BANKS_MASK’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_mem_input.h:159:2: note: in > expansion of macro ‘SFB’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_mem_input.h:265:2: note: in > expansion of macro ‘MI_GFX6_TILE_MASK_SH_LIST’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:662:3: note: > in expansion of macro ‘MI_DCE6_MASK_SH_LIST’ > > drivers/gpu/drm/amd/amdgpu/../include/asic_reg/dce/dce_6_0_sh_mask.h:7269:43: > note: (near initialization for ‘mi_masks.GRPH_NUM_BANKS’) > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_mem_input.h:155:28: note: > in expansion of macro ‘GRPH_CONTROL__GRPH_NUM_BANKS_MASK’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_mem_input.h:159:2: note: in > expansion of macro ‘SFB’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_mem_input.h:265:2: note: in > expansion of macro ‘MI_GFX6_TILE_MASK_SH_LIST’ > drivers/gpu/drm/amd/amdgpu/../display/dc/dce60/dce60_resource.c:662:3: note: > in expansion of macro ‘MI_DCE6_MASK_SH_LIST’ > > Cc: Harry Wentland <[email protected]> > Cc: Leo Li <[email protected]> > Cc: Alex Deucher <[email protected]> > Cc: "Christian König" <[email protected]> > Cc: David Airlie <[email protected]> > Cc: Daniel Vetter <[email protected]> > Cc: Mauro Rossi <[email protected]> > Cc: [email protected] > Cc: [email protected] > Signed-off-by: Lee Jones <[email protected]> > --- > drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h > b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h > index 23db5c72f07ed..9b1c4d56275a4 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h > +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h > @@ -181,7 +181,6 @@ struct dce_mem_input_registers { > SFB(blk, GRPH_ENABLE, GRPH_ENABLE, mask_sh),\ > SFB(blk, GRPH_CONTROL, GRPH_DEPTH, mask_sh),\ > SFB(blk, GRPH_CONTROL, GRPH_FORMAT, mask_sh),\ > - SFB(blk, GRPH_CONTROL, GRPH_NUM_BANKS, mask_sh),\ > SFB(blk, GRPH_X_START, GRPH_X_START, mask_sh),\ > SFB(blk, GRPH_Y_START, GRPH_Y_START, mask_sh),\ > SFB(blk, GRPH_X_END, GRPH_X_END, mask_sh),\ > -- > 2.31.1 >
