On Fri, Jan 8, 2021 at 3:15 PM Lee Jones <lee.jones@xxxxxxxxxx> wrote: > > And only declare it if it's to be used. > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_dmcu.h:320:23: warning: ‘abm_gain_stepsize’ defined but not used [-Wunused-const-variable=] > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_dmcu.h:320:23: warning: ‘abm_gain_stepsize’ defined but not used [-Wunused-const-variable=] > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_dmcu.h:320:23: warning: ‘abm_gain_stepsize’ defined but not used [-Wunused-const-variable=] > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_dmcu.h:320:23: warning: ‘abm_gain_stepsize’ defined but not used [-Wunused-const-variable=] > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_dmcu.h:320:23: warning: ‘abm_gain_stepsize’ defined but not used [-Wunused-const-variable=] > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_dmcu.h:320:23: warning: ‘abm_gain_stepsize’ defined but not used [-Wunused-const-variable=] > drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_dmcu.h:320:23: warning: ‘abm_gain_stepsize’ defined but not used [-Wunused-const-variable=] > > Cc: Harry Wentland <harry.wentland@xxxxxxx> > Cc: Leo Li <sunpeng.li@xxxxxxx> > Cc: Alex Deucher <alexander.deucher@xxxxxxx> > Cc: "Christian König" <christian.koenig@xxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> > Cc: Mauro Rossi <issor.oruam@xxxxxxxxx> > Cc: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx > Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 4 ++++ > drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 2 -- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c > index fa2b47d41ee2f..30264fc151a2b 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c > +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c > @@ -65,6 +65,10 @@ > //Register access policy version > #define mmMP0_SMN_C2PMSG_91 0x1609B > > +#if defined(CONFIG_DRM_AMD_DC_DCN) > +static const uint32_t abm_gain_stepsize = 0x0060; > +#endif > + > static bool dce_dmcu_init(struct dmcu *dmcu) > { > // Do nothing > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h > index 93e7f34d4775e..cefb7f5bf42cc 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h > +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h > @@ -317,6 +317,4 @@ struct dmcu *dcn21_dmcu_create( > > void dce_dmcu_destroy(struct dmcu **dmcu); > > -static const uint32_t abm_gain_stepsize = 0x0060; > - > #endif /* _DCE_ABM_H_ */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel