diff options
| author | Michel Thierry | 2017-08-30 20:01:15 +0200 |
|---|---|---|
| committer | Chris Wilson | 2017-09-08 21:07:06 +0200 |
| commit | a2d3d2655ea6d09edfcc6d9b11fb58729c8d5b95 (patch) | |
| tree | 76714728c6b8ae47c2d24b5ba74f12bc3f7d8d23 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | Merge tag 'gvt-next-2017-09-08' of https://github.com/01org/gvt-linux into dr... (diff) | |
| download | kernel-qcow2-linux-a2d3d2655ea6d09edfcc6d9b11fb58729c8d5b95.tar.gz kernel-qcow2-linux-a2d3d2655ea6d09edfcc6d9b11fb58729c8d5b95.tar.xz kernel-qcow2-linux-a2d3d2655ea6d09edfcc6d9b11fb58729c8d5b95.zip | |
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.c | 11 |
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) */ if (IS_GEN7(dev_priv)) { switch (engine->id) { + /* + * No more rings exist on Gen7. Default case is only to shut up + * gcc switch check warning. + */ + default: + GEM_BUG_ON(engine->id); case RCS: mmio = RENDER_HWS_PGA_GEN7; break; case BCS: mmio = BLT_HWS_PGA_GEN7; break; - /* - * VCS2 actually doesn't exist on Gen7. Only shut up - * gcc switch check warning - */ - case VCS2: case VCS: mmio = BSD_HWS_PGA_GEN7; break; |