drm/i915: remove parens around revision ids
Subsystems (2)
PATCH v2 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
@@ -2493,16 +2493,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 v2 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
@@ -2501,6 +2501,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
@@ -3826,7 +3826,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
@@ -2039,7 +2039,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
@@ -1972,7 +1972,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 {
@@ -2024,7 +2024,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 {
@@ -2079,7 +2079,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 {
@@ -2109,7 +2109,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
@@ -4386,7 +4386,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));
@@ -4710,7 +4710,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 ; }
@@ -4796,7 +4796,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
@@ -926,14 +926,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 );
@@ -962,7 +962,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 v2 2/3] drm/i915/bxt: add revision id for A1 stepping and use it
Quoted 22 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.
Acked-by Ville Syrjälä <[email protected]>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 +0
-0
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2504
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -2501,6 +2501,7 @@ struct drm_i915_cmd_table {#define SKL_REVID_F0 0x5#define BXT_REVID_A0 0x0 +#define BXT_REVID_A1 0x1
Except that I can't check this value here on the series:
Quoted 176 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0#define BXT_REVID_B0 0x3#define BXT_REVID_C0 0x9drivers/gpu/drm/i915/i915_gem.c +1
-1@@ -3826,7 +3826,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@@ -2039,7 +2039,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@@ -1972,7 +1972,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 {@@ -2024,7 +2024,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 {@@ -2079,7 +2079,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 {@@ -2109,7 +2109,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@@ -4386,7 +4386,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));@@ -4710,7 +4710,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 ; }@@ -4796,7 +4796,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@@ -926,14 +926,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 );@@ -962,7 +962,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 · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/3] drm/i915/bxt: add revision id for A1 stepping and use it
Quoted 25 lines · Daniel Vetter
Quoted 24 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.
Acked-by Ville Syrjälä <[email protected]>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 +0
-0@@ -2501,6 +2501,7 @@ struct drm_i915_cmd_table {#define SKL_REVID_F0 0x5
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2504
Quoted 2 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0#define BXT_REVID_A0 0x0 +#define BXT_REVID_A1 0x1Except that I can't check this value here on the series:
Reviewed-by Daniel Vetter <[email protected]>
Pushed them all. Thanks for the review and acks.
BR,
Jani.
Quoted 182 lines
Quoted 177 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0#define BXT_REVID_B0 0x3#define BXT_REVID_C0 0x9drivers/gpu/drm/i915/i915_gem.c +1
-1@@ -3826,7 +3826,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@@ -2039,7 +2039,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@@ -1972,7 +1972,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 {@@ -2024,7 +2024,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 {@@ -2079,7 +2079,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 {@@ -2109,7 +2109,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@@ -4386,7 +4386,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));@@ -4710,7 +4710,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 ; }@@ -4796,7 +4796,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@@ -926,14 +926,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 );@@ -962,7 +962,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 · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 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.
v2: rebase
--- 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 | 15 ++++---- drivers/gpu/drm/i915/intel_ringbuffer.c | 56 +++++++++++++----------------- 10 files changed, 68 insertions(+), 63 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +13 -0
@@ -2432,6 +2432,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)
@@ -2500,11 +2509,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
@@ -3826,7 +3826,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
@@ -2039,7 +2039,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 ); }
@@ -1149,7 +1149,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 |
@@ -1314,8 +1314,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 */
@@ -1340,8 +1340,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,
@@ -1350,8 +1350,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 );
@@ -1972,7 +1972,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 {
@@ -2024,7 +2024,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 {
@@ -2079,7 +2079,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 {
@@ -2109,7 +2109,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 +8 -7
@@ -4386,7 +4386,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));
@@ -4710,7 +4710,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 ; }
@@ -4755,7 +4755,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 );
@@ -4779,8 +4779,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 |
@@ -4796,8 +4796,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 +24 -32
144 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