aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhao Yakui <yakui.zhao@intel.com>2014-04-16 22:37:39 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-05-05 03:08:48 -0400
commit77fe2ff3db150736ac24512f42caf28a16aa918b (patch)
treeffdeb929d6bb7a16cf5dc9d314d1f522e6cc3408
parent85f9b5f9c48abdbcbeacdd5a6daf76c63eba8c83 (diff)
drm/i915:Add the VCS2 switch in Intel_ring_setup_status_page
The Gen7 doesn't have the second BSD ring. But it will complain the switch check warning message during compilation. So just add it to remove the switch check warning. V1->V2: Follow Daniel's comment to update the comment Reviewed-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index ffb013dc910e..ab22d70733bf 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -994,6 +994,11 @@ void intel_ring_setup_status_page(struct intel_ring_buffer *ring)
994 case BCS: 994 case BCS:
995 mmio = BLT_HWS_PGA_GEN7; 995 mmio = BLT_HWS_PGA_GEN7;
996 break; 996 break;
997 /*
998 * VCS2 actually doesn't exist on Gen7. Only shut up
999 * gcc switch check warning
1000 */
1001 case VCS2:
997 case VCS: 1002 case VCS:
998 mmio = BSD_HWS_PGA_GEN7; 1003 mmio = BSD_HWS_PGA_GEN7;
999 break; 1004 break;