drm/i915: remove parens around revision ids
Subsystems (2)
PATCH 1/3 drm/i915: remove parens around revision ids
Totally unnecessary.
--- drivers/gpu/drm/i915/i915_drv.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +10 -10
@@ -2501,16 +2501,16 @@ struct drm_i915_cmd_table {#define IS_PRELIMINARY_HW (intel_info) ((intel_info)->is_preliminary) -#define SKL_REVID_A0 (0x0) -#define SKL_REVID_B0 (0x1) -#define SKL_REVID_C0 (0x2) -#define SKL_REVID_D0 (0x3) -#define SKL_REVID_E0 (0x4) -#define SKL_REVID_F0 (0x5) - -#define BXT_REVID_A0 (0x0) -#define BXT_REVID_B0 (0x3) -#define BXT_REVID_C0 (0x9) +#define SKL_REVID_A0 0x0 +#define SKL_REVID_B0 0x1 +#define SKL_REVID_C0 0x2 +#define SKL_REVID_D0 0x3 +#define SKL_REVID_E0 0x4 +#define SKL_REVID_F0 0x5 + +#define BXT_REVID_A0 0x0 +#define BXT_REVID_B0 0x3 +#define BXT_REVID_C0 0x9/* * The genX designation typically refers to the render engine, so render
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915/bxt: add revision id for A1 stepping and use it
Prefer inclusive ranges for revision checks rather than "below B0". Per specs A2 is not used, so revid <= A1 matches revid < B0.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 8 ++++---- drivers/gpu/drm/i915/intel_pm.c | 6 +++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +++--- 9 files changed, 16 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -2509,6 +2509,7 @@ struct drm_i915_cmd_table {#define SKL_REVID_F0 0x5#define BXT_REVID_A0 0x0 +#define BXT_REVID_A1 0x1#define BXT_REVID_B0 0x3#define BXT_REVID_C0 0x9
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -3757,7 +3757,7 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,* cacheline, whereas normally such cachelines would get * invalidated. */ -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )return -ENODEV ; level =I915_CACHE_LLC ;
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
@@ -161,7 +161,7 @@ static int host2guc_sample_forcewake(struct intel_guc *guc, data[0 ] =HOST2GUC_ACTION_SAMPLE_FORCEWAKE ;/* WaRsDisableCoarsePowerGating:skl,bxt */ if (!intel_enable_rc6 (dev_priv->dev) || - (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) || (IS_SKL_GT3 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 )) || (IS_SKL_GT4 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 ))) data[1 ] =0 ;
drivers/gpu/drm/i915/intel_ddi.c +1 -1
@@ -3247,7 +3247,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)* On BXT A0/A1, sw needs to activate DDIA HPD logic and * interrupts to check the external panel connection. */ -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 ) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 ) && port ==PORT_B ) dev_priv->hotplug.irq_port[PORT_A ] = intel_dig_port;else
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -6087,7 +6087,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,break ;case PORT_B : intel_encoder->hpd_pin =HPD_PORT_B ; -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) intel_encoder->hpd_pin =HPD_PORT_A ;break ;case PORT_C :
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
@@ -2068,7 +2068,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,* On BXT A0/A1, sw needs to activate DDIA HPD logic and * interrupts to check the external panel connection. */ -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) intel_encoder->hpd_pin =HPD_PORT_A ;else intel_encoder->hpd_pin =HPD_PORT_B ;
drivers/gpu/drm/i915/intel_lrc.c +4 -4
@@ -1986,7 +1986,7 @@ static int logical_render_ring_init(struct drm_device *dev) ring->init_hw = gen8_init_render_ring; ring->init_context = gen8_init_rcs_context; ring->cleanup = intel_fini_pipe_control; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {
@@ -2038,7 +2038,7 @@ static int logical_bsd_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {
@@ -2093,7 +2093,7 @@ static int logical_blt_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {
@@ -2123,7 +2123,7 @@ static int logical_vebox_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {
drivers/gpu/drm/i915/intel_pm.c +3 -3
@@ -4348,7 +4348,7 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)struct drm_i915_private *dev_priv = dev->dev_private;/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */ -if (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 ))return ;WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock));
@@ -4672,7 +4672,7 @@ static void gen9_enable_rps(struct drm_device *dev)gen6_init_rps_frequencies (dev);/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */ -if (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) { +if (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) {intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );return ; }
@@ -4758,7 +4758,7 @@ static void gen9_enable_rc6(struct drm_device *dev)* 3b: Enable Coarse Power Gating only when RC6 is enabled. * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6. */ -if ((IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || +if ((IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) || ((IS_SKL_GT3 (dev) ||IS_SKL_GT4 (dev)) && (INTEL_REVID (dev) <=SKL_REVID_E0 )))I915_WRITE (GEN9_PG_ENABLE ,0 );else
drivers/gpu/drm/i915/intel_ringbuffer.c +3 -3
@@ -916,14 +916,14 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) ==SKL_REVID_A0 ||INTEL_REVID (dev) ==SKL_REVID_B0 )) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) { + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )) {/* WaDisableDgMirrorFixInHalfSliceChicken5:skl,bxt */ WA_CLR_BIT_MASKED (GEN9_HALF_SLICE_CHICKEN5 ,GEN9_DG_MIRROR_FIX_ENABLE ); }if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) { + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )) {/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ WA_SET_BIT_MASKED (GEN7_COMMON_SLICE_CHICKEN1 ,GEN9_RHWO_OPTIMIZATION_DISABLE );
@@ -952,7 +952,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* WaDisableMaskBasedCammingInRCC:skl,bxt */ if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) ==SKL_REVID_C0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ))WA_SET_BIT_MASKED (SLICE_ECO_CHICKEN0 ,PIXEL_MASK_CAMMING_DISABLE );
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915/bxt: add revision id for A1 stepping and use it
Quoted 2 lines · Jani Nikula
Prefer inclusive ranges for revision checks rather than "below B0". Per specs A2 is not used, so revid <= A1 matches revid < B0.
The w/a db would say UNTIL_B0 etc., so might be easier to check against it if we keep to the same convention.
Quoted 199 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 8 ++++---- drivers/gpu/drm/i915/intel_pm.c | 6 +++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +++--- 9 files changed, 16 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -2509,6 +2509,7 @@ struct drm_i915_cmd_table {#define SKL_REVID_F0 0x5#define BXT_REVID_A0 0x0 +#define BXT_REVID_A1 0x1#define BXT_REVID_B0 0x3#define BXT_REVID_C0 0x9drivers/gpu/drm/i915/i915_gem.c +1
-1@@ -3757,7 +3757,7 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,* cacheline, whereas normally such cachelines would get * invalidated. */ -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )return -ENODEV ; level =I915_CACHE_LLC ;drivers/gpu/drm/i915/i915_guc_submission.c +1
-1@@ -161,7 +161,7 @@ static int host2guc_sample_forcewake(struct intel_guc *guc, data[0 ] =HOST2GUC_ACTION_SAMPLE_FORCEWAKE ;/* WaRsDisableCoarsePowerGating:skl,bxt */ if (!intel_enable_rc6 (dev_priv->dev) || - (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) || (IS_SKL_GT3 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 )) || (IS_SKL_GT4 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 ))) data[1 ] =0 ;drivers/gpu/drm/i915/intel_ddi.c +1
-1@@ -3247,7 +3247,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)* On BXT A0/A1, sw needs to activate DDIA HPD logic and * interrupts to check the external panel connection. */ -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 ) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 ) && port ==PORT_B ) dev_priv->hotplug.irq_port[PORT_A ] = intel_dig_port;else drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -6087,7 +6087,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,break ;case PORT_B : intel_encoder->hpd_pin =HPD_PORT_B ; -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) intel_encoder->hpd_pin =HPD_PORT_A ;break ;case PORT_C :drivers/gpu/drm/i915/intel_hdmi.c +1
-1@@ -2068,7 +2068,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,* On BXT A0/A1, sw needs to activate DDIA HPD logic and * interrupts to check the external panel connection. */ -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) intel_encoder->hpd_pin =HPD_PORT_A ;else intel_encoder->hpd_pin =HPD_PORT_B ;drivers/gpu/drm/i915/intel_lrc.c +4
-4@@ -1986,7 +1986,7 @@ static int logical_render_ring_init(struct drm_device *dev) ring->init_hw = gen8_init_render_ring; ring->init_context = gen8_init_rcs_context; ring->cleanup = intel_fini_pipe_control; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2038,7 +2038,7 @@ static int logical_bsd_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2093,7 +2093,7 @@ static int logical_blt_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2123,7 +2123,7 @@ static int logical_vebox_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {drivers/gpu/drm/i915/intel_pm.c +3
-3@@ -4348,7 +4348,7 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)struct drm_i915_private *dev_priv = dev->dev_private;/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */ -if (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 ))return ;WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock));@@ -4672,7 +4672,7 @@ static void gen9_enable_rps(struct drm_device *dev)gen6_init_rps_frequencies (dev);/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */ -if (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) { +if (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) {intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );return ; }@@ -4758,7 +4758,7 @@ static void gen9_enable_rc6(struct drm_device *dev)* 3b: Enable Coarse Power Gating only when RC6 is enabled. * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6. */ -if ((IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || +if ((IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) || ((IS_SKL_GT3 (dev) ||IS_SKL_GT4 (dev)) && (INTEL_REVID (dev) <=SKL_REVID_E0 )))I915_WRITE (GEN9_PG_ENABLE ,0 );else drivers/gpu/drm/i915/intel_ringbuffer.c +3
-3@@ -916,14 +916,14 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) ==SKL_REVID_A0 ||INTEL_REVID (dev) ==SKL_REVID_B0 )) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) { + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )) {/* WaDisableDgMirrorFixInHalfSliceChicken5:skl,bxt */ WA_CLR_BIT_MASKED (GEN9_HALF_SLICE_CHICKEN5 ,GEN9_DG_MIRROR_FIX_ENABLE ); }if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) { + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )) {/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ WA_SET_BIT_MASKED (GEN7_COMMON_SLICE_CHICKEN1 ,GEN9_RHWO_OPTIMIZATION_DISABLE );@@ -952,7 +952,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* WaDisableMaskBasedCammingInRCC:skl,bxt */ if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) ==SKL_REVID_C0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ))WA_SET_BIT_MASKED (SLICE_ECO_CHICKEN0 ,PIXEL_MASK_CAMMING_DISABLE );Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915/bxt: add revision id for A1 stepping and use it
Quoted 6 lines · Ville Syrjälä
Quoted 2 lines · Jani Nikula
Prefer inclusive ranges for revision checks rather than "below B0". Per specs A2 is not used, so revid <= A1 matches revid < B0.
The w/a db would say
UNTIL_B0etc., so might be easier to check against it if we keep to the same convention.
So I wanted to double check what the convention is. I picked WaRsDisableCoarsePowerGating.
KBL - SIWA_FOREVER
BXT - SI_WA_BEFORE(BXT_REV_ID_B0)
SKL - SIWA_UNTIL_SKL_E0
Description "Disable coarse power gating for GT4 until GT F0 stepping."
*rolls eyes*
So is that "until" there inclusive or non-inclusive? The db is contradicting itself... Cc: Sarah who has also looked at workarounds recently.
Rodrigo, for one thing, I'll want workarounds for SKL and KBL in different conditions instead of conflated into SKL!
But what about this non-inclusive end of range? It'll matter in patch 3/3. It's not so much a problem for ranges, but rather for specific revisions, where you'd have to include a revision not mentioned in the spec at all, e.g. for B0 only:
IS_SKL_REVID(dev, SKL_REVID_B0, SKL_REVID_C0)
instead of the current proposal:
IS_SKL_REVID(dev, SKL_REVID_B0, SKL_REVID_B0)
I'm not really fond of adding separate macros for checking specific vs. ranges.
Thoughts?
BR,
Jani.
Quoted 204 lines
Quoted 200 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 8 ++++---- drivers/gpu/drm/i915/intel_pm.c | 6 +++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +++--- 9 files changed, 16 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -2509,6 +2509,7 @@ struct drm_i915_cmd_table {#define SKL_REVID_F0 0x5#define BXT_REVID_A0 0x0 +#define BXT_REVID_A1 0x1#define BXT_REVID_B0 0x3#define BXT_REVID_C0 0x9drivers/gpu/drm/i915/i915_gem.c +1
-1@@ -3757,7 +3757,7 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,* cacheline, whereas normally such cachelines would get * invalidated. */ -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )return -ENODEV ; level =I915_CACHE_LLC ;drivers/gpu/drm/i915/i915_guc_submission.c +1
-1@@ -161,7 +161,7 @@ static int host2guc_sample_forcewake(struct intel_guc *guc, data[0 ] =HOST2GUC_ACTION_SAMPLE_FORCEWAKE ;/* WaRsDisableCoarsePowerGating:skl,bxt */ if (!intel_enable_rc6 (dev_priv->dev) || - (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) || (IS_SKL_GT3 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 )) || (IS_SKL_GT4 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 ))) data[1 ] =0 ;drivers/gpu/drm/i915/intel_ddi.c +1
-1@@ -3247,7 +3247,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)* On BXT A0/A1, sw needs to activate DDIA HPD logic and * interrupts to check the external panel connection. */ -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 ) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 ) && port ==PORT_B ) dev_priv->hotplug.irq_port[PORT_A ] = intel_dig_port;else drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -6087,7 +6087,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,break ;case PORT_B : intel_encoder->hpd_pin =HPD_PORT_B ; -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) intel_encoder->hpd_pin =HPD_PORT_A ;break ;case PORT_C :drivers/gpu/drm/i915/intel_hdmi.c +1
-1@@ -2068,7 +2068,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,* On BXT A0/A1, sw needs to activate DDIA HPD logic and * interrupts to check the external panel connection. */ -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) intel_encoder->hpd_pin =HPD_PORT_A ;else intel_encoder->hpd_pin =HPD_PORT_B ;drivers/gpu/drm/i915/intel_lrc.c +4
-4@@ -1986,7 +1986,7 @@ static int logical_render_ring_init(struct drm_device *dev) ring->init_hw = gen8_init_render_ring; ring->init_context = gen8_init_rcs_context; ring->cleanup = intel_fini_pipe_control; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2038,7 +2038,7 @@ static int logical_bsd_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2093,7 +2093,7 @@ static int logical_blt_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2123,7 +2123,7 @@ static int logical_vebox_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {drivers/gpu/drm/i915/intel_pm.c +3
-3@@ -4348,7 +4348,7 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)struct drm_i915_private *dev_priv = dev->dev_private;/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */ -if (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 ))return ;WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock));@@ -4672,7 +4672,7 @@ static void gen9_enable_rps(struct drm_device *dev)gen6_init_rps_frequencies (dev);/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */ -if (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) { +if (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) {intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );return ; }@@ -4758,7 +4758,7 @@ static void gen9_enable_rc6(struct drm_device *dev)* 3b: Enable Coarse Power Gating only when RC6 is enabled. * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6. */ -if ((IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || +if ((IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) || ((IS_SKL_GT3 (dev) ||IS_SKL_GT4 (dev)) && (INTEL_REVID (dev) <=SKL_REVID_E0 )))I915_WRITE (GEN9_PG_ENABLE ,0 );else drivers/gpu/drm/i915/intel_ringbuffer.c +3
-3@@ -916,14 +916,14 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) ==SKL_REVID_A0 ||INTEL_REVID (dev) ==SKL_REVID_B0 )) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) { + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )) {/* WaDisableDgMirrorFixInHalfSliceChicken5:skl,bxt */ WA_CLR_BIT_MASKED (GEN9_HALF_SLICE_CHICKEN5 ,GEN9_DG_MIRROR_FIX_ENABLE ); }if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) { + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )) {/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ WA_SET_BIT_MASKED (GEN7_COMMON_SLICE_CHICKEN1 ,GEN9_RHWO_OPTIMIZATION_DISABLE );@@ -952,7 +952,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* WaDisableMaskBasedCammingInRCC:skl,bxt */ if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) ==SKL_REVID_C0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ))WA_SET_BIT_MASKED (SLICE_ECO_CHICKEN0 ,PIXEL_MASK_CAMMING_DISABLE );Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 2 lines
Ville Syrjälä Intel OTC
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerRe: [PATCH 2/3] drm/i915/bxt: add revision id for A1 stepping and use it
Quoted 21 lines · Jani Nikula
Quoted 8 lines · Ville Syrjälä
Quoted 3 lines · Jani Nikula
Prefer inclusive ranges for revision checks rather than "below B0". Per
specs A2 is not used, so revid <= A1 matches revid < B0.The w/a db would say
UNTIL_B0etc., so might be easier to check against
it if we keep to the same convention.So I wanted to double check what the convention is. I picked WaRsDisableCoarsePowerGating.
KBL -
SIWA_FOREVER
BXT -SI_WA_BEFORE(BXT_REV_ID_B0)
SKL -SIWA_UNTIL_SKL_E0Description "Disable coarse power gating for GT4 until GT F0 stepping."
Quoted 8 lines
*rolls eyes*
So is that "until" there inclusive or non-inclusive? The db is contradicting itself... Cc: Sarah who has also looked at workarounds recently.
Rodrigo, for one thing, I'll want workarounds for SKL and KBL in different conditions instead of conflated into SKL!
I agree with Ville that <= REVID matches the spec in sense of "until" certain stepping and I like this.
Also KBL W/A doesn't conflict with SKL W/as in they way they were derivated...
Quoted 13 lines
But what about this non-inclusive end of range? It'll matter in patch 3/3. It's not so much a problem for ranges, but rather for specific revisions, where you'd have to include a revision not mentioned in the
spec at all, e.g. for B0 only:IS_SKL_REVID(dev, SKL_REVID_B0, SKL_REVID_C0)instead of the current proposal:
IS_SKL_REVID(dev, SKL_REVID_B0, SKL_REVID_B0)
Quoted 293 lines
I'm not really fond of adding separate macros for checking specific vs. ranges.
Thoughts?
BR,
Jani.Quoted 280 lines
Quoted 276 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 8 ++++---- drivers/gpu/drm/i915/intel_pm.c | 6 +++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +++--- 9 files changed, 16 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -2509,6 +2509,7 @@ struct drm_i915_cmd_table {#define SKL_REVID_F0 0x5#define BXT_REVID_A0 0x0 +#define BXT_REVID_A1 0x1#define BXT_REVID_B0 0x3#define BXT_REVID_C0 0x9drivers/gpu/drm/i915/i915_gem.c +0
-0@@ -3757,7 +3757,7 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data, * cacheline, whereas normally such cachelineswould get
drivers/gpu/drm/i915/i915_gem.c +0
-1* invalidated. */ - if (IS_BROXTON(dev) && INTEL_REVID(dev) <
BXT_REVID_B0)drivers/gpu/drm/i915/i915_gem.c +1
-0+ if (IS_BROXTON(dev) && INTEL_REVID(dev) <=
BXT_REVID_A1)drivers/gpu/drm/i915/i915_gem.c +0
-0return -ENODEV ; level =I915_CACHE_LLC ;drivers/gpu/drm/i915/i915_guc_submission.c +0
-1@@ -161,7 +161,7 @@ static int host2guc_sample_forcewake(structintel_guc *guc, data[0 ] =HOST2GUC_ACTION_SAMPLE_FORCEWAKE ;/* WaRsDisableCoarsePowerGating:skl,bxt */ if (!intel_enable_rc6(dev_priv->dev) || - (IS_BROXTON(dev) && (INTEL_REVID(dev) <
BXT_REVID_B0)) ||drivers/gpu/drm/i915/i915_guc_submission.c +1
-0+ (IS_BROXTON(dev) && (INTEL_REVID(dev) <=
BXT_REVID_A1)) ||
(IS_SKL_GT3(dev)&& (INTEL_REVID(dev)<=SKL_REVID_E0)) ||
(IS_SKL_GT4(dev)&& (INTEL_REVID(dev)<=SKL_REVID_E0)))drivers/gpu/drm/i915/i915_guc_submission.c +0
-0data[1 ] =0 ;drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -3247,7 +3247,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) * On BXT A0/A1, sw needs to activate DDIA HPDlogic and
* interrupts to check the external panel
connection.drivers/gpu/drm/i915/intel_ddi.c +0
-1*/ - if (IS_BROXTON(dev_priv) && (INTEL_REVID(dev) <
BXT_REVID_B0)drivers/gpu/drm/i915/intel_ddi.c +1
-0+ if (IS_BROXTON(dev_priv) && (INTEL_REVID(dev) <=
BXT_REVID_A1)drivers/gpu/drm/i915/intel_ddi.c +0
-0&& port == PORT_B) dev_priv->hotplug.irq_port[PORT_A] =
intel_dig_port;drivers/gpu/drm/i915/intel_ddi.c +0
-0else drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -6087,7 +6087,7 @@ intel_dp_init_connector(structintel_digital_port *intel_dig_port, break;case PORT_B : intel_encoder->hpd_pin =HPD_PORT_B ; -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) < BXT_REVID_B0)) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 ))drivers/gpu/drm/i915/intel_dp.c +0
-0intel_encoder->hpd_pin =HPD_PORT_A ;break ;case PORT_C :drivers/gpu/drm/i915/intel_hdmi.c +0
-0@@ -2068,7 +2068,7 @@ void intel_hdmi_init_connector(structintel_digital_port *intel_dig_port, * On BXT A0/A1, sw needs to activate DDIA HPDlogic and
* interrupts to check the external panel
connection.drivers/gpu/drm/i915/intel_hdmi.c +0
-1*/ - if (IS_BROXTON(dev_priv) && (INTEL_REVID(dev) <
BXT_REVID_B0))drivers/gpu/drm/i915/intel_hdmi.c +1
-0+ if (IS_BROXTON(dev_priv) && (INTEL_REVID(dev) <=
BXT_REVID_A1))drivers/gpu/drm/i915/intel_hdmi.c +0
-0intel_encoder->hpd_pin =HPD_PORT_A ; else intel_encoder->hpd_pin = HPD_PORT_B;drivers/gpu/drm/i915/intel_lrc.c +1
-1@@ -1986,7 +1986,7 @@ static int logical_render_ring_init(struct drm_device *dev) ring->init_hw = gen8_init_render_ring; ring->init_context = gen8_init_rcs_context; ring->cleanup = intel_fini_pipe_control; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) {drivers/gpu/drm/i915/intel_lrc.c +1
-1ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2038,7 +2038,7 @@ static int logical_bsd_ring_init(struct drm_device *dev) GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ){
drivers/gpu/drm/i915/intel_lrc.c +1
-1ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2093,7 +2093,7 @@ static int logical_blt_ring_init(struct drm_device *dev) GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ){
drivers/gpu/drm/i915/intel_lrc.c +1
-1ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2123,7 +2123,7 @@ static int logical_vebox_ring_init(struct drm_device *dev) GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ){
drivers/gpu/drm/i915/intel_lrc.c +0
-0ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -4348,7 +4348,7 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)struct drm_i915_private *dev_priv = dev->dev_private;/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
drivers/gpu/drm/i915/intel_pm.c +0
-1- if (IS_BROXTON(dev) && (INTEL_REVID(dev) <
BXT_REVID_B0))drivers/gpu/drm/i915/intel_pm.c +1
-0+ if (IS_BROXTON(dev) && (INTEL_REVID(dev) <=
BXT_REVID_A1))drivers/gpu/drm/i915/intel_pm.c +0
-0return ;WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock));@@ -4672,7 +4672,7 @@ static void gen9_enable_rps(struct drm_device *dev)gen6_init_rps_frequencies (dev );/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
drivers/gpu/drm/i915/intel_pm.c +0
-1- if (IS_BROXTON(dev) && (INTEL_REVID(dev) <
BXT_REVID_B0)) {drivers/gpu/drm/i915/intel_pm.c +1
-0+ if (IS_BROXTON(dev) && (INTEL_REVID(dev) <=
BXT_REVID_A1)) {
intel_uncore_forcewake_put(dev_priv,FORCEWAKE_ALL);drivers/gpu/drm/i915/intel_pm.c +0
-0return ; }@@ -4758,7 +4758,7 @@ static void gen9_enable_rc6(struct drm_device *dev) * 3b: Enable Coarse Power Gating only when RC6 isenabled.
* WaRsDisableCoarsePowerGating:skl,bxt - Render/Media
PG need to be disabled with RC6.drivers/gpu/drm/i915/intel_pm.c +0
-1*/ - if ((IS_BROXTON(dev) && (INTEL_REVID(dev) <
BXT_REVID_B0)) ||drivers/gpu/drm/i915/intel_pm.c +1
-0+ if ((IS_BROXTON(dev) && (INTEL_REVID(dev) <=
BXT_REVID_A1)) ||
((IS_SKL_GT3(dev)||IS_SKL_GT4(dev)) &&
(INTEL_REVID(dev)<=SKL_REVID_E0)))drivers/gpu/drm/i915/intel_pm.c +0
-0I915_WRITE (GEN9_PG_ENABLE ,0 ); elsedrivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -916,14 +916,14 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) if ((IS_SKYLAKE(dev) && (INTEL_REVID(dev) ==
SKL_REVID_A0||drivers/gpu/drm/i915/intel_ringbuffer.c +0
-1INTEL_REVID(dev) == SKL_REVID_B0)) || - (IS_BROXTON(dev) && INTEL_REVID(dev) <
BXT_REVID_B0)) {drivers/gpu/drm/i915/intel_ringbuffer.c +1
-0+ (IS_BROXTON(dev) && INTEL_REVID(dev) <=
BXT_REVID_A1)) {
/*
WaDisableDgMirrorFixInHalfSliceChicken5:skl,bxt */drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0WA_CLR_BIT_MASKED (GEN9_HALF_SLICE_CHICKEN5 ,GEN9_DG_MIRROR_FIX_ENABLE ); } if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <=
SKL_REVID_B0) ||drivers/gpu/drm/i915/intel_ringbuffer.c +0
-1- (IS_BROXTON(dev) && INTEL_REVID(dev) <
BXT_REVID_B0)) {drivers/gpu/drm/i915/intel_ringbuffer.c +1
-0+ (IS_BROXTON(dev) && INTEL_REVID(dev) <=
BXT_REVID_A1)) {
/*
WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0WA_SET_BIT_MASKED (GEN7_COMMON_SLICE_CHICKEN1 ,GEN9_RHWO_OPTIMIZATION_DISABLE );@@ -952,7 +952,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* WaDisableMaskBasedCammingInRCC:skl,bxt */ if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) ==
SKL_REVID_C0) ||drivers/gpu/drm/i915/intel_ringbuffer.c +0
-1- (IS_BROXTON(dev) && INTEL_REVID(dev) <
BXT_REVID_B0))drivers/gpu/drm/i915/intel_ringbuffer.c +1
-0+ (IS_BROXTON(dev) && INTEL_REVID(dev) <=
BXT_REVID_A1))drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0WA_SET_BIT_MASKED (SLICE_ECO_CHICKEN0 ,PIXEL_MASK_CAMMING_DISABLE );Signature · 7 lines
-- 2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 2 lines
Ville Syrjälä Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915/bxt: add revision id for A1 stepping and use it
In reply to Jani NikulaQuoted 15 lines · Jani Nikula
Quoted 6 lines · Ville Syrjälä
Quoted 2 lines · Jani Nikula
Prefer inclusive ranges for revision checks rather than "below B0". Per specs A2 is not used, so revid <= A1 matches revid < B0.
The w/a db would say
UNTIL_B0etc., so might be easier to check against it if we keep to the same convention.So I wanted to double check what the convention is. I picked WaRsDisableCoarsePowerGating.
KBL -
SIWA_FOREVER
BXT -SI_WA_BEFORE(BXT_REV_ID_B0)
SKL -SIWA_UNTIL_SKL_E0
Quoted 6 lines
Description "Disable coarse power gating for GT4 until GT F0 stepping."
*rolls eyes*
So is that "until" there inclusive or non-inclusive? The db is contradicting itself...
Hmm. My recollection was that it's exclusive, but now that I look at your findings and some other workarounds, it does look a bit more like inclusive.
I would think the exclusive thing would be easier to maintain since the hsd specifies the stepping in which stuff got fixed, and the exclusive convention would then have the same stepping listed. Eg. if the hsd says fixed in E0, but the w/a db says UNTIL_D0, then one is left wondering about D1+ But perhaps such steppings didn't even exist.
Well, in reality it's all over the place. Eg. looking at the BDW UNTIL_D0 stuff, some are fixed in E0, some are fixed in D0, and at least one was fixed in B0 according to hsd. So I'm starting to think that the meaning of the tag depends entirely on the person who pushed the change.
Quoted 236 lines
Cc: Sarah who has also looked at workarounds
recently.Rodrigo, for one thing, I'll want workarounds for SKL and KBL in different conditions instead of conflated into SKL!
But what about this non-inclusive end of range? It'll matter in patch 3/3. It's not so much a problem for ranges, but rather for specific revisions, where you'd have to include a revision not mentioned in the spec at all, e.g. for B0 only:
IS_SKL_REVID(dev, SKL_REVID_B0, SKL_REVID_C0)instead of the current proposal:
IS_SKL_REVID(dev, SKL_REVID_B0, SKL_REVID_B0)I'm not really fond of adding separate macros for checking specific vs. ranges.
Thoughts?
BR,
Jani.Quoted 204 lines
Quoted 200 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 8 ++++---- drivers/gpu/drm/i915/intel_pm.c | 6 +++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +++--- 9 files changed, 16 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -2509,6 +2509,7 @@ struct drm_i915_cmd_table {#define SKL_REVID_F0 0x5#define BXT_REVID_A0 0x0 +#define BXT_REVID_A1 0x1#define BXT_REVID_B0 0x3#define BXT_REVID_C0 0x9drivers/gpu/drm/i915/i915_gem.c +1
-1@@ -3757,7 +3757,7 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,* cacheline, whereas normally such cachelines would get * invalidated. */ -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )return -ENODEV ; level =I915_CACHE_LLC ;drivers/gpu/drm/i915/i915_guc_submission.c +1
-1@@ -161,7 +161,7 @@ static int host2guc_sample_forcewake(struct intel_guc *guc, data[0 ] =HOST2GUC_ACTION_SAMPLE_FORCEWAKE ;/* WaRsDisableCoarsePowerGating:skl,bxt */ if (!intel_enable_rc6 (dev_priv->dev) || - (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) || (IS_SKL_GT3 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 )) || (IS_SKL_GT4 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 ))) data[1 ] =0 ;drivers/gpu/drm/i915/intel_ddi.c +1
-1@@ -3247,7 +3247,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)* On BXT A0/A1, sw needs to activate DDIA HPD logic and * interrupts to check the external panel connection. */ -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 ) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 ) && port ==PORT_B ) dev_priv->hotplug.irq_port[PORT_A ] = intel_dig_port;else drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -6087,7 +6087,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,break ;case PORT_B : intel_encoder->hpd_pin =HPD_PORT_B ; -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) intel_encoder->hpd_pin =HPD_PORT_A ;break ;case PORT_C :drivers/gpu/drm/i915/intel_hdmi.c +1
-1@@ -2068,7 +2068,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,* On BXT A0/A1, sw needs to activate DDIA HPD logic and * interrupts to check the external panel connection. */ -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) intel_encoder->hpd_pin =HPD_PORT_A ;else intel_encoder->hpd_pin =HPD_PORT_B ;drivers/gpu/drm/i915/intel_lrc.c +4
-4@@ -1986,7 +1986,7 @@ static int logical_render_ring_init(struct drm_device *dev) ring->init_hw = gen8_init_render_ring; ring->init_context = gen8_init_rcs_context; ring->cleanup = intel_fini_pipe_control; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2038,7 +2038,7 @@ static int logical_bsd_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2093,7 +2093,7 @@ static int logical_blt_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2123,7 +2123,7 @@ static int logical_vebox_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {drivers/gpu/drm/i915/intel_pm.c +3
-3@@ -4348,7 +4348,7 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)struct drm_i915_private *dev_priv = dev->dev_private;/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */ -if (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 ))return ;WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock));@@ -4672,7 +4672,7 @@ static void gen9_enable_rps(struct drm_device *dev)gen6_init_rps_frequencies (dev);/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */ -if (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) { +if (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) {intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );return ; }@@ -4758,7 +4758,7 @@ static void gen9_enable_rc6(struct drm_device *dev)* 3b: Enable Coarse Power Gating only when RC6 is enabled. * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6. */ -if ((IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || +if ((IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) || ((IS_SKL_GT3 (dev) ||IS_SKL_GT4 (dev)) && (INTEL_REVID (dev) <=SKL_REVID_E0 )))I915_WRITE (GEN9_PG_ENABLE ,0 );else drivers/gpu/drm/i915/intel_ringbuffer.c +3
-3@@ -916,14 +916,14 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) ==SKL_REVID_A0 ||INTEL_REVID (dev) ==SKL_REVID_B0 )) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) { + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )) {/* WaDisableDgMirrorFixInHalfSliceChicken5:skl,bxt */ WA_CLR_BIT_MASKED (GEN9_HALF_SLICE_CHICKEN5 ,GEN9_DG_MIRROR_FIX_ENABLE ); }if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) { + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )) {/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ WA_SET_BIT_MASKED (GEN7_COMMON_SLICE_CHICKEN1 ,GEN9_RHWO_OPTIMIZATION_DISABLE );@@ -952,7 +952,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* WaDisableMaskBasedCammingInRCC:skl,bxt */ if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) ==SKL_REVID_C0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ))WA_SET_BIT_MASKED (SLICE_ECO_CHICKEN0 ,PIXEL_MASK_CAMMING_DISABLE );Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 2 lines
Ville Syrjälä Intel OTCSignature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915/bxt: add revision id for A1 stepping and use it
Quoted 33 lines · Ville Syrjälä
Quoted 15 lines · Jani Nikula
Quoted 6 lines · Ville Syrjälä
Quoted 2 lines · Jani Nikula
Prefer inclusive ranges for revision checks rather than "below B0". Per specs A2 is not used, so revid <= A1 matches revid < B0.
The w/a db would say
UNTIL_B0etc., so might be easier to check against it if we keep to the same convention.So I wanted to double check what the convention is. I picked WaRsDisableCoarsePowerGating.
KBL -
SIWA_FOREVER
BXT -SI_WA_BEFORE(BXT_REV_ID_B0)
SKL -SIWA_UNTIL_SKL_E0Quoted 6 lines
Description "Disable coarse power gating for GT4 until GT F0 stepping."
*rolls eyes*
So is that "until" there inclusive or non-inclusive? The db is contradicting itself...
Hmm. My recollection was that it's exclusive, but now that I look at your findings and some other workarounds, it does look a bit more like inclusive.
I would think the exclusive thing would be easier to maintain since the hsd specifies the stepping in which stuff got fixed, and the exclusive convention would then have the same stepping listed. Eg. if the hsd says fixed in E0, but the w/a db says
UNTIL_D0, then one is left wondering about D1+ But perhaps such steppings didn't even exist.
Quoted 4 lines
Well, in reality it's all over the place. Eg. looking at the BDW
UNTIL_D0stuff, some are fixed in E0, some are fixed in D0, and at least one was fixed in B0 according to hsd. So I'm starting to think that the meaning of the tag depends entirely on the person who pushed the change.
With that, I stand by the patches I submitted as they are.
BR,
Jani.
Quoted 241 lines
Quoted 237 lines
Cc: Sarah who has also looked at workarounds
recently.Rodrigo, for one thing, I'll want workarounds for SKL and KBL in different conditions instead of conflated into SKL!
But what about this non-inclusive end of range? It'll matter in patch 3/3. It's not so much a problem for ranges, but rather for specific revisions, where you'd have to include a revision not mentioned in the spec at all, e.g. for B0 only:
IS_SKL_REVID(dev, SKL_REVID_B0, SKL_REVID_C0)instead of the current proposal:
IS_SKL_REVID(dev, SKL_REVID_B0, SKL_REVID_B0)I'm not really fond of adding separate macros for checking specific vs. ranges.
Thoughts?
BR,
Jani.Quoted 204 lines
Quoted 200 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 8 ++++---- drivers/gpu/drm/i915/intel_pm.c | 6 +++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +++--- 9 files changed, 16 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -2509,6 +2509,7 @@ struct drm_i915_cmd_table {#define SKL_REVID_F0 0x5#define BXT_REVID_A0 0x0 +#define BXT_REVID_A1 0x1#define BXT_REVID_B0 0x3#define BXT_REVID_C0 0x9drivers/gpu/drm/i915/i915_gem.c +1
-1@@ -3757,7 +3757,7 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,* cacheline, whereas normally such cachelines would get * invalidated. */ -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )return -ENODEV ; level =I915_CACHE_LLC ;drivers/gpu/drm/i915/i915_guc_submission.c +1
-1@@ -161,7 +161,7 @@ static int host2guc_sample_forcewake(struct intel_guc *guc, data[0 ] =HOST2GUC_ACTION_SAMPLE_FORCEWAKE ;/* WaRsDisableCoarsePowerGating:skl,bxt */ if (!intel_enable_rc6 (dev_priv->dev) || - (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) || (IS_SKL_GT3 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 )) || (IS_SKL_GT4 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 ))) data[1 ] =0 ;drivers/gpu/drm/i915/intel_ddi.c +1
-1@@ -3247,7 +3247,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)* On BXT A0/A1, sw needs to activate DDIA HPD logic and * interrupts to check the external panel connection. */ -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 ) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 ) && port ==PORT_B ) dev_priv->hotplug.irq_port[PORT_A ] = intel_dig_port;else drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -6087,7 +6087,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,break ;case PORT_B : intel_encoder->hpd_pin =HPD_PORT_B ; -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) intel_encoder->hpd_pin =HPD_PORT_A ;break ;case PORT_C :drivers/gpu/drm/i915/intel_hdmi.c +1
-1@@ -2068,7 +2068,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,* On BXT A0/A1, sw needs to activate DDIA HPD logic and * interrupts to check the external panel connection. */ -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) intel_encoder->hpd_pin =HPD_PORT_A ;else intel_encoder->hpd_pin =HPD_PORT_B ;drivers/gpu/drm/i915/intel_lrc.c +4
-4@@ -1986,7 +1986,7 @@ static int logical_render_ring_init(struct drm_device *dev) ring->init_hw = gen8_init_render_ring; ring->init_context = gen8_init_rcs_context; ring->cleanup = intel_fini_pipe_control; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2038,7 +2038,7 @@ static int logical_bsd_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2093,7 +2093,7 @@ static int logical_blt_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {@@ -2123,7 +2123,7 @@ static int logical_vebox_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 ) { +if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {drivers/gpu/drm/i915/intel_pm.c +3
-3@@ -4348,7 +4348,7 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)struct drm_i915_private *dev_priv = dev->dev_private;/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */ -if (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) +if (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 ))return ;WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock));@@ -4672,7 +4672,7 @@ static void gen9_enable_rps(struct drm_device *dev)gen6_init_rps_frequencies (dev);/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */ -if (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) { +if (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) {intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );return ; }@@ -4758,7 +4758,7 @@ static void gen9_enable_rc6(struct drm_device *dev)* 3b: Enable Coarse Power Gating only when RC6 is enabled. * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6. */ -if ((IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || +if ((IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) || ((IS_SKL_GT3 (dev) ||IS_SKL_GT4 (dev)) && (INTEL_REVID (dev) <=SKL_REVID_E0 )))I915_WRITE (GEN9_PG_ENABLE ,0 );else drivers/gpu/drm/i915/intel_ringbuffer.c +3
-3@@ -916,14 +916,14 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) ==SKL_REVID_A0 ||INTEL_REVID (dev) ==SKL_REVID_B0 )) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) { + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )) {/* WaDisableDgMirrorFixInHalfSliceChicken5:skl,bxt */ WA_CLR_BIT_MASKED (GEN9_HALF_SLICE_CHICKEN5 ,GEN9_DG_MIRROR_FIX_ENABLE ); }if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) { + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 )) {/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ WA_SET_BIT_MASKED (GEN7_COMMON_SLICE_CHICKEN1 ,GEN9_RHWO_OPTIMIZATION_DISABLE );@@ -952,7 +952,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* WaDisableMaskBasedCammingInRCC:skl,bxt */ if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) ==SKL_REVID_C0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ))WA_SET_BIT_MASKED (SLICE_ECO_CHICKEN0 ,PIXEL_MASK_CAMMING_DISABLE );Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 2 lines
Ville Syrjälä Intel OTCSignature · 1 line
Jani Nikula, Intel Open Source Technology CenterSignature · 2 lines
Ville Syrjälä Intel OTC
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915/bxt: add revision id for A1 stepping and use it
Quoted 34 lines · Jani Nikula
Quoted 33 lines · Ville Syrjälä
Quoted 15 lines · Jani Nikula
Quoted 6 lines · Ville Syrjälä
Quoted 2 lines · Jani Nikula
Prefer inclusive ranges for revision checks rather than "below B0". Per specs A2 is not used, so revid <= A1 matches revid < B0.
The w/a db would say
UNTIL_B0etc., so might be easier to check against it if we keep to the same convention.So I wanted to double check what the convention is. I picked WaRsDisableCoarsePowerGating.
KBL -
SIWA_FOREVER
BXT -SI_WA_BEFORE(BXT_REV_ID_B0)
SKL -SIWA_UNTIL_SKL_E0Quoted 6 lines
Description "Disable coarse power gating for GT4 until GT F0 stepping."
*rolls eyes*
So is that "until" there inclusive or non-inclusive? The db is contradicting itself...
Hmm. My recollection was that it's exclusive, but now that I look at your findings and some other workarounds, it does look a bit more like inclusive.
I would think the exclusive thing would be easier to maintain since the hsd specifies the stepping in which stuff got fixed, and the exclusive convention would then have the same stepping listed. Eg. if the hsd says fixed in E0, but the w/a db says
UNTIL_D0, then one is left wondering about D1+ But perhaps such steppings didn't even exist.
Quoted 6 lines
Quoted 4 lines
Well, in reality it's all over the place. Eg. looking at the BDW
UNTIL_D0stuff, some are fixed in E0, some are fixed in D0, and at least one was fixed in B0 according to hsd. So I'm starting to think that the meaning of the tag depends entirely on the person who pushed the change.With that, I stand by the patches I submitted as they are.
Ville, opinions, r-b, nak, ack, crap, what? ;)
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjälä
Acked-byRe: [PATCH 2/3] drm/i915/bxt: add revision id for A1 stepping and use it
Quoted 35 lines · Jani Nikula
Quoted 34 lines · Jani Nikula
Quoted 33 lines · Ville Syrjälä
Quoted 15 lines · Jani Nikula
Quoted 6 lines · Ville Syrjälä
Quoted 2 lines · Jani Nikula
Prefer inclusive ranges for revision checks rather than "below B0". Per specs A2 is not used, so revid <= A1 matches revid < B0.
The w/a db would say
UNTIL_B0etc., so might be easier to check against it if we keep to the same convention.So I wanted to double check what the convention is. I picked WaRsDisableCoarsePowerGating.
KBL -
SIWA_FOREVER
BXT -SI_WA_BEFORE(BXT_REV_ID_B0)
SKL -SIWA_UNTIL_SKL_E0Quoted 6 lines
Description "Disable coarse power gating for GT4 until GT F0 stepping."
*rolls eyes*
So is that "until" there inclusive or non-inclusive? The db is contradicting itself...
Hmm. My recollection was that it's exclusive, but now that I look at your findings and some other workarounds, it does look a bit more like inclusive.
I would think the exclusive thing would be easier to maintain since the hsd specifies the stepping in which stuff got fixed, and the exclusive convention would then have the same stepping listed. Eg. if the hsd says fixed in E0, but the w/a db says
UNTIL_D0, then one is left wondering about D1+ But perhaps such steppings didn't even exist.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Well, in reality it's all over the place. Eg. looking at the BDW
UNTIL_D0stuff, some are fixed in E0, some are fixed in D0, and at least one was fixed in B0 according to hsd. So I'm starting to think that the meaning of the tag depends entirely on the person who pushed the change.With that, I stand by the patches I submitted as they are.
Ville, opinions, r-b, nak, ack, crap, what? ;)
Yeah, I guess it's all good.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915: add helpers for platform specific revision id range checks
In reply to Jani NikulaRevision checks are almost always accompanied by a platform check. (The exceptions are platform specific code.) Add helpers to check for a platform and a revision range: IS_SKL_REVID() and IS_BXT_REVID(). In most places this simplifies and clarifies the code. It will be obvious that revid macros are used for the correct platform.
This should make it easier to find all the revision checks for workarounds for each platform, and make it easier to remove them once we drop support for early hardware revisions.
This should also make it easier to differentiate between Skylake and Kabylake revision checks when Kabylake support is added.
--- drivers/gpu/drm/i915/i915_drv.h | 13 +++++++++ drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 6 ++-- drivers/gpu/drm/i915/intel_ddi.c | 3 +- drivers/gpu/drm/i915/intel_dp.c | 4 +-- drivers/gpu/drm/i915/intel_guc_loader.c | 4 +-- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 26 ++++++++--------- drivers/gpu/drm/i915/intel_pm.c | 29 +++++++++---------- drivers/gpu/drm/i915/intel_ringbuffer.c | 46 ++++++++++++------------------ 10 files changed, 69 insertions(+), 66 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +13 -0
@@ -2440,6 +2440,15 @@ struct drm_i915_cmd_table {#define INTEL_DEVID (p) (INTEL_INFO(p)->device_id)#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision) +#define REVID_FOREVER 0xff +/* +* Return true if revision is in range [since,until] inclusive. +* +* Use 0 for open-ended since, and REVID_FOREVER for open-ended until. +*/ +#define IS_REVID (p, since, until) \ + (INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until)) +#define IS_I830 (dev) (INTEL_DEVID(dev) == 0x3577)#define IS_845G (dev) (INTEL_DEVID(dev) == 0x2562)#define IS_I85X (dev) (INTEL_INFO(dev)->is_i85x)
@@ -2508,11 +2517,15 @@ struct drm_i915_cmd_table {#define SKL_REVID_E0 0x4#define SKL_REVID_F0 0x5 +#define IS_SKL_REVID (p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since, until)) +#define BXT_REVID_A0 0x0#define BXT_REVID_A1 0x1#define BXT_REVID_B0 0x3#define BXT_REVID_C0 0x9 +#define IS_BXT_REVID (p, since, until) (IS_BROXTON(p) && IS_REVID(p, since, until)) +/* * The genX designation typically refers to the render engine, so render * capability related checks should use IS_GEN, while display and other checks
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -3757,7 +3757,7 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,* cacheline, whereas normally such cachelines would get * invalidated. */ -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 ))return -ENODEV ; level =I915_CACHE_LLC ;
drivers/gpu/drm/i915/i915_guc_submission.c +3 -3
@@ -161,9 +161,9 @@ static int host2guc_sample_forcewake(struct intel_guc *guc, data[0 ] =HOST2GUC_ACTION_SAMPLE_FORCEWAKE ;/* WaRsDisableCoarsePowerGating:skl,bxt */ if (!intel_enable_rc6 (dev_priv->dev) || - (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) || - (IS_SKL_GT3 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 )) || - (IS_SKL_GT4 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 ))) +IS_BXT_REVID (dev,0 ,BXT_REVID_A1 ) || + (IS_SKL_GT3 (dev) &&IS_SKL_REVID (dev,0 ,SKL_REVID_E0 )) || + (IS_SKL_GT4 (dev) &&IS_SKL_REVID (dev,0 ,SKL_REVID_E0 ))) data[1 ] =0 ;else /* bit 0 and 1 are for Render and Media domain separately */
drivers/gpu/drm/i915/intel_ddi.c +1 -2
@@ -3247,8 +3247,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)* On BXT A0/A1, sw needs to activate DDIA HPD logic and * interrupts to check the external panel connection. */ -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 ) - && port ==PORT_B ) +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 ) && port ==PORT_B ) dev_priv->hotplug.irq_port[PORT_A ] = intel_dig_port;else dev_priv->hotplug.irq_port[port] = intel_dig_port;
drivers/gpu/drm/i915/intel_dp.c +2 -2
@@ -1192,7 +1192,7 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static bool intel_dp_source_supports_hbr2 (struct drm_device *dev) {/* WaDisableHBR2:skl */ -if (IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) +if (IS_SKL_REVID (dev,0 ,SKL_REVID_B0 ))return false; if ((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) || IS_BROADWELL(dev) ||
@@ -6087,7 +6087,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,break ;case PORT_B : intel_encoder->hpd_pin =HPD_PORT_B ; -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 )) intel_encoder->hpd_pin =HPD_PORT_A ;break ;case PORT_C :
drivers/gpu/drm/i915/intel_guc_loader.c +2 -2
@@ -322,8 +322,8 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)I915_WRITE (GUC_SHIM_CONTROL ,GUC_SHIM_CONTROL_VALUE );/* WaDisableMinuteIaClockGating:skl,bxt */ -if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) ==BXT_REVID_A0 )) { +if (IS_SKL_REVID (dev,0 ,SKL_REVID_B0 ) || +IS_BXT_REVID (dev,0 ,BXT_REVID_A0 )) {I915_WRITE (GUC_SHIM_CONTROL , (I915_READ (GUC_SHIM_CONTROL ) & ~GUC_ENABLE_MIA_CLOCK_GATING )); }
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
@@ -2068,7 +2068,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,* On BXT A0/A1, sw needs to activate DDIA HPD logic and * interrupts to check the external panel connection. */ -if (IS_BROXTON (dev_priv) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) +if (IS_BXT_REVID (dev_priv,0 ,BXT_REVID_A1 )) intel_encoder->hpd_pin =HPD_PORT_A ;else intel_encoder->hpd_pin =HPD_PORT_B ;
drivers/gpu/drm/i915/intel_lrc.c +13 -13
@@ -284,8 +284,8 @@ static bool disable_lite_restore_wa(struct intel_engine_cs *ring) {struct drm_device *dev = ring->dev; -return ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) ==BXT_REVID_A0 )) && +return (IS_SKL_REVID (dev,0 ,SKL_REVID_B0 ) || +IS_BXT_REVID (dev,0 ,BXT_REVID_A0 )) && (ring->id ==VCS || ring->id ==VCS2 ); }
@@ -1164,7 +1164,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring,* this batch updates GEN8_L3SQCREG4 with default value we need to * set this bit here to retain the WA during flush. */ -if (IS_SKYLAKE (ring->dev) &&INTEL_REVID (ring->dev) <=SKL_REVID_E0 ) +if (IS_SKL_REVID (ring->dev,0 ,SKL_REVID_E0 )) l3sqc4_flush |=GEN8_LQSC_RO_PERF_DIS ; wa_ctx_emit(batch, index, (MI_STORE_REGISTER_MEM_GEN8 |
@@ -1329,8 +1329,8 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring,uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS );/* WaDisableCtxRestoreArbitration:skl,bxt */ -if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || - (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) +if (IS_SKL_REVID (dev,0 ,SKL_REVID_D0 ) || +IS_BXT_REVID (dev,0 ,BXT_REVID_A0 ))wa_ctx_emit (batch, index,MI_ARB_ON_OFF |MI_ARB_DISABLE );/* WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt */
@@ -1355,8 +1355,8 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS );/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ -if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_B0 )) || - (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) { +if (IS_SKL_REVID (dev,0 ,SKL_REVID_B0 ) || +IS_BXT_REVID (dev,0 ,BXT_REVID_A0 )) {wa_ctx_emit (batch, index,MI_LOAD_REGISTER_IMM (1 ));wa_ctx_emit (batch, index,GEN9_SLICE_COMMON_ECO_CHICKEN0 ); wa_ctx_emit(batch, index,
@@ -1365,8 +1365,8 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring, }/* WaDisableCtxRestoreArbitration:skl,bxt */ -if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || - (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) +if (IS_SKL_REVID (dev,0 ,SKL_REVID_D0 ) || +IS_BXT_REVID (dev,0 ,BXT_REVID_A0 ))wa_ctx_emit (batch, index,MI_ARB_ON_OFF |MI_ARB_ENABLE );wa_ctx_emit (batch, index,MI_BATCH_BUFFER_END );
@@ -1986,7 +1986,7 @@ static int logical_render_ring_init(struct drm_device *dev) ring->init_hw = gen8_init_render_ring; ring->init_context = gen8_init_rcs_context; ring->cleanup = intel_fini_pipe_control; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 )) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {
@@ -2038,7 +2038,7 @@ static int logical_bsd_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 )) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {
@@ -2093,7 +2093,7 @@ static int logical_blt_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 )) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {
@@ -2123,7 +2123,7 @@ static int logical_vebox_ring_init(struct drm_device *dev)GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; ring->init_hw = gen8_init_common_ring; -if (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A1 ) { +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 )) { ring->get_seqno = bxt_a_get_seqno; ring->set_seqno = bxt_a_set_seqno; }else {
drivers/gpu/drm/i915/intel_pm.c +14 -15
@@ -71,7 +71,7 @@ static void skl_init_clock_gating(struct drm_device *dev)gen9_init_clock_gating (dev); -if (INTEL_REVID (dev) <=SKL_REVID_D0 ) { +if (IS_SKL_REVID (dev,0 ,SKL_REVID_D0 )) {/* WaDisableHDCInvalidation:skl */ I915_WRITE (GAM_ECOCHK ,I915_READ (GAM_ECOCHK ) |BDW_DISABLE_HDC_INVALIDATION );
@@ -84,16 +84,15 @@ static void skl_init_clock_gating(struct drm_device *dev)/* GEN8_L3SQCREG4 has a dependency with WA batch so any new changes * involving this register should also be added to WA batch as required. */ -if (INTEL_REVID (dev) <=SKL_REVID_E0 ) -/* WaDisableLSQCROPERFforOCL:skl */ +/* WaDisableLSQCROPERFforOCL:skl */ +if (IS_SKL_REVID (dev,0 ,SKL_REVID_E0 ))I915_WRITE (GEN8_L3SQCREG4 ,I915_READ (GEN8_L3SQCREG4 ) |GEN8_LQSC_RO_PERF_DIS );/* WaEnableGapsTsvCreditFix:skl */ -if (IS_SKYLAKE (dev) && (INTEL_REVID (dev) >=SKL_REVID_C0 )) { +if (IS_SKL_REVID (dev,SKL_REVID_C0 ,REVID_FOREVER ))I915_WRITE (GEN8_GARBCNTL , (I915_READ (GEN8_GARBCNTL ) |GEN9_GAPS_TSV_CREDIT_DISABLE )); - } }static void bxt_init_clock_gating (struct drm_device *dev)
@@ -115,14 +114,13 @@ static void bxt_init_clock_gating(struct drm_device *dev)/* WaStoreMultiplePTEenable:bxt */ /* This is a requirement according to Hardware specification */ -if (INTEL_REVID (dev) ==BXT_REVID_A0 ) +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A0 ))I915_WRITE (TILECTL ,I915_READ (TILECTL ) |TILECTL_TLBPF );/* WaSetClckGatingDisableMedia:bxt */ -if (INTEL_REVID (dev) ==BXT_REVID_A0 ) { +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A0 ))I915_WRITE (GEN7_MISCCPCTL , (I915_READ (GEN7_MISCCPCTL ) & ~GEN8_DOP_CLOCK_GATE_MEDIA_ENABLE )); - } }static void i915_pineview_get_mem_freq (struct drm_device *dev)
@@ -4348,7 +4346,7 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)struct drm_i915_private *dev_priv = dev->dev_private;/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */ -if (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 ))return ;WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock));
@@ -4672,7 +4670,7 @@ static void gen9_enable_rps(struct drm_device *dev)gen6_init_rps_frequencies (dev);/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */ -if (IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) { +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 )) {intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );return ; }
@@ -4717,7 +4715,7 @@ static void gen9_enable_rc6(struct drm_device *dev)/* WaRsDoubleRc6WrlWithCoarsePowerGating: Doubling WRL only when CPG is enabled */ if (IS_SKYLAKE (dev) && !((IS_SKL_GT3 (dev) ||IS_SKL_GT4 (dev)) && - (INTEL_REVID (dev) <=SKL_REVID_E0 ))) +IS_SKL_REVID (dev,0 ,SKL_REVID_E0 )))I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,108 <<16 );else I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,54 <<16 );
@@ -4741,8 +4739,8 @@ static void gen9_enable_rc6(struct drm_device *dev)DRM_INFO ("RC6 %s\n" , (rc6_mask &GEN6_RC_CTL_RC6_ENABLE ) ?"on" :"off" );/* WaRsUseTimeoutMode */ -if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_D0 ) || - (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_A0 )) { +if (IS_SKL_REVID (dev,0 ,SKL_REVID_D0 ) || +IS_BXT_REVID (dev,0 ,BXT_REVID_A0 )) {I915_WRITE (GEN6_RC6_THRESHOLD ,625 );/* 800us */ I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE | GEN7_RC_CTL_TO_MODE |
@@ -4758,8 +4756,9 @@ static void gen9_enable_rc6(struct drm_device *dev)* 3b: Enable Coarse Power Gating only when RC6 is enabled. * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6. */ -if ((IS_BROXTON (dev) && (INTEL_REVID (dev) <=BXT_REVID_A1 )) || - ((IS_SKL_GT3 (dev) ||IS_SKL_GT4 (dev)) && (INTEL_REVID (dev) <=SKL_REVID_E0 ))) +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 ) || + ((IS_SKL_GT3 (dev) ||IS_SKL_GT4 (dev)) && +IS_SKL_REVID (dev,0 ,SKL_REVID_E0 )))I915_WRITE (GEN9_PG_ENABLE ,0 );else I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
drivers/gpu/drm/i915/intel_ringbuffer.c +19 -27
109 lines not on this page · raw message
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx