aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.c
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@intel.com>2018-12-12 13:10:42 -0500
committerRodrigo Vivi <rodrigo.vivi@intel.com>2018-12-12 19:51:49 -0500
commit006900087727f675e9367eb3c3e054912ddbffdd (patch)
tree470c1a2174f67bc7ee95be0b4a62e2bfa3529530 /drivers/gpu/drm/i915/intel_ringbuffer.c
parent25db2eaf1097ff6b9169d288e9532072069adb7c (diff)
drm/i915: Rename IS_GEN to IS_GEN_RANGE
RANGE makes it longer, but clearer. We are also going to add a macro to check an individual gen, so add the _RANGE prefix here. Diff generated with: sed 's/IS_GEN(/IS_GEN_RANGE(/g' drivers/gpu/drm/i915/{*/,}*.{c,h} -i v2: use IS_GEN rather than GT_GEN Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181212181044.15886-1-lucas.demarchi@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 02f6a9b81083..720c11e0acd1 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -445,7 +445,7 @@ static void intel_ring_setup_status_page(struct intel_engine_cs *engine)
445 POSTING_READ(mmio); 445 POSTING_READ(mmio);
446 446
447 /* Flush the TLB for this page */ 447 /* Flush the TLB for this page */
448 if (IS_GEN(dev_priv, 6, 7)) { 448 if (IS_GEN_RANGE(dev_priv, 6, 7)) {
449 i915_reg_t reg = RING_INSTPM(engine->mmio_base); 449 i915_reg_t reg = RING_INSTPM(engine->mmio_base);
450 450
451 /* ring should be idle before issuing a sync flush*/ 451 /* ring should be idle before issuing a sync flush*/
@@ -679,7 +679,7 @@ static int init_render_ring(struct intel_engine_cs *engine)
679 return ret; 679 return ret;
680 680
681 /* WaTimedSingleVertexDispatch:cl,bw,ctg,elk,ilk,snb */ 681 /* WaTimedSingleVertexDispatch:cl,bw,ctg,elk,ilk,snb */
682 if (IS_GEN(dev_priv, 4, 6)) 682 if (IS_GEN_RANGE(dev_priv, 4, 6))
683 I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(VS_TIMER_DISPATCH)); 683 I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(VS_TIMER_DISPATCH));
684 684
685 /* We need to disable the AsyncFlip performance optimisations in order 685 /* We need to disable the AsyncFlip performance optimisations in order
@@ -688,7 +688,7 @@ static int init_render_ring(struct intel_engine_cs *engine)
688 * 688 *
689 * WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv 689 * WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv
690 */ 690 */
691 if (IS_GEN(dev_priv, 6, 7)) 691 if (IS_GEN_RANGE(dev_priv, 6, 7))
692 I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(ASYNC_FLIP_PERF_DISABLE)); 692 I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(ASYNC_FLIP_PERF_DISABLE));
693 693
694 /* Required for the hardware to program scanline values for waiting */ 694 /* Required for the hardware to program scanline values for waiting */
@@ -713,7 +713,7 @@ static int init_render_ring(struct intel_engine_cs *engine)
713 _MASKED_BIT_DISABLE(CM0_STC_EVICT_DISABLE_LRA_SNB)); 713 _MASKED_BIT_DISABLE(CM0_STC_EVICT_DISABLE_LRA_SNB));
714 } 714 }
715 715
716 if (IS_GEN(dev_priv, 6, 7)) 716 if (IS_GEN_RANGE(dev_priv, 6, 7))
717 I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING)); 717 I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING));
718 718
719 if (INTEL_GEN(dev_priv) >= 6) 719 if (INTEL_GEN(dev_priv) >= 6)