* [PATCH -next] drm/amdkfd: Fix -Wunused-const-variable warning
@ 2020-09-10 2:55 YueHaibing
2020-09-10 7:26 ` Huang Rui
2020-09-10 7:50 ` [PATCH v2 " YueHaibing
0 siblings, 2 replies; 5+ messages in thread
From: YueHaibing @ 2020-09-10 2:55 UTC (permalink / raw)
To: Felix.Kuehling, alexander.deucher, christian.koenig, airlied,
daniel, Yong.Zhao
Cc: amd-gfx, dri-devel, linux-kernel, 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 = {
^~~~~~~~~~~~~~~~~
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(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH -next] drm/amdkfd: Fix -Wunused-const-variable warning 2020-09-10 2:55 [PATCH -next] drm/amdkfd: Fix -Wunused-const-variable warning YueHaibing @ 2020-09-10 7:26 ` Huang Rui 2020-09-10 7:50 ` [PATCH v2 " YueHaibing 1 sibling, 0 replies; 5+ messages in thread From: Huang Rui @ 2020-09-10 7:26 UTC (permalink / raw) To: YueHaibing Cc: Felix.Kuehling, alexander.deucher, christian.koenig, airlied, daniel, Yong.Zhao, dri-devel, amd-gfx, linux-kernel 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 -next] drm/amdkfd: Fix -Wunused-const-variable warning 2020-09-10 2:55 [PATCH -next] drm/amdkfd: Fix -Wunused-const-variable warning YueHaibing 2020-09-10 7:26 ` Huang Rui @ 2020-09-10 7:50 ` YueHaibing 2020-09-10 7:53 ` Huang Rui 2020-09-10 14:32 ` Felix Kuehling 1 sibling, 2 replies; 5+ messages in thread From: YueHaibing @ 2020-09-10 7:50 UTC (permalink / raw) To: Felix.Kuehling, alexander.deucher, christian.koenig, airlied, daniel, Yong.Zhao, ray.huang Cc: amd-gfx, dri-devel, linux-kernel, 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> --- 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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 -next] drm/amdkfd: Fix -Wunused-const-variable warning 2020-09-10 7:50 ` [PATCH v2 " YueHaibing @ 2020-09-10 7:53 ` Huang Rui 2020-09-10 14:32 ` Felix Kuehling 1 sibling, 0 replies; 5+ messages in thread From: Huang Rui @ 2020-09-10 7:53 UTC (permalink / raw) To: YueHaibing Cc: Kuehling, Felix, Deucher, Alexander, Koenig, Christian, airlied@linux.ie, daniel@ffwll.ch, Yong.Zhao@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org 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 > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 -next] drm/amdkfd: Fix -Wunused-const-variable warning 2020-09-10 7:50 ` [PATCH v2 " YueHaibing 2020-09-10 7:53 ` Huang Rui @ 2020-09-10 14:32 ` Felix Kuehling 1 sibling, 0 replies; 5+ messages in thread From: Felix Kuehling @ 2020-09-10 14:32 UTC (permalink / raw) To: YueHaibing, alexander.deucher, christian.koenig, airlied, daniel, Yong.Zhao, ray.huang Cc: amd-gfx, dri-devel, linux-kernel 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}, ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-10 14:37 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-09-10 2:55 [PATCH -next] drm/amdkfd: Fix -Wunused-const-variable warning YueHaibing 2020-09-10 7:26 ` Huang Rui 2020-09-10 7:50 ` [PATCH v2 " YueHaibing 2020-09-10 7:53 ` Huang Rui 2020-09-10 14:32 ` Felix Kuehling
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox