drm/i915/kbl: Apply WaIncreaseDefaultTLBEntries on KBL.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/2 drm/i915/kbl: Apply WaIncreaseDefaultTLBEntries on KBL.
According to wa_database this Wa persist on KBL as it was on SKL.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -2
@@ -2184,12 +2184,12 @@ static void gtt_write_workarounds(struct drm_i915_private *dev_priv)* called on driver load and after a GPU reset, so you can place * workarounds here even if they get overwritten by GPU reset. */ -/* WaIncreaseDefaultTLBEntries:chv,bdw,skl,bxt */ +/* WaIncreaseDefaultTLBEntries:chv,bdw,skl,bxt,kbl */ if (IS_BROADWELL (dev_priv))I915_WRITE (GEN8_L3_LRA_1_GPGPU ,GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_BDW );else if (IS_CHERRYVIEW (dev_priv))I915_WRITE (GEN8_L3_LRA_1_GPGPU ,GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_CHV ); -else if (IS_SKYLAKE (dev_priv)) +else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv))I915_WRITE (GEN8_L3_LRA_1_GPGPU ,GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_SKL );else if (IS_BROXTON (dev_priv))I915_WRITE (GEN8_L3_LRA_1_GPGPU ,GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_BXT );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 2/2 drm/i915: Introduce IS_GEN9_BC for Skylake and Kabylake.
Along with GLK it was introduced the .is_lp and IS_GEN9_LP. So, following the same simplification standard we can put Skylake and Kabylake under the same bucket for most of the things.
So let's add the IS_GEN9_BC for "Big Core" (non Atom based platforms).
The i915_drv.c was let out of this patch on purpose because that is really a decision per platform, just like other cases where IS_KABYLAKE is different from IS_SKYLAKE.
v2: fix conflict with IS_LP and 3 new cases for this
big core bucket:
- intel_ddi.c: intel_ddi_get_link_dpll
- intel_fbc.c: find_compression_threshold
- i915_gem_gtt.c: gtt_write_workarounds
--- drivers/gpu/drm/i915/i915_debugfs.c | 17 +++++++---------- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_color.c | 4 ++-- drivers/gpu/drm/i915/intel_ddi.c | 20 ++++++++++---------- drivers/gpu/drm/i915/intel_display.c | 12 ++++++------ drivers/gpu/drm/i915/intel_dp.c | 4 ++-- drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/intel_fbc.c | 3 +-- drivers/gpu/drm/i915/intel_i2c.c | 4 ++-- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 13 ++++++------- drivers/gpu/drm/i915/intel_runtime_pm.c | 10 +++++----- 14 files changed, 47 insertions(+), 51 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -10
@@ -1224,21 +1224,18 @@ static int i915_frequency_info(struct seq_file *m, void *unused) max_freq = (IS_GEN9_LP (dev_priv) ? rp_state_cap >>0 : rp_state_cap >>16 ) &0xff ; - max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ? -GEN9_FREQ_SCALER :1 ); + max_freq *= (IS_GEN9_BC (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Lowest (RPN) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); max_freq = (rp_state_cap &0xff00 ) >>8 ; - max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ? -GEN9_FREQ_SCALER :1 ); + max_freq *= (IS_GEN9_BC (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Nominal (RP1) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); max_freq = (IS_GEN9_LP (dev_priv) ? rp_state_cap >>16 : rp_state_cap >>0 ) &0xff ; - max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ? -GEN9_FREQ_SCALER :1 ); + max_freq *= (IS_GEN9_BC (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Max non-overclocked (RP0) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); seq_printf(m, "Max overclocked frequency: %dMHz\n",
@@ -1814,7 +1811,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)if (ret) goto out; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = dev_priv->rps.min_freq_softlimit /GEN9_FREQ_SCALER ;
@@ -1834,8 +1831,8 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) &ia_freq);seq_printf (m,"%d\t\t%d\t\t\t\t%d\n" ,intel_gpu_freq (dev_priv, (gpu_freq * - (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ? -GEN9_FREQ_SCALER :1 ))), + (IS_GEN9_BC (dev_priv) ? +GEN9_FREQ_SCALER :1 ))), ((ia_freq >>0 ) &0xff ) *100 , ((ia_freq >>8 ) &0xff ) *100 ); }
@@ -4444,7 +4441,7 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, sseu->slice_mask |=BIT (s); -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv)) sseu->subslice_mask =INTEL_INFO (dev_priv)->sseu.subslice_mask;
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -2756,8 +2756,9 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)#define IS_GEN8 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(7)))#define IS_GEN9 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(8))) -#define IS_GEN9_LP (dev_priv) (IS_GEN9(dev_priv) && INTEL_INFO(dev_priv)->is_lp)#define IS_LP (dev_priv) (INTEL_INFO(dev_priv)->is_lp) +#define IS_GEN9_LP (dev_priv) (IS_GEN9(dev_priv) && IS_LP(dev_priv)) +#define IS_GEN9_BC (dev_priv) (IS_GEN9(dev_priv) && !IS_LP(dev_priv))#define ENGINE_MASK (id) BIT(id)#define RENDER_RING ENGINE_MASK(RCS)
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
@@ -2189,7 +2189,7 @@ static void gtt_write_workarounds(struct drm_i915_private *dev_priv)I915_WRITE (GEN8_L3_LRA_1_GPGPU ,GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_BDW ); else if (IS_CHERRYVIEW(dev_priv)) I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_CHV); - else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) + else if (IS_GEN9_BC(dev_priv)) I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_SKL); else if (IS_BROXTON(dev_priv)) I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_BXT);
drivers/gpu/drm/i915/intel_audio.c +1 -1
@@ -702,7 +702,7 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,struct drm_i915_private *dev_priv =kdev_to_i915 (kdev);u32 tmp; -if (!IS_SKYLAKE (dev_priv) && !IS_KABYLAKE (dev_priv)) +if (!IS_GEN9_BC (dev_priv))return ;i915_audio_component_get_power (kdev);
drivers/gpu/drm/i915/intel_color.c +2 -2
@@ -536,8 +536,8 @@ void intel_color_init(struct drm_crtc *crtc) }else if (IS_HASWELL (dev_priv)) { dev_priv->display.load_csc_matrix = i9xx_load_csc_matrix; dev_priv->display.load_luts = haswell_load_luts; - }else if (IS_BROADWELL (dev_priv) ||IS_SKYLAKE (dev_priv) || -IS_BROXTON (dev_priv) ||IS_KABYLAKE (dev_priv)) { + }else if (IS_BROADWELL (dev_priv) ||IS_GEN9_BC (dev_priv) || +IS_BROXTON (dev_priv)) { dev_priv->display.load_csc_matrix = i9xx_load_csc_matrix; dev_priv->display.load_luts = broadwell_load_luts; }else {
drivers/gpu/drm/i915/intel_ddi.c +10 -10
@@ -445,7 +445,7 @@ static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port porif (IS_GEN9_LP (dev_priv))return hdmi_level; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {skl_get_buf_trans_hdmi (dev_priv, &n_hdmi_entries); hdmi_default_entry =8 ; }else if (IS_BROADWELL (dev_priv)) {
@@ -518,7 +518,7 @@ void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder) n_dp_entries =ARRAY_SIZE (bdw_ddi_translations_dp); } -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {/* If we're boosting the current, set bit 31 of trans1 */ if (dev_priv->vbt.ddi_port_info[port].dp_boost_level) iboost_bit =DDI_BUF_BALANCE_LEG_ENABLE ;
@@ -572,7 +572,7 @@ static void intel_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder) hdmi_level =intel_ddi_hdmi_level (dev_priv, port); -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) { ddi_translations_hdmi =skl_get_buf_trans_hdmi (dev_priv, &n_hdmi_entries);/* If we're boosting the current, set bit 31 of trans1 */
@@ -1089,7 +1089,7 @@ void intel_ddi_clock_get(struct intel_encoder *encoder,if (INTEL_GEN (dev_priv) <=8 )hsw_ddi_clock_get (encoder, pipe_config); -else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +else if (IS_GEN9_BC (dev_priv))skl_ddi_clock_get (encoder, pipe_config);else if (IS_GEN9_LP (dev_priv))bxt_ddi_clock_get (encoder, pipe_config);
@@ -1150,7 +1150,7 @@ bool intel_ddi_pll_select(struct intel_crtc *intel_crtc,struct intel_encoder *intel_encoder =intel_ddi_get_crtc_new_encoder (crtc_state); -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))return skl_ddi_pll_select (intel_crtc, crtc_state, intel_encoder);else if (IS_GEN9_LP (dev_priv))
@@ -1641,7 +1641,7 @@ uint32_t ddi_signal_levels(struct intel_dp *intel_dp) level =translate_signal_level (signal_levels); -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))skl_ddi_set_iboost (encoder, level);else if (IS_GEN9_LP (dev_priv))bxt_ddi_vswing_sequence (dev_priv, level, port, encoder->type);
@@ -1658,7 +1658,7 @@ void intel_ddi_clk_select(struct intel_encoder *encoder,if (WARN_ON (!pll))return ; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {uint32_t val;/* DDI -> PLL mapping */
@@ -1714,7 +1714,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,intel_dp_dual_mode_set_tmds_output (intel_hdmi, true);intel_ddi_clk_select (encoder, pll);intel_prepare_hdmi_ddi_buffers (encoder); -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))skl_ddi_set_iboost (encoder, level);else if (IS_GEN9_LP (dev_priv)) bxt_ddi_vswing_sequence(dev_priv, level, port,
@@ -1784,7 +1784,7 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder,intel_edp_panel_off (intel_dp); } -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))I915_WRITE (DPLL_CTRL2 , (I915_READ (DPLL_CTRL2 ) |DPLL_CTRL2_DDI_CLK_OFF (port)));else if (INTEL_GEN (dev_priv) <9 )
@@ -2157,7 +2157,7 @@ struct intel_shared_dpll * pll->state = tmp_pll_state;return NULL ; } - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + }else if (IS_GEN9_BC (dev_priv)) { pll =skl_find_link_pll (dev_priv, clock); }else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { pll =hsw_ddi_dp_get_dpll (encoder, clock);
drivers/gpu/drm/i915/intel_display.c +6 -6
@@ -5800,7 +5800,7 @@ static int intel_compute_max_dotclk(struct drm_i915_private *dev_priv)static void intel_update_max_cdclk (struct drm_i915_private *dev_priv) { -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {u32 limit =I915_READ (SKL_DFSM ) &SKL_DFSM_CDCLK_LIMIT_MASK ;int max_cdclk, vco;
@@ -10673,7 +10673,7 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc, port = (tmp &TRANS_DDI_PORT_MASK ) >>TRANS_DDI_PORT_SHIFT ; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))skylake_get_ddi_pll (dev_priv, port, pipe_config);else if (IS_GEN9_LP (dev_priv))bxt_get_ddi_pll (dev_priv, port, pipe_config);
@@ -15675,7 +15675,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)*/ found =I915_READ (DDI_BUF_CTL (PORT_A )) &DDI_INIT_DISPLAY_DETECTED ;/* WaIgnoreDDIAStrap: skl */ -if (found ||IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (found ||IS_GEN9_BC (dev_priv))intel_ddi_init (dev_priv,PORT_A );/* DDI B, C and D detection is indicated by the SFUSE_STRAP
@@ -15691,7 +15691,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)/* * On SKL we don't have a way to detect DDI-E so we rely on VBT. */ -if ((IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) && +if ((IS_GEN9_BC (dev_priv)) && (dev_priv->vbt.ddi_port_info[PORT_E ].supports_dp || dev_priv->vbt.ddi_port_info[PORT_E ].supports_dvi || dev_priv->vbt.ddi_port_info[PORT_E ].supports_hdmi))
@@ -16190,7 +16190,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) }/* Returns the core display clock speed */ -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv)) dev_priv->display.get_display_clock_speed = skylake_get_display_clock_speed;else if (IS_GEN9_LP (dev_priv))
@@ -16271,7 +16271,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) bxt_modeset_commit_cdclk; dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + }else if (IS_GEN9_BC (dev_priv)) { dev_priv->display.modeset_commit_cdclk = skl_modeset_commit_cdclk; dev_priv->display.modeset_calc_cdclk =
drivers/gpu/drm/i915/intel_dp.c +2 -2
@@ -226,7 +226,7 @@ static u8 intel_dp_max_lane_count(struct intel_dp *intel_dp)if (IS_GEN9_LP (dev_priv)) { *source_rates = bxt_rates; size =ARRAY_SIZE (bxt_rates); - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + }else if (IS_GEN9_BC (dev_priv)) { *source_rates = skl_rates; size =ARRAY_SIZE (skl_rates); }else {
@@ -1752,7 +1752,7 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,* clock for eDP. This will affect cdclk as well. */ if (is_edp (intel_dp) && - (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv))) { + (IS_GEN9_BC (dev_priv))) {int vco;switch (pipe_config->port_clock /2 ) {
drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
@@ -2015,7 +2015,7 @@ void intel_shared_dpll_init(struct drm_device *dev)const struct dpll_info *dpll_info;int i; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv)) dpll_mgr = &skl_pll_mgr;else if (IS_GEN9_LP (dev_priv)) dpll_mgr = &bxt_pll_mgr;
drivers/gpu/drm/i915/intel_fbc.c +1 -2
@@ -537,8 +537,7 @@ static int find_compression_threshold(struct drm_i915_private *dev_priv,* reserved range size, so it always assumes the maximum (8mb) is used. * If we enable FBC using a CFB on that memory range we'll get FIFO * underruns, even if that range is not reserved by the BIOS. */ -if (IS_BROADWELL (dev_priv) || -IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_BROADWELL (dev_priv) ||IS_GEN9_BC (dev_priv)) end = ggtt->stolen_size -8 *1024 *1024 ;else end =U64_MAX ;
drivers/gpu/drm/i915/intel_i2c.c +2 -2
@@ -74,7 +74,7 @@ static const struct gmbus_pin *get_gmbus_pin(struct drm_i915_private *dev_priv, {if (IS_GEN9_LP (dev_priv))return &gmbus_pins_bxt[pin]; -else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +else if (IS_GEN9_BC (dev_priv))return &gmbus_pins_skl[pin];else if (IS_BROADWELL (dev_priv))return &gmbus_pins_bdw[pin];
@@ -89,7 +89,7 @@ bool intel_gmbus_is_valid_pin(struct drm_i915_private *dev_priv,if (IS_GEN9_LP (dev_priv)) size =ARRAY_SIZE (gmbus_pins_bxt); -else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +else if (IS_GEN9_BC (dev_priv)) size =ARRAY_SIZE (gmbus_pins_skl);else if (IS_BROADWELL (dev_priv)) size =ARRAY_SIZE (gmbus_pins_bdw);
drivers/gpu/drm/i915/intel_mocs.c +1 -1
@@ -178,7 +178,7 @@ static bool get_mocs_settings(struct drm_i915_private *dev_priv, {bool result = false; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) { table->size =ARRAY_SIZE (skylake_mocs_table); table->table = skylake_mocs_table; result = true;
drivers/gpu/drm/i915/intel_pm.c +6 -7
@@ -2895,8 +2895,7 @@ static bool skl_needs_memory_bw_wa(struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv) || -IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv) ||IS_BROXTON (dev_priv))return true;return false;
@@ -5294,7 +5293,7 @@ static void gen6_init_rps_frequencies(struct drm_i915_private *dev_priv) dev_priv->rps.efficient_freq = dev_priv->rps.rp1_freq;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv) || -IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +IS_GEN9_BC (dev_priv)) {u32 ddcc_status =0 ; if (sandybridge_pcode_read(dev_priv,
@@ -5307,7 +5306,7 @@ static void gen6_init_rps_frequencies(struct drm_i915_private *dev_priv) dev_priv->rps.max_freq); } -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {/* Store the frequency values in 16.66 MHZ units, which is * the natural hardware unit for SKL */
@@ -5637,7 +5636,7 @@ static void gen6_update_ring_freq(struct drm_i915_private *dev_priv)/* convert DDR frequency from units of 266.6MHz to bandwidth */ min_ring_freq =mult_frac (min_ring_freq,8 ,3 ); -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = dev_priv->rps.min_freq /GEN9_FREQ_SCALER ; max_gpu_freq = dev_priv->rps.max_freq /GEN9_FREQ_SCALER ;
@@ -5655,7 +5654,7 @@ static void gen6_update_ring_freq(struct drm_i915_private *dev_priv)int diff = max_gpu_freq - gpu_freq;unsigned int ia_freq =0 , ring_freq =0 ; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {/* * ring_freq = 2 * GT. ring_freq is in 100MHz units * No floor required for ring frequency on SKL.
@@ -6775,7 +6774,7 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv) }else if (INTEL_GEN (dev_priv) >=9 ) {gen9_enable_rc6 (dev_priv);gen9_enable_rps (dev_priv); -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))gen6_update_ring_freq (dev_priv); }else if (IS_BROADWELL (dev_priv)) {gen8_enable_rps (dev_priv);
drivers/gpu/drm/i915/intel_runtime_pm.c +5 -5
@@ -732,7 +732,7 @@ void skl_disable_dc6(struct drm_i915_private *dev_priv)* other request bits to be set, so WARN for those. */ if (power_well_id ==SKL_DISP_PW_1 || - ((IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) && + ((IS_GEN9_BC (dev_priv )) && power_well_id ==SKL_DISP_PW_MISC_IO ))DRM_DEBUG_DRIVER ("Clearing auxiliary requests for %s forced on " "by DMC\n" , power_well->name);
@@ -2323,7 +2323,7 @@ static uint32_t get_allowed_dc_mask(const struct drm_i915_private *dev_priv,int requested_dc;int max_dc; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) { max_dc =2 ; mask =0 ; }else if (IS_GEN9_LP (dev_priv)) {
@@ -2398,7 +2398,7 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)set_power_wells (power_domains, hsw_power_wells); }else if (IS_BROADWELL (dev_priv)) {set_power_wells (power_domains, bdw_power_wells); - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + }else if (IS_GEN9_BC (dev_priv)) {set_power_wells (power_domains, skl_power_wells); }else if (IS_BROXTON (dev_priv)) {set_power_wells (power_domains, bxt_power_wells);
@@ -2730,7 +2730,7 @@ void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume) power_domains->initializing = true; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {skl_display_core_init (dev_priv, resume); }else if (IS_GEN9_LP (dev_priv)) {bxt_display_core_init (dev_priv, resume);
@@ -2769,7 +2769,7 @@ void intel_power_domains_suspend(struct drm_i915_private *dev_priv)if (!i915.disable_power_well)intel_display_power_put (dev_priv,POWER_DOMAIN_INIT ); -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))skl_display_core_uninit (dev_priv);else if (IS_GEN9_LP (dev_priv))bxt_display_core_uninit (dev_priv);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/kbl: Apply WaIncreaseDefaultTLBEntries on KBL.
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915/kbl: Apply WaIncreaseDefaultTLBEntries on KBL.
URL : https://patchwork.freedesktop.org/series/18421/
State : success
== Summary ==
Series 18421v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/18421/revisions/1/mbox/
Test kms_force_connector_basic:
Subgroup force-connector-state:
dmesg-warn -> PASS (fi-snb-2520m)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
dmesg-warn -> PASS (fi-skl-6700hq)fi-bdw-5557u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:246 pass:207 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22 fi-bxt-t5700 total:79 pass:66 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-j1900 total:246 pass:219 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-4770r total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-ivb-3520m total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-ivb-3770 total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:246 pass:226 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:246 pass:222 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
c34072a82a390d575f7f0394fcf92437898d75d3 drm-tip: 2017y-01m-23d-15h-54m-20s UTC integration manifest 9fe8064 drm/i915: Introduce IS_GEN9_BC for Skylake and Kabylake.
3c5015f drm/i915/kbl: Apply WaIncreaseDefaultTLBEntries on KBL.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3585/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/kbl: Apply WaIncreaseDefaultTLBEntries on KBL.
Ander, can I carry your rv-b on this v2?
Jani, with Ander confirmation can I merge these 2 patches?
Quoted 47 lines · Patchwork
== Series Details ==
Series: series starting with [1/2] drm/i915/kbl: Apply WaIncreaseDefaultTLBEntries on KBL.
URL : https://patchwork.freedesktop.org/series/18421/
State : success== Summary ==
Series 18421v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/18421/revisions/1/mbox/Test
kms_force_connector_basic:Subgroup force-connector-state: dmesg-warn -> PASS (fi-snb-2520m) Test kms_pipe_crc_basic: Subgroup suspend-read-crc-pipe-c: dmesg-warn -> PASS (fi-skl-6700hq)fi-bdw-5557u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:246 pass:207 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22 fi-bxt-t5700 total:79 pass:66 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-j1900 total:246 pass:219 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-4770r total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-ivb-3520m total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-ivb-3770 total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:246 pass:226 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:246 pass:222 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
c34072a82a390d575f7f0394fcf92437898d75d3drm-tip: 2017y-01m-23d-15h-54m-20s UTC integration manifest 9fe8064 drm/i915: IntroduceIS_GEN9_BCfor Skylake and Kabylake.
3c5015f drm/i915/kbl: Apply WaIncreaseDefaultTLBEntries on KBL.== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3585/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
Acked-byRe: ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/kbl: Apply WaIncreaseDefaultTLBEntries on KBL.
Quoted 3 lines · Rodrigo Vivi
Ander, can I carry your rv-b on this v2?
Jani, with Ander confirmation can I merge these 2 patches?
Quoted 51 lines
Quoted 47 lines · Patchwork
== Series Details ==
Series: series starting with [1/2] drm/i915/kbl: Apply WaIncreaseDefaultTLBEntries on KBL.
URL : https://patchwork.freedesktop.org/series/18421/
State : success== Summary ==
Series 18421v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/18421/revisions/1/mbox/Test
kms_force_connector_basic:Subgroup force-connector-state: dmesg-warn -> PASS (fi-snb-2520m) Test kms_pipe_crc_basic: Subgroup suspend-read-crc-pipe-c: dmesg-warn -> PASS (fi-skl-6700hq)fi-bdw-5557u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:246 pass:207 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22 fi-bxt-t5700 total:79 pass:66 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-j1900 total:246 pass:219 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-4770r total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-ivb-3520m total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-ivb-3770 total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:246 pass:226 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:246 pass:222 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
c34072a82a390d575f7f0394fcf92437898d75d3drm-tip: 2017y-01m-23d-15h-54m-20s UTC integration manifest 9fe8064 drm/i915: IntroduceIS_GEN9_BCfor Skylake and Kabylake.
3c5015f drm/i915/kbl: Apply WaIncreaseDefaultTLBEntries on KBL.== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3585/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Introduce IS_GEN9_BC for Skylake and Kabylake.
In reply to Rodrigo ViviQuoted 316 lines · Rodrigo Vivi
Along with GLK it was introduced the .is_lp and
IS_GEN9_LP. So, following the same simplification standard we can put Skylake and Kabylake under the same bucket for most of the things.So let's add the
IS_GEN9_BCfor "Big Core" (non Atom based platforms).The
i915_drv.cwas let out of this patch on purpose because that is really a decision per platform, just like other cases whereIS_KABYLAKEis different fromIS_SKYLAKE.v2: fix conflict with
IS_LPand 3 new cases for this big core bucket:
-intel_ddi.c:intel_ddi_get_link_dpll
-intel_fbc.c:find_compression_threshold
-i915_gem_gtt.c:gtt_write_workaroundsCc Anusha Srivatsa <[email protected]>Cc Ander Conselvan de Oliveira <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Reviewed-by Ander Conselvan de Oliveira <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 17 +++++++---------- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_color.c | 4 ++-- drivers/gpu/drm/i915/intel_ddi.c | 20 ++++++++++---------- drivers/gpu/drm/i915/intel_display.c | 12 ++++++------ drivers/gpu/drm/i915/intel_dp.c | 4 ++-- drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/intel_fbc.c | 3 +-- drivers/gpu/drm/i915/intel_i2c.c | 4 ++-- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 13 ++++++-------drivers/gpu/drm/i915/intel_runtime_pm.c| 10 +++++-----14 files changed, 47 insertions(+), 51 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -1224,21 +1224,18 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
max_freq= (IS_GEN9_LP(dev_priv)?rp_state_cap>> 0 :
rp_state_cap >> 16) &0xff;drivers/gpu/drm/i915/i915_debugfs.c +1
-2- max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ? - GEN9_FREQ_SCALER : 1); + max_freq *= (IS_GEN9_BC (dev_priv) ?GEN9_FREQ_SCALER :1 );
seq_printf(m, "Lowest (RPN) frequency: %dMHz\n", intel_gpu_freq(dev_priv, max_freq));
max_freq= (rp_state_cap&0xff00) >> 8;drivers/gpu/drm/i915/i915_debugfs.c +1
-2- max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ? - GEN9_FREQ_SCALER : 1); + max_freq *= (IS_GEN9_BC (dev_priv) ?GEN9_FREQ_SCALER :1 );
seq_printf(m, "Nominal (RP1) frequency: %dMHz\n", intel_gpu_freq(dev_priv, max_freq));
max_freq= (IS_GEN9_LP(dev_priv)?rp_state_cap>> 16 :
rp_state_cap >> 0) &0xff;drivers/gpu/drm/i915/i915_debugfs.c +1
-2- max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ? - GEN9_FREQ_SCALER : 1); + max_freq *= (IS_GEN9_BC (dev_priv) ?GEN9_FREQ_SCALER :1 );
seq_printf(m, "Max non-overclocked (RP0) frequency: %dMHz\n", intel_gpu_freq(dev_priv, max_freq)); seq_printf(m, "Max overclocked frequency: %dMHz\n",drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -1814,7 +1811,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) if (ret) goto out;drivers/gpu/drm/i915/i915_debugfs.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {/* Convert GT frequency to 50 HZ units */
min_gpu_freq=
dev_priv->rps.min_freq_softlimit/GEN9_FREQ_SCALER;drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -1834,8 +1831,8 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) &ia_freq); seq_printf(m, "%d\t\t%d\t\t\t\t%d\n",intel_gpu_freq(dev_priv, (
gpu_freq*drivers/gpu/drm/i915/i915_debugfs.c +0
-1- (IS_SKYLAKE(dev_priv) ||
IS_KABYLAKE(dev_priv)?drivers/gpu/drm/i915/i915_debugfs.c +2
-1- GEN9_FREQ_SCALER : 1))), + (IS_GEN9_BC(dev_priv) ? + GEN9_FREQ_SCALER :1))),
((ia_freq >> 0) &0xff) * 100, ((ia_freq>> 8) &0xff) * 100); }drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -4444,7 +4441,7 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv,
sseu->slice_mask|= BIT(s);drivers/gpu/drm/i915/i915_debugfs.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))
sseu->subslice_mask= INTEL_INFO(dev_priv)->sseu.subslice_mask;drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2756,8 +2756,9 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg) #define IS_GEN8(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(7))) #define IS_GEN9(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(8)))
-#defineIS_GEN9_LP(dev_priv)(IS_GEN9(dev_priv)&&
INTEL_INFO(dev_priv)->is_lp)
#defineIS_LP(dev_priv)(INTEL_INFO(dev_priv)->is_lp)drivers/gpu/drm/i915/i915_drv.h +2
-0+#define IS_GEN9_LP (dev_priv) (IS_GEN9(dev_priv) && IS_LP(dev_priv)) +#define IS_GEN9_BC (dev_priv) (IS_GEN9(dev_priv) && !IS_LP(dev_priv))
#defineENGINE_MASK(id)BIT(id)
#defineRENDER_RINGENGINE_MASK(RCS)drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1@@ -2189,7 +2189,7 @@ static void gtt_write_workarounds(struct drm_i915_private *dev_priv) I915_WRITE(GEN8_L3_LRA_1_GPGPU,GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_BDW ); else if (IS_CHERRYVIEW(dev_priv)) I915_WRITE(GEN8_L3_LRA_1_GPGPU,GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_CHV ); -else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +else if (IS_GEN9_BC (dev_priv))I915_WRITE(GEN8_L3_LRA_1_GPGPU,
GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_SKL);
else if (IS_BROXTON(dev_priv))
I915_WRITE(GEN8_L3_LRA_1_GPGPU,GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_BXT);drivers/gpu/drm/i915/intel_audio.c +0
-0@@ -702,7 +702,7 @@ static void i915_audio_component_codec_wake_override(struct device *kdev, struct drm_i915_private *dev_priv = kdev_to_i915(kdev); u32 tmp;drivers/gpu/drm/i915/intel_audio.c +1
-1-if (!IS_SKYLAKE (dev_priv) && !IS_KABYLAKE (dev_priv)) +if (!IS_GEN9_BC (dev_priv))return;
i915_audio_component_get_power(kdev);drivers/gpu/drm/i915/intel_color.c +2
-2@@ -536,8 +536,8 @@ void intel_color_init(struct drm_crtc *crtc) } else if (IS_HASWELL(dev_priv)) { dev_priv->display.load_csc_matrix = i9xx_load_csc_matrix; dev_priv->display.load_luts = haswell_load_luts; - }else if (IS_BROADWELL (dev_priv) ||IS_SKYLAKE (dev_priv) || - IS_BROXTON(dev_priv) || IS_KABYLAKE(dev_priv)) { + }else if (IS_BROADWELL (dev_priv) ||IS_GEN9_BC (dev_priv) || + IS_BROXTON(dev_priv)) { dev_priv->display.load_csc_matrix = i9xx_load_csc_matrix; dev_priv->display.load_luts = broadwell_load_luts; } else {drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -445,7 +445,7 @@ static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port por if (IS_GEN9_LP(dev_priv)) return hdmi_level;drivers/gpu/drm/i915/intel_ddi.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {
skl_get_buf_trans_hdmi(dev_priv, &n_hdmi_entries);hdmi_default_entry= 8;
} else if (IS_BROADWELL(dev_priv)) {drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -518,7 +518,7 @@ void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder) n_dp_entries = ARRAY_SIZE(bdw_ddi_translations_dp); }drivers/gpu/drm/i915/intel_ddi.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {/* If we're boosting the current, set bit 31 of trans1 */ if (dev_priv->vbt.ddi_port_info[port].dp_boost_level)
iboost_bit=DDI_BUF_BALANCE_LEG_ENABLE;drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -572,7 +572,7 @@ static void intel_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder)
hdmi_level=intel_ddi_hdmi_level(dev_priv, port);drivers/gpu/drm/i915/intel_ddi.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {
ddi_translations_hdmi=skl_get_buf_trans_hdmi(dev_priv, &n_hdmi_entries);
/* If we're boosting the current, set bit 31 of trans1 */drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1089,7 +1089,7 @@ void intel_ddi_clock_get(struct intel_encoder *encoder,
if (INTEL_GEN(dev_priv)<= 8)hsw_ddi_clock_get(encoder, pipe_config);drivers/gpu/drm/i915/intel_ddi.c +1
-1-else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +else if (IS_GEN9_BC (dev_priv))
skl_ddi_clock_get(encoder, pipe_config); else if (IS_GEN9_LP(dev_priv))bxt_ddi_clock_get(encoder, pipe_config);drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1150,7 +1150,7 @@ bool intel_ddi_pll_select(struct intel_crtc *intel_crtc,struct
intel_encoder*intel_encoder=intel_ddi_get_crtc_new_encoder(crtc_state);drivers/gpu/drm/i915/intel_ddi.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))return
skl_ddi_pll_select(intel_crtc, crtc_state, intel_encoder); else if (IS_GEN9_LP(dev_priv))drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1641,7 +1641,7 @@ uint32_t ddi_signal_levels(struct intel_dp *intel_dp)
level =translate_signal_level(signal_levels);drivers/gpu/drm/i915/intel_ddi.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))
skl_ddi_set_iboost(encoder, level);
else if (IS_GEN9_LP(dev_priv)) bxt_ddi_vswing_sequence(dev_priv, level, port, encoder-Quoted 1 line
type);
drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1658,7 +1658,7 @@ void intel_ddi_clk_select(struct intel_encoder *encoder, if (WARN_ON(!pll)) return;drivers/gpu/drm/i915/intel_ddi.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {
uint32_tval;
/* DDI -> PLL mapping */drivers/gpu/drm/i915/intel_ddi.c +1
-1@@ -1714,7 +1714,7 @@ static void intel_ddi_pre_enable_hdmi(structintel_encoder *encoder, intel_dp_dual_mode_set_tmds_output(intel_hdmi, true); intel_ddi_clk_select(encoder, pll); intel_prepare_hdmi_ddi_buffers(encoder); -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv)) skl_ddi_set_iboost(encoder, level); else if (IS_GEN9_LP(dev_priv))bxt_ddi_vswing_sequence(dev_priv, level, port,
drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1784,7 +1784,7 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder, intel_edp_panel_off(intel_dp); }drivers/gpu/drm/i915/intel_ddi.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))
I915_WRITE(DPLL_CTRL2, (I915_READ(DPLL_CTRL2) | DPLL_CTRL2_DDI_CLK_OFF(port))); else if (INTEL_GEN(dev_priv)< 9)drivers/gpu/drm/i915/intel_ddi.c +1
-1@@ -2157,7 +2157,7 @@ struct intel_shared_dpll * pll->state = tmp_pll_state; return NULL; } - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + }else if (IS_GEN9_BC (dev_priv)) { pll = skl_find_link_pll(dev_priv, clock); } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { pll = hsw_ddi_dp_get_dpll(encoder, clock);drivers/gpu/drm/i915/intel_display.c +0
-0@@ -5800,7 +5800,7 @@ static int intel_compute_max_dotclk(struct drm_i915_private *dev_priv)
static voidintel_update_max_cdclk(struct drm_i915_private *dev_priv){drivers/gpu/drm/i915/intel_display.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {u32 limit =
I915_READ(SKL_DFSM)&SKL_DFSM_CDCLK_LIMIT_MASK; intmax_cdclk, vco;drivers/gpu/drm/i915/intel_display.c +0
-0@@ -10673,7 +10673,7 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc,
port = (tmp &TRANS_DDI_PORT_MASK) >>TRANS_DDI_PORT_SHIFT;drivers/gpu/drm/i915/intel_display.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))
skylake_get_ddi_pll(dev_priv, port, pipe_config); else if (IS_GEN9_LP(dev_priv))bxt_get_ddi_pll(dev_priv, port, pipe_config);drivers/gpu/drm/i915/intel_display.c +0
-0@@ -15675,7 +15675,7 @@ static void intel_setup_outputs(structdrm_i915_private *dev_priv) */ found = I915_READ(DDI_BUF_CTL(PORT_A)) &
DDI_INIT_DISPLAY_DETECTED;
/* WaIgnoreDDIAStrap: skl */drivers/gpu/drm/i915/intel_display.c +1
-1-if (found ||IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (found ||IS_GEN9_BC (dev_priv))
intel_ddi_init(dev_priv, PORT_A);
/* DDI B, C and D detection is indicated by theSFUSE_STRAPdrivers/gpu/drm/i915/intel_display.c +0
-0@@ -15691,7 +15691,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) /** On SKL we don't have a way to detect DDI-E so we rely on VBT.
*/
drivers/gpu/drm/i915/intel_display.c static void intel_setup_outputs(struct drm_i915_private *dev_priv) · line 15694
Quoted 2 lines
drivers/gpu/drm/i915/intel_display.c +1
-1- if ((IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) && + if ((IS_GEN9_BC(dev_priv)) &&
No need for the extra parenthesis around IS_GEN_BC().
Quoted 42 lines
(dev_priv->vbt.ddi_port_info[PORT_E].supports_dp || dev_priv->vbt.ddi_port_info[PORT_E].supports_dvi || dev_priv->vbt.ddi_port_info[PORT_E].supports_hdmi))
drivers/gpu/drm/i915/intel_display.c +0
-0@@ -16190,7 +16190,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) }
/* Returns the core display clock speed */drivers/gpu/drm/i915/intel_display.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))
dev_priv->display.get_display_clock_speed=skylake_get_display_clock_speed; else if (IS_GEN9_LP(dev_priv))drivers/gpu/drm/i915/intel_display.c +0
-0@@ -16271,7 +16271,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) bxt_modeset_commit_cdclk;
dev_priv->display.modeset_calc_cdclk=bxt_modeset_calc_cdclk;drivers/gpu/drm/i915/intel_display.c +1
-1- }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + }else if (IS_GEN9_BC (dev_priv)) {
dev_priv->display.modeset_commit_cdclk=skl_modeset_commit_cdclk;dev_priv->display.modeset_calc_cdclk=drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -226,7 +226,7 @@ static u8 intel_dp_max_lane_count(struct intel_dp *intel_dp) if (IS_GEN9_LP(dev_priv)) { *source_rates = bxt_rates; size = ARRAY_SIZE(bxt_rates); - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + }else if (IS_GEN9_BC (dev_priv)) { *source_rates = skl_rates; size = ARRAY_SIZE(skl_rates);} else {
drivers/gpu/drm/i915/intel_dp.c +0
-0@@ -1752,7 +1752,7 @@ static int intel_dp_compute_bpp(struct intel_dp*intel_dp, * clock for eDP. This will affect cdclk as well. */ if (
is_edp(intel_dp)&&
drivers/gpu/drm/i915/intel_dp.c static int intel_dp_compute_bpp(struct intel_dp *intel_dp, · line 1755
Quoted 2 lines
drivers/gpu/drm/i915/intel_dp.c +1
-1- (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))) { + (IS_GEN9_BC(dev_priv))) {
I think this should fit all in one line now:
if (is_edp(intel_dp) && IS_GEN9_BC(dev_priv)) {Quoted 148 lines
int vco;
switch (pipe_config->port_clock/ 2) {drivers/gpu/drm/i915/intel_dpll_mgr.c +0
-0@@ -2015,7 +2015,7 @@ void intel_shared_dpll_init(struct drm_device *dev) const struct dpll_info *dpll_info; int i;drivers/gpu/drm/i915/intel_dpll_mgr.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))
dpll_mgr=&skl_pll_mgr;
else if (IS_GEN9_LP(dev_priv))
dpll_mgr=&bxt_pll_mgr;drivers/gpu/drm/i915/intel_fbc.c +0
-0@@ -537,8 +537,7 @@ static int find_compression_threshold(structdrm_i915_private *dev_priv, * reserved range size, so it always assumes the maximum (8mb) isused.
* If we enable FBC using a CFB on that memory range we'll get FIFO
* underruns, even if that range is not reserved by the BIOS. */drivers/gpu/drm/i915/intel_fbc.c +1
-2-if (IS_BROADWELL (dev_priv) || - IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) +if (IS_BROADWELL (dev_priv) ||IS_GEN9_BC (dev_priv))end =
ggtt->stolen_size- 8 * 1024 * 1024; else
end =U64_MAX;drivers/gpu/drm/i915/intel_i2c.c +1
-1@@ -74,7 +74,7 @@ static const struct gmbus_pin *get_gmbus_pin(structdrm_i915_private *dev_priv, { if (IS_GEN9_LP(dev_priv)) return &gmbus_pins_bxt[pin]; - else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) + else if (IS_GEN9_BC(dev_priv)) return &gmbus_pins_skl[pin]; else if (IS_BROADWELL(dev_priv))return &gmbus_pins_bdw[pin];
drivers/gpu/drm/i915/intel_i2c.c +0
-0@@ -89,7 +89,7 @@ bool intel_gmbus_is_valid_pin(struct drm_i915_private *dev_priv,
if (IS_GEN9_LP(dev_priv))
size =ARRAY_SIZE(gmbus_pins_bxt);drivers/gpu/drm/i915/intel_i2c.c +1
-1-else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +else if (IS_GEN9_BC (dev_priv))size =
ARRAY_SIZE(gmbus_pins_skl); else if (IS_BROADWELL(dev_priv)) size =ARRAY_SIZE(gmbus_pins_bdw);drivers/gpu/drm/i915/intel_mocs.c +0
-0@@ -178,7 +178,7 @@ static bool get_mocs_settings(struct drm_i915_private *dev_priv, { bool result = false;drivers/gpu/drm/i915/intel_mocs.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {table->size =
ARRAY_SIZE(skylake_mocs_table);table->table=skylake_mocs_table; result = true;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -2895,8 +2895,7 @@ static bool skl_needs_memory_bw_wa(struct intel_atomic_state *state) { struct drm_i915_private *dev_priv = to_i915(state->base.dev);drivers/gpu/drm/i915/intel_pm.c +1
-2-if (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv) || - IS_KABYLAKE(dev_priv)) +if (IS_GEN9_BC (dev_priv) ||IS_BROXTON (dev_priv))return true;
return false;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -5294,7 +5293,7 @@ static void gen6_init_rps_frequencies(struct drm_i915_private *dev_priv)
dev_priv->rps.efficient_freq=dev_priv->rps.rp1_freq; if (IS_HASWELL(dev_priv)||IS_BROADWELL(dev_priv)||drivers/gpu/drm/i915/intel_pm.c +1
-1- IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) { + IS_GEN9_BC(dev_priv)) {u32
ddcc_status= 0;
if (sandybridge_pcode_read(dev_priv,drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -5307,7 +5306,7 @@ static void gen6_init_rps_frequencies(struct drm_i915_private *dev_priv) dev_priv->rps.max_freq); }drivers/gpu/drm/i915/intel_pm.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {/* Store the frequency values in 16.66 MHZ units, which is
* the natural hardware unit for SKL
*/drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -5637,7 +5636,7 @@ static void gen6_update_ring_freq(struct drm_i915_private *dev_priv) /* convert DDR frequency from units of 266.6MHz to bandwidth */ min_ring_freq = mult_frac(min_ring_freq, 8, 3);drivers/gpu/drm/i915/intel_pm.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {/* Convert GT frequency to 50 HZ units */
min_gpu_freq=dev_priv->rps.min_freq/GEN9_FREQ_SCALER;max_gpu_freq=dev_priv->rps.max_freq/GEN9_FREQ_SCALER;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -5655,7 +5654,7 @@ static void gen6_update_ring_freq(struct drm_i915_private *dev_priv) int diff = max_gpu_freq - gpu_freq; unsigned int ia_freq = 0, ring_freq = 0;drivers/gpu/drm/i915/intel_pm.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {/*
*ring_freq= 2 * GT.ring_freqis in 100MHz units
* No floor required for ring frequency on SKL.drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -6775,7 +6774,7 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv) } else if (INTEL_GEN(dev_priv) >= 9) { gen9_enable_rc6(dev_priv); gen9_enable_rps(dev_priv); -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv)) gen6_update_ring_freq(dev_priv); } else if (IS_BROADWELL(dev_priv)) {
gen8_enable_rps(dev_priv);drivers/gpu/drm/i915/intel_runtime_pm.c +0
-0@@ -732,7 +732,7 @@ void skl_disable_dc6(struct drm_i915_private *dev_priv)* other request bits to be set, so WARN for those. */ if (
power_well_id==SKL_DISP_PW_1||
drivers/gpu/drm/i915/intel_runtime_pm.c void skl_disable_dc6(struct drm_i915_private *dev_priv) · line 735
Quoted 2 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1
-1- ((IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) && + ((IS_GEN9_BC(dev_priv)) &&
Extra parenthesis here too.
Quoted 41 lines
power_well_id ==
SKL_DISP_PW_MISC_IO)) DRM_DEBUG_DRIVER("Clearing auxiliary requests for %s forced on "
"by DMC\n",power_well->name);drivers/gpu/drm/i915/intel_runtime_pm.c +0
-0@@ -2323,7 +2323,7 @@ static uint32_t get_allowed_dc_mask(const structdrm_i915_private *dev_priv, int requested_dc; int max_dc;drivers/gpu/drm/i915/intel_runtime_pm.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {
max_dc= 2;
mask = 0;
} else if (IS_GEN9_LP(dev_priv)) {drivers/gpu/drm/i915/intel_runtime_pm.c +1
-1@@ -2398,7 +2398,7 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv) set_power_wells(power_domains, hsw_power_wells); } else if (IS_BROADWELL(dev_priv)) { set_power_wells(power_domains, bdw_power_wells); - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + }else if (IS_GEN9_BC (dev_priv)) { set_power_wells(power_domains, skl_power_wells); } else if (IS_BROXTON(dev_priv)) {
set_power_wells(power_domains, bxt_power_wells);drivers/gpu/drm/i915/intel_runtime_pm.c +0
-0@@ -2730,7 +2730,7 @@ void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume)
power_domains->initializing= true;drivers/gpu/drm/i915/intel_runtime_pm.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv)) {
skl_display_core_init(dev_priv, resume); } else if (IS_GEN9_LP(dev_priv)) {bxt_display_core_init(dev_priv, resume);drivers/gpu/drm/i915/intel_runtime_pm.c +0
-0@@ -2769,7 +2769,7 @@ void intel_power_domains_suspend(struct drm_i915_private *dev_priv) if (!i915.disable_power_well) intel_display_power_put(dev_priv, POWER_DOMAIN_INIT);drivers/gpu/drm/i915/intel_runtime_pm.c +1
-1-if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_GEN9_BC (dev_priv))
Quoted 3 lines
skl_display_core_uninit(dev_priv); else if (IS_GEN9_LP(dev_priv))bxt_display_core_uninit(dev_priv);
With those nits fixed:
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx