| Message ID | 20200910025532.19616-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] drm/amdkfd: Fix -Wunused-const-variable warning | expand |
On Thu, Sep 10, 2020 at 10:55:32AM +0800, YueHaibing wrote: > If KFD_SUPPORT_IOMMU_V2 is not set, gcc warns: > > drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device.c:121:37: warning: ‘raven_device_info’ defined but not used [-Wunused-const-variable=] > static const struct kfd_device_info raven_device_info = { > ^~~~~~~~~~~~~~~~~ > > Move it to ifdef block. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- Raven already has the fallback path, so it should be out of IOMMU v2 flag. You may want to move raven_device_info out of IOMMU v2 flag in kfd_supported_devices[][2] as well. Thanks, Ray > drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c > index 0e71a0543f98..cae4df259e26 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c > @@ -116,7 +116,6 @@ static const struct kfd_device_info carrizo_device_info = { > .num_xgmi_sdma_engines = 0, > .num_sdma_queues_per_engine = 2, > }; > -#endif > > static const struct kfd_device_info raven_device_info = { > .asic_family = CHIP_RAVEN, > @@ -135,6 +134,7 @@ static const struct kfd_device_info raven_device_info = { > .num_xgmi_sdma_engines = 0, > .num_sdma_queues_per_engine = 2, > }; > +#endif > > static const struct kfd_device_info hawaii_device_info = { > .asic_family = CHIP_HAWAII, > -- > 2.17.1 > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Fdri-devel&data=02%7C01%7Cray.huang%40amd.com%7Ce8805fd43e9a4ad33cd008d8555a567a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637353193795034052&sdata=HqUGjUpQtfCkZ3wA1%2F6HTCZrn%2F4%2BuQORTobzaIYa%2BNs%3D&reserved=0
On Thu, Sep 10, 2020 at 03:50:06PM +0800, YueHaibing wrote: > If KFD_SUPPORT_IOMMU_V2 is not set, gcc warns: > > drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device.c:121:37: warning: ‘raven_device_info’ defined but not used [-Wunused-const-variable=] > static const struct kfd_device_info raven_device_info = { > ^~~~~~~~~~~~~~~~~ > > As Huang Rui suggested, Raven already has the fallback path, > so it should be out of IOMMU v2 flag. > > Suggested-by: Huang Rui <ray.huang@amd.com> > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Acked-by: Huang Rui <ray.huang@amd.com> > --- > drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c > index 0e71a0543f98..e3fc6ed7b79c 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c > @@ -503,8 +503,8 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = { > #ifdef KFD_SUPPORT_IOMMU_V2 > [CHIP_KAVERI] = {&kaveri_device_info, NULL}, > [CHIP_CARRIZO] = {&carrizo_device_info, NULL}, > - [CHIP_RAVEN] = {&raven_device_info, NULL}, > #endif > + [CHIP_RAVEN] = {&raven_device_info, NULL}, > [CHIP_HAWAII] = {&hawaii_device_info, NULL}, > [CHIP_TONGA] = {&tonga_device_info, NULL}, > [CHIP_FIJI] = {&fiji_device_info, &fiji_vf_device_info}, > -- > 2.17.1 > >
Am 2020-09-10 um 3:50 a.m. schrieb YueHaibing: > If KFD_SUPPORT_IOMMU_V2 is not set, gcc warns: > > drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device.c:121:37: warning: ‘raven_device_info’ defined but not used [-Wunused-const-variable=] > static const struct kfd_device_info raven_device_info = { > ^~~~~~~~~~~~~~~~~ > > As Huang Rui suggested, Raven already has the fallback path, > so it should be out of IOMMU v2 flag. > > Suggested-by: Huang Rui <ray.huang@amd.com> > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> I applied your patch to the amd-staging-drm-next branch. Thank you, Felix > --- > drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c > index 0e71a0543f98..e3fc6ed7b79c 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c > @@ -503,8 +503,8 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = { > #ifdef KFD_SUPPORT_IOMMU_V2 > [CHIP_KAVERI] = {&kaveri_device_info, NULL}, > [CHIP_CARRIZO] = {&carrizo_device_info, NULL}, > - [CHIP_RAVEN] = {&raven_device_info, NULL}, > #endif > + [CHIP_RAVEN] = {&raven_device_info, NULL}, > [CHIP_HAWAII] = {&hawaii_device_info, NULL}, > [CHIP_TONGA] = {&tonga_device_info, NULL}, > [CHIP_FIJI] = {&fiji_device_info, &fiji_vf_device_info},
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c index 0e71a0543f98..cae4df259e26 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c @@ -116,7 +116,6 @@ static const struct kfd_device_info carrizo_device_info = { .num_xgmi_sdma_engines = 0, .num_sdma_queues_per_engine = 2, }; -#endif static const struct kfd_device_info raven_device_info = { .asic_family = CHIP_RAVEN, @@ -135,6 +134,7 @@ static const struct kfd_device_info raven_device_info = { .num_xgmi_sdma_engines = 0, .num_sdma_queues_per_engine = 2, }; +#endif static const struct kfd_device_info hawaii_device_info = { .asic_family = CHIP_HAWAII,
If KFD_SUPPORT_IOMMU_V2 is not set, gcc warns: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device.c:121:37: warning: ‘raven_device_info’ defined but not used [-Wunused-const-variable=] static const struct kfd_device_info raven_device_info = { ^~~~~~~~~~~~~~~~~ Move it to ifdef block. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)