[Intel-gfx] [PATCH] drm/i915: Add a default case in gen7 hwsp switch-case

Michel Thierry michel.thierry at intel.com
Tue Aug 29 18:55:45 UTC 2017


Gen7 won't get any new engines, and we already added VCS2 there to just
silence gcc's not-handled-in-switch warnings.

Use a default case instead, otherwise we will need to keep adding extra
cases if changes happen in the future.

Signed-off-by: Michel Thierry <michel.thierry at intel.com>
---
 drivers/gpu/drm/i915/intel_ringbuffer.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index c277a26bbd99..7d57a5971f39 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -409,10 +409,12 @@ static void intel_ring_setup_status_page(struct intel_engine_cs *engine)
 			mmio = BLT_HWS_PGA_GEN7;
 			break;
 		/*
-		 * VCS2 actually doesn't exist on Gen7. Only shut up
+		 * No more rings exist on Gen7. Only shut up
 		 * gcc switch check warning
 		 */
-		case VCS2:
+		default:
+			MISSING_CASE(engine->id);
+			/* fall through */
 		case VCS:
 			mmio = BSD_HWS_PGA_GEN7;
 			break;
-- 
2.14.1



More information about the Intel-gfx mailing list