| Message ID | 20240605003829.4120343-1-quic_abhinavk@quicinc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3] drm/msm/a6xx: use __unused__ to fix compiler warnings for gen7_* includes | expand |
On Tue, Jun 04, 2024 at 05:38:28PM -0700, Abhinav Kumar wrote: > GCC diagnostic pragma method throws below warnings in some of the versions > > drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c:16:9: warning: unknown > option after '#pragma GCC diagnostic' kind [-Wpragmas] > #pragma GCC diagnostic ignored "-Wunused-const-variable" > ^ > In file included from drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c:18:0: > drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h:924:19: warning: > 'gen7_0_0_external_core_regs' defined but not used [-Wunused-variable] > static const u32 *gen7_0_0_external_core_regs[] = { > ^ > In file included from drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c:19:0: > drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h:748:19: warning: > 'gen7_2_0_external_core_regs' defined but not used [-Wunused-variable] > static const u32 *gen7_2_0_external_core_regs[] = { > ^ > In file included from drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c:20:0: > drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h:1188:43: warning: > 'gen7_9_0_sptp_clusters' defined but not used [-Wunused-variable] > static struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] = { > ^ > drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h:1438:19: warning: > 'gen7_9_0_external_core_regs' defined but not used [-Wunused-variable] > static const u32 *gen7_9_0_external_core_regs[] = { > > Remove GCC version dependency by using __unused__ for the unused gen7_* includes. > > Changes in v2: > - Fix the warnings in the commit text > - Use __attribute((__unused__)) instead of local assignment > > changes in v3: > - drop the Link from the auto add > > Fixes: 64d6255650d4 ("drm/msm: More fully implement devcoredump for a7xx") > Suggested-by: Rob Clark <robdclark@chromium.org> > Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > --- > drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Hi Abhinav, Just a drive by style comment. On Tue, Jun 04, 2024 at 05:38:28PM -0700, Abhinav Kumar wrote: > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c > index 0a7717a4fc2f..a958e2b3c025 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c > @@ -8,19 +8,15 @@ > #include "a6xx_gpu_state.h" > #include "a6xx_gmu.xml.h" > > -/* Ignore diagnostics about register tables that we aren't using yet. We don't > - * want to modify these headers too much from their original source. > - */ > -#pragma GCC diagnostic push > -#pragma GCC diagnostic ignored "-Wunused-variable" > -#pragma GCC diagnostic ignored "-Wunused-const-variable" > +static const unsigned int *gen7_0_0_external_core_regs[] __attribute((__unused__)); > +static const unsigned int *gen7_2_0_external_core_regs[] __attribute((__unused__)); > +static const unsigned int *gen7_9_0_external_core_regs[] __attribute((__unused__)); > +static struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] __attribute((__unused__)); Please do not open code attributes. This is available as either '__always_unused' or '__maybe_unused', depending on the context. checkpatch would have warned about this if it was '__attribute__' instead of '__attribute'. Cheers, Nathan
Hi Nathan On 6/5/2024 11:05 AM, Nathan Chancellor wrote: > Hi Abhinav, > > Just a drive by style comment. > > On Tue, Jun 04, 2024 at 05:38:28PM -0700, Abhinav Kumar wrote: >> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c >> index 0a7717a4fc2f..a958e2b3c025 100644 >> --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c >> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c >> @@ -8,19 +8,15 @@ >> #include "a6xx_gpu_state.h" >> #include "a6xx_gmu.xml.h" >> >> -/* Ignore diagnostics about register tables that we aren't using yet. We don't >> - * want to modify these headers too much from their original source. >> - */ >> -#pragma GCC diagnostic push >> -#pragma GCC diagnostic ignored "-Wunused-variable" >> -#pragma GCC diagnostic ignored "-Wunused-const-variable" >> +static const unsigned int *gen7_0_0_external_core_regs[] __attribute((__unused__)); >> +static const unsigned int *gen7_2_0_external_core_regs[] __attribute((__unused__)); >> +static const unsigned int *gen7_9_0_external_core_regs[] __attribute((__unused__)); >> +static struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] __attribute((__unused__)); > > Please do not open code attributes. This is available as either > '__always_unused' or '__maybe_unused', depending on the context. > checkpatch would have warned about this if it was '__attribute__' > instead of '__attribute'. > Thanks for the note. Let me update the patch to use __always_unused. > Cheers, > Nathan
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c index 0a7717a4fc2f..a958e2b3c025 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -8,19 +8,15 @@ #include "a6xx_gpu_state.h" #include "a6xx_gmu.xml.h" -/* Ignore diagnostics about register tables that we aren't using yet. We don't - * want to modify these headers too much from their original source. - */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-const-variable" +static const unsigned int *gen7_0_0_external_core_regs[] __attribute((__unused__)); +static const unsigned int *gen7_2_0_external_core_regs[] __attribute((__unused__)); +static const unsigned int *gen7_9_0_external_core_regs[] __attribute((__unused__)); +static struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] __attribute((__unused__)); #include "adreno_gen7_0_0_snapshot.h" #include "adreno_gen7_2_0_snapshot.h" #include "adreno_gen7_9_0_snapshot.h" -#pragma GCC diagnostic pop - struct a6xx_gpu_state_obj { const void *handle; u32 *data;
GCC diagnostic pragma method throws below warnings in some of the versions drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c:16:9: warning: unknown option after '#pragma GCC diagnostic' kind [-Wpragmas] #pragma GCC diagnostic ignored "-Wunused-const-variable" ^ In file included from drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c:18:0: drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h:924:19: warning: 'gen7_0_0_external_core_regs' defined but not used [-Wunused-variable] static const u32 *gen7_0_0_external_core_regs[] = { ^ In file included from drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c:19:0: drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h:748:19: warning: 'gen7_2_0_external_core_regs' defined but not used [-Wunused-variable] static const u32 *gen7_2_0_external_core_regs[] = { ^ In file included from drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c:20:0: drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h:1188:43: warning: 'gen7_9_0_sptp_clusters' defined but not used [-Wunused-variable] static struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] = { ^ drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h:1438:19: warning: 'gen7_9_0_external_core_regs' defined but not used [-Wunused-variable] static const u32 *gen7_9_0_external_core_regs[] = { Remove GCC version dependency by using __unused__ for the unused gen7_* includes. Changes in v2: - Fix the warnings in the commit text - Use __attribute((__unused__)) instead of local assignment changes in v3: - drop the Link from the auto add Fixes: 64d6255650d4 ("drm/msm: More fully implement devcoredump for a7xx") Suggested-by: Rob Clark <robdclark@chromium.org> Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)