drm/nouveau/bo: mark expected switch fall-through
Subsystems (3)
PATCH 1/1 drm/nouveau/bo: mark expected switch fall-through
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.
This patch fixes the following warning:
drivers/gpu/drm/nouveau/nouveau_bo.c: In function ‘nouveau_ttm_io_mem_reserve’:drivers/gpu/drm/nouveau/nouveau_bo.c:1434:53: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (drm->client.mem->oclass < NVIF_CLASS_MEM_NV50 || !mem->kind)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~
drivers/gpu/drm/nouveau/nouveau_bo.c:1438:2: note: here
case TTM_PL_VRAM:
^~~~
Warning level 3 was used: -Wimplicit-fallthrough=3
Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find.
This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +1 -1
@@ -1434,7 +1434,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg)if (drm->client.mem->oclass <NVIF_CLASS_MEM_NV50 || !mem->kind)/* untiled */ break ; -/* fallthrough, tiled memory */ +/* fall through - tiled memory */ case TTM_PL_VRAM : reg->bus.offset = reg->start <<PAGE_SHIFT ; reg->bus.base = device->func->resource_addr (device,1 );
Signature · 1 line
2.20.1
Hi,
Please drop this, as I have included this fix into the following patch, which addresses all the expected fall-throughs in drivers/gpu/drm:
https://lore.kernel.org/patchwork/patch/1042856/
Thanks
--
Gustavo
Quoted 40 lines · Gustavo A. R. Silva
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.
This patch fixes the following warning:
drivers/gpu/drm/nouveau/nouveau_bo.c: In function ‘nouveau_ttm_io_mem_reserve’:drivers/gpu/drm/nouveau/nouveau_bo.c:1434:53: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (drm->client.mem->oclass<NVIF_CLASS_MEM_NV50|| !mem->kind)~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~
drivers/gpu/drm/nouveau/nouveau_bo.c:1438:2: note: here
caseTTM_PL_VRAM:
^~~~Warning level 3 was used: -Wimplicit-fallthrough=3
Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find.
This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.
Signed-off-by Gustavo A. R. Silva <[email protected]>--- drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/nouveau/nouveau_bo.c +1
-1@@ -1434,7 +1434,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg)if (drm->client.mem->oclass <NVIF_CLASS_MEM_NV50 || !mem->kind)/* untiled */ break ; -/* fallthrough, tiled memory */ +/* fall through - tiled memory */ case TTM_PL_VRAM : reg->bus.offset = reg->start <<PAGE_SHIFT ; reg->bus.base = device->func->resource_addr (device,1 );
Hi all,
Alex Deucher requested me to send separate patches for each driver, which makes this patch available to be taken, again.
Thanks
--
Gustavo
Quoted 53 lines · Gustavo A. R. Silva
Hi,
Please drop this, as I have included this fix into the following patch, which addresses all the expected fall-throughs in
drivers/gpu/drm:https://lore.kernel.org/patchwork/patch/1042856/
Thanks
--
GustavoQuoted 40 lines · Gustavo A. R. Silva
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.
This patch fixes the following warning:
drivers/gpu/drm/nouveau/nouveau_bo.c: In function ‘nouveau_ttm_io_mem_reserve’:drivers/gpu/drm/nouveau/nouveau_bo.c:1434:53: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (drm->client.mem->oclass<NVIF_CLASS_MEM_NV50|| !mem->kind)~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~
drivers/gpu/drm/nouveau/nouveau_bo.c:1438:2: note: here
caseTTM_PL_VRAM:
^~~~Warning level 3 was used: -Wimplicit-fallthrough=3
Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find.
This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.
Signed-off-by Gustavo A. R. Silva <[email protected]>--- drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/nouveau/nouveau_bo.c +1
-1@@ -1434,7 +1434,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg)if (drm->client.mem->oclass <NVIF_CLASS_MEM_NV50 || !mem->kind)/* untiled */ break ; -/* fallthrough, tiled memory */ +/* fall through - tiled memory */ case TTM_PL_VRAM : reg->bus.offset = reg->start <<PAGE_SHIFT ; reg->bus.base = device->func->resource_addr (device,1 );