aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.c
diff options
context:
space:
mode:
authorMichel Thierry <michel.thierry@intel.com>2017-08-30 14:01:15 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2017-09-08 15:07:06 -0400
commita2d3d2655ea6d09edfcc6d9b11fb58729c8d5b95 (patch)
tree76714728c6b8ae47c2d24b5ba74f12bc3f7d8d23 /drivers/gpu/drm/i915/intel_ringbuffer.c
parent6af5d6707fcb663e93f2c48bd0694e763debd467 (diff)
drm/i915: Add a default case in gen7 hwsp switch-case
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. v2: Since reaching the default case is impossible, use GEM_BUG_ON (Chris). Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Michel Thierry <michel.thierry@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20170830180115.907-1-michel.thierry@intel.com Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index cdf084ef5aae..268342433a8e 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -402,17 +402,18 @@ static void intel_ring_setup_status_page(struct intel_engine_cs *engine)
402 */ 402 */
403 if (IS_GEN7(dev_priv)) { 403 if (IS_GEN7(dev_priv)) {
404 switch (engine->id) { 404 switch (engine->id) {
405 /*
406 * No more rings exist on Gen7. Default case is only to shut up
407 * gcc switch check warning.
408 */
409 default:
410 GEM_BUG_ON(engine->id);
405 case RCS: 411 case RCS:
406 mmio = RENDER_HWS_PGA_GEN7; 412 mmio = RENDER_HWS_PGA_GEN7;
407 break; 413 break;
408 case BCS: 414 case BCS:
409 mmio = BLT_HWS_PGA_GEN7; 415 mmio = BLT_HWS_PGA_GEN7;
410 break; 416 break;
411 /*
412 * VCS2 actually doesn't exist on Gen7. Only shut up
413 * gcc switch check warning
414 */
415 case VCS2:
416 case VCS: 417 case VCS:
417 mmio = BSD_HWS_PGA_GEN7; 418 mmio = BSD_HWS_PGA_GEN7;
418 break; 419 break;