Skip to contentSkip to conversation

drm: radeon: annotate implicit fall through

PATCH In review Mathieu Malaterre 2 participants 4 messages Jan 14, 2019 – Jun 14, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm: radeon: annotate implicit fall through

There is a plan to build the kernel with -Wimplicit-fallthrough and this place in the code produced a warning (W=1).

This commit remove the following warning:

drivers/gpu/drm/radeon/evergreen_cs.c:1301:11: warning: this statement may fall through [-Wimplicit-fallthrough=]

---
 drivers/gpu/drm/radeon/evergreen_cs.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/radeon/evergreen_cs.c +1 -0
index f471537c852f..fbf346185790 100644
@@ -1299,6 +1299,7 @@ static int evergreen_cs_handle_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
 			return -EINVAL;
 		}
 		ib[idx] += (u32)((reloc->gpu_offset >> 8) & 0xffffffff);
+		/* fall through */
 	case CB_TARGET_MASK:
 		track->cb_target_mask = radeon_get_ib_value(p, idx);
 		track->cb_dirty = true;
Signature · 1 line
2.19.2
#1 lore raw
Quoted 18 lines · Mathieu Malaterre

There is a plan to build the kernel with -Wimplicit-fallthrough and this place in the code produced a warning (W=1).

This commit remove the following warning:

drivers/gpu/drm/radeon/evergreen_cs.c:1301:11: warning: this statement may fall through [-Wimplicit-fallthrough=]

---
 drivers/gpu/drm/radeon/evergreen_cs.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/radeon/evergreen_cs.c +0 -0
index f471537c852f..fbf346185790 100644

drivers/gpu/drm/radeon/evergreen_cs.c static int evergreen_cs_handle_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) · line 1302

Quoted 4 lines
drivers/gpu/drm/radeon/evergreen_cs.c +1 -0
@@ -1299,6 +1299,7 @@ static int evergreen_cs_handle_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
                        return -EINVAL;
                }
                ib[idx] += (u32)((reloc->gpu_offset >> 8) & 0xffffffff);
+               /* fall through */

I think this should actually be a break here.

Alex

Quoted 10 lines
drivers/gpu/drm/radeon/evergreen_cs.c +0 -1
        case CB_TARGET_MASK:
                track->cb_target_mask = radeon_get_ib_value(p, idx);
                track->cb_dirty = true;
--

2.19.2

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#2 lore raw

PATCH v2 1/1 drm: radeon: add a missing break in evergreen_cs_handle_reg

In reply to Mathieu Malaterre

In commit dd220a00e8bd ("drm/radeon/kms: add support for streamout v7") case statements were added without a terminating break statement. This commit adds the missing break. This was discovered during a compilation with W=1.

This commit removes the following warning:

drivers/gpu/drm/radeon/evergreen_cs.c:1301:11: warning: this statement may fall through [-Wimplicit-fallthrough=]

Fixes dd220a00e8bd ("drm/radeon/kms: add support for streamout v7")

---
v2: Add missing break statement, instead of marking it as fall through

 drivers/gpu/drm/radeon/evergreen_cs.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/radeon/evergreen_cs.c +1 -0
index f471537c852f..1e14c6921454 100644
@@ -1299,6 +1299,7 @@ static int evergreen_cs_handle_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
 			return -EINVAL;
 		}
 		ib[idx] += (u32)((reloc->gpu_offset >> 8) & 0xffffffff);
+		break;
 	case CB_TARGET_MASK:
 		track->cb_target_mask = radeon_get_ib_value(p, idx);
 		track->cb_dirty = true;
Signature · 1 line
2.19.2
#3 lore raw

Re: [PATCH v2] drm: radeon: add a missing break in evergreen_cs_handle_reg

Quoted 8 lines · Mathieu Malaterre

In commit dd220a00e8bd ("drm/radeon/kms: add support for streamout v7") case statements were added without a terminating break statement. This commit adds the missing break. This was discovered during a compilation with W=1.

This commit removes the following warning:

Quoted 7 lines

drivers/gpu/drm/radeon/evergreen_cs.c:1301:11: warning: this statement may fall through [-Wimplicit-fallthrough=]

Fixes dd220a00e8bd ("drm/radeon/kms: add support for streamout v7")

---
v2: Add missing break statement, instead of marking it as fall through

Replaced by:

cc5034a5d293 drm/radeon/evergreen_cs: fix missing break in switch statement

Quoted 18 lines
 drivers/gpu/drm/radeon/evergreen_cs.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/radeon/evergreen_cs.c +1 -1
index f471537c852f..1e14c6921454 100644
@@ -1299,6 +1299,7 @@ static int evergreen_cs_handle_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
                        return -EINVAL;
                }
                ib[idx] += (u32)((reloc->gpu_offset >> 8) & 0xffffffff);
+               break;
        case CB_TARGET_MASK:
                track->cb_target_mask = radeon_get_ib_value(p, idx);
                track->cb_dirty = true;
--

2.19.2