drm/i915: Use IS_GEN9 and IS_LP to put Skylake and Kabylake in the same bucket.
Subsystems (2)
PATCH 1/1 drm/i915: Use IS_GEN9 and IS_LP to put Skylake and Kabylake in the same bucket.
With GLK was introduced IS_LP.
With this, we can use IS_GEN9 and IS_LP to put Skylake and Kabylake in the same bucket. The main intention is to simplify the if and else statements that gets added for every new platform.
This approach proposes the idea to create a common bucket to put multiple platforms (SKL and KBL in this case) together. Another approach would be to introduce IS_GEN9_BC as suggested by Rodrigo, where _BC stands for Big Core.
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.
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 ++++++------ 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_device_info.c | 2 +- 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 | 2 +- drivers/gpu/drm/i915/intel_i2c.c | 4 ++-- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 11 +++++------ 12 files changed, 38 insertions(+), 39 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +6 -6
@@ -1224,20 +1224,20 @@ 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) ? + max_freq *= ((IS_GEN9 (dev_priv) && !IS_LP (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) ? + max_freq *= ((IS_GEN9 (dev_priv) && !IS_LP (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) ? + max_freq *= ((IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Max non-overclocked (RP0) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq));
@@ -1814,7 +1814,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 (dev_priv) && !IS_LP (dev_priv)) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = dev_priv->rps.min_freq_softlimit /GEN9_FREQ_SCALER ;
@@ -1834,7 +1834,7 @@ 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) ? + ((IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) ?GEN9_FREQ_SCALER :1 ))), ((ia_freq >>0 ) &0xff ) *100 , ((ia_freq >>8 ) &0xff ) *100 );
@@ -4444,7 +4444,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 (dev_priv) && !IS_LP (dev_priv)) sseu->subslice_mask =INTEL_INFO (dev_priv)->sseu.subslice_mask;
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 (dev_priv) && !IS_LP (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 (dev_priv) && + !IS_GEMINILAKE (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 @@ intel_ddi_get_link_dpll(struct intel_dp *intel_dp, int clock) pll->state = tmp_pll_state;return NULL ; } - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + }else if (IS_GEN9 (dev_priv) && !IS_LP (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_device_info.c +1 -1
@@ -189,7 +189,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv)* pair per subslice. */ sseu->has_slice_pg = - (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) && + (IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) &&hweight8 (sseu->slice_mask) >1 ; sseu->has_subslice_pg =IS_GEN9_LP (dev_priv) &&sseu_subslice_total (sseu) >1 ;
drivers/gpu/drm/i915/intel_display.c +6 -6
@@ -5799,7 +5799,7 @@ static int skl_calc_cdclk(int max_pixclk, int vco);static void intel_update_max_cdclk (struct drm_i915_private *dev_priv) { -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) {u32 limit =I915_READ (SKL_DFSM ) &SKL_DFSM_CDCLK_LIMIT_MASK ;int max_cdclk, vco;
@@ -10666,7 +10666,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 (dev_priv) && !IS_LP (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);
@@ -15667,7 +15667,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 (dev_priv) && !IS_LP (dev_priv)))intel_ddi_init (dev_priv,PORT_A );/* DDI B, C and D detection is indicated by the SFUSE_STRAP
@@ -15683,7 +15683,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 (dev_priv) && !IS_LP (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))
@@ -16182,7 +16182,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 (dev_priv) && !IS_LP (dev_priv)) dev_priv->display.get_display_clock_speed = skylake_get_display_clock_speed;else if (IS_GEN9_LP (dev_priv))
@@ -16263,7 +16263,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 (dev_priv) && !IS_LP (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 @@ intel_dp_source_rates(struct intel_dp *intel_dp, const int **source_rates)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 (dev_priv) && !IS_LP (dev_priv)) { *source_rates = skl_rates; size =ARRAY_SIZE (skl_rates); }else {
@@ -1752,7 +1752,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,* clock for eDP. This will affect cdclk as well. */ if (is_edp (intel_dp) && - (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv))) { + (IS_GEN9 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 -1
@@ -538,7 +538,7 @@ static int find_compression_threshold(struct drm_i915_private *dev_priv,* 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)) + (IS_GEN9 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (dev_priv)) { table->size =ARRAY_SIZE (skylake_mocs_table); table->table = skylake_mocs_table; result = true;
drivers/gpu/drm/i915/intel_pm.c +5 -6
@@ -5293,8 +5293,7 @@ static void gen6_init_rps_frequencies(struct drm_i915_private *dev_priv) dev_priv->rps.max_freq = dev_priv->rps.rp0_freq; 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)) { +if ((INTEL_GEN (dev_priv) >=7 ) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (dev_priv))gen6_update_ring_freq (dev_priv); }else if (IS_BROADWELL (dev_priv)) {gen8_enable_rps (dev_priv);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Use IS_GEN9 and IS_LP to put Skylake and Kabylake in the same bucket.
== Series Details ==
== Series Details ==
Series: drm/i915: Use IS_GEN9 and IS_LP to put Skylake and Kabylake in the same bucket.
URL : https://patchwork.freedesktop.org/series/18249/
State : failure
== Summary ==
Series 18249v1 drm/i915: Use IS_GEN9 and IS_LP to put Skylake and Kabylake in the same bucket.
https://patchwork.freedesktop.org/api/1.0/series/18249/revisions/1/mbox/
Test gem_busy:
Subgroup basic-hang-default:
fail -> PASS (fi-ivb-3520m)
pass -> FAIL (fi-hsw-4770r)
Test kms_force_connector_basic:
Subgroup force-connector-state:
pass -> DMESG-WARN (fi-snb-2520m)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:226 dwarn:0 dfail:0 fail:1 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:214 dwarn:1 dfail:0 fail:0 skip:31 fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
6155f94d32e438a9656de680897060bd2245629a drm-tip: 2017y-01m-19d-18h-24m-49s UTC integration manifest 754e7eb drm/i915: Use IS_GEN9 and IS_LP to put Skylake and Kabylake in the same bucket.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3551/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Anusha Srivatsa
With GLK was introduced
IS_LP.
With this, we can useIS_GEN9andIS_LPto put Skylake and Kabylake in the same bucket. The main intention is to simplify the if and else statements that gets added for every new platform.This approach proposes the idea to create a common bucket to put multiple platforms (SKL and KBL in this case) together. Another approach would be to introduce
IS_GEN9_BCas suggested by Rodrigo, where_BCstands for Big Core.
I think we need to come up with an alias like IS_GEN9_BC(), although I'm not convinced about that paraticular name. The current (FOO || BAR) for specific FOO and BAR is *much* faster to read than the slightly confusing (GROUP && !SUBGROUP).
One other comment inline.
Quoted 28 lines
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.Cc Rodrigo Vivi <[email protected]>Cc Ander Conselvan de Oliveira <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 12 ++++++------ 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_device_info.c | 2 +- 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 | 2 +- drivers/gpu/drm/i915/intel_i2c.c | 4 ++-- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 11 +++++------ 12 files changed, 38 insertions(+), 39 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0
drivers/gpu/drm/i915/i915_debugfs.c static int i915_frequency_info(struct seq_file *m, void *unused) · line 1228
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -1224,20 +1224,20 @@ 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) ? + max_freq *= ((IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) ?GEN9_FREQ_SCALER :1 );
There's already superfluous braces to begin with, please don't add more! Same all around.
Quoted 370 lines
drivers/gpu/drm/i915/i915_debugfs.c +5
-5seq_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) ? + max_freq *= ((IS_GEN9 (dev_priv) && !IS_LP (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) ? + max_freq *= ((IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Max non-overclocked (RP0) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq));@@ -1814,7 +1814,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 (dev_priv) && !IS_LP (dev_priv)) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = dev_priv->rps.min_freq_softlimit /GEN9_FREQ_SCALER ;@@ -1834,7 +1834,7 @@ 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) ? + ((IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) ?GEN9_FREQ_SCALER :1 ))), ((ia_freq >>0 ) &0xff ) *100 , ((ia_freq >>8 ) &0xff ) *100 );@@ -4444,7 +4444,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 (dev_priv) && !IS_LP (dev_priv)) sseu->subslice_mask =INTEL_INFO (dev_priv)->sseu.subslice_mask;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 (dev_priv) && !IS_LP (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 (dev_priv) && + !IS_GEMINILAKE (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 @@ intel_ddi_get_link_dpll(struct intel_dp *intel_dp, int clock) pll->state = tmp_pll_state;return NULL ; } - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + }else if (IS_GEN9 (dev_priv) && !IS_LP (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_device_info.c +1
-1@@ -189,7 +189,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv)* pair per subslice. */ sseu->has_slice_pg = - (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) && + (IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) &&hweight8 (sseu->slice_mask) >1 ; sseu->has_subslice_pg =IS_GEN9_LP (dev_priv) &&sseu_subslice_total (sseu) >1 ;drivers/gpu/drm/i915/intel_display.c +6
-6@@ -5799,7 +5799,7 @@ static int skl_calc_cdclk(int max_pixclk, int vco);static void intel_update_max_cdclk (struct drm_i915_private *dev_priv) { -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) {u32 limit =I915_READ (SKL_DFSM ) &SKL_DFSM_CDCLK_LIMIT_MASK ;int max_cdclk, vco;@@ -10666,7 +10666,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 (dev_priv) && !IS_LP (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);@@ -15667,7 +15667,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 (dev_priv) && !IS_LP (dev_priv)))intel_ddi_init (dev_priv,PORT_A );/* DDI B, C and D detection is indicated by the SFUSE_STRAP @@ -15683,7 +15683,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 (dev_priv) && !IS_LP (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))@@ -16182,7 +16182,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 (dev_priv) && !IS_LP (dev_priv)) dev_priv->display.get_display_clock_speed = skylake_get_display_clock_speed;else if (IS_GEN9_LP (dev_priv))@@ -16263,7 +16263,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 (dev_priv) && !IS_LP (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 @@ intel_dp_source_rates(struct intel_dp *intel_dp, const int **source_rates)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 (dev_priv) && !IS_LP (dev_priv)) { *source_rates = skl_rates; size =ARRAY_SIZE (skl_rates); }else {@@ -1752,7 +1752,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,* clock for eDP. This will affect cdclk as well. */ if (is_edp (intel_dp) && - (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv))) { + (IS_GEN9 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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
-1@@ -538,7 +538,7 @@ static int find_compression_threshold(struct drm_i915_private *dev_priv,* 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)) + (IS_GEN9 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (dev_priv)) { table->size =ARRAY_SIZE (skylake_mocs_table); table->table = skylake_mocs_table; result = true;drivers/gpu/drm/i915/intel_pm.c +5
-6@@ -5293,8 +5293,7 @@ static void gen6_init_rps_frequencies(struct drm_i915_private *dev_priv) dev_priv->rps.max_freq = dev_priv->rps.rp0_freq; 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)) { +if ((INTEL_GEN (dev_priv) >=7 ) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (dev_priv))gen6_update_ring_freq (dev_priv); }else if (IS_BROADWELL (dev_priv)) {gen8_enable_rps (dev_priv);
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 12 lines · Jani Nikula
Quoted 10 lines · Anusha Srivatsa
With GLK was introduced
IS_LP.
With this, we can useIS_GEN9andIS_LPto put Skylake and Kabylake in the same bucket. The main intention is to simplify the if and else statements that gets added for every new platform.This approach proposes the idea to create a common bucket to put multiple platforms (SKL and KBL in this case) together. Another approach would be to introduce
IS_GEN9_BCas suggested by Rodrigo, where_BCstands for Big Core.
Quoted 4 lines
I think we need to come up with an alias like
IS_GEN9_BC(), although I'm not convinced about that paraticular name. The current (FOO || BAR) for specific FOO and BAR is *much* faster to read than the slightly confusing (GROUP && !SUBGROUP).
I don't have a strong opinion on this one except that I believe we need to group somehow.
But I didn't try to merge the reviewed is_gen9_bc because someone raised concerns on irc like naking it...
maybe Mika or Marteen, I can't remember...
Ander, do you remember who complained that day on irc?
I remember Tvrtko was the one in favor of using !is_lp...
I agree _BC (Big Core) is not a good name... but I couldn't come with something better. :(
So either way works for me as long as we bucket is somehow... So, comments?
Quoted 32 lines
One other comment inline.
Quoted 29 lines
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.Cc Rodrigo Vivi <[email protected]>Cc Ander Conselvan de Oliveira <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 12 ++++++------ 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_device_info.c | 2 +- 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 | 2 +- drivers/gpu/drm/i915/intel_i2c.c | 4 ++-- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 11 +++++------ 12 files changed, 38 insertions(+), 39 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -1224,20 +1224,20 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c static int i915_frequency_info(struct seq_file *m, void *unused) · line 1228
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1max_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) ? + max_freq *= ((IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) ?GEN9_FREQ_SCALER :1 );There's already superfluous braces to begin with, please don't add more! Same all around.
indeed
Quoted 378 lines
Quoted 363 lines
drivers/gpu/drm/i915/i915_debugfs.c +5
-5seq_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) ? + max_freq *= ((IS_GEN9 (dev_priv) && !IS_LP (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) ? + max_freq *= ((IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Max non-overclocked (RP0) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq));@@ -1814,7 +1814,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 (dev_priv) && !IS_LP (dev_priv)) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = dev_priv->rps.min_freq_softlimit /GEN9_FREQ_SCALER ;@@ -1834,7 +1834,7 @@ 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) ? + ((IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) ?GEN9_FREQ_SCALER :1 ))), ((ia_freq >>0 ) &0xff ) *100 , ((ia_freq >>8 ) &0xff ) *100 );@@ -4444,7 +4444,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 (dev_priv) && !IS_LP (dev_priv)) sseu->subslice_mask =INTEL_INFO (dev_priv)->sseu.subslice_mask;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 (dev_priv) && !IS_LP (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 (dev_priv) && + !IS_GEMINILAKE (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 @@ intel_ddi_get_link_dpll(struct intel_dp *intel_dp, int clock) pll->state = tmp_pll_state;return NULL ; } - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + }else if (IS_GEN9 (dev_priv) && !IS_LP (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_device_info.c +1
-1@@ -189,7 +189,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv)* pair per subslice. */ sseu->has_slice_pg = - (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) && + (IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) &&hweight8 (sseu->slice_mask) >1 ; sseu->has_subslice_pg =IS_GEN9_LP (dev_priv) &&sseu_subslice_total (sseu) >1 ;drivers/gpu/drm/i915/intel_display.c +6
-6@@ -5799,7 +5799,7 @@ static int skl_calc_cdclk(int max_pixclk, int vco);static void intel_update_max_cdclk (struct drm_i915_private *dev_priv) { -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_GEN9 (dev_priv) && !IS_LP (dev_priv)) {u32 limit =I915_READ (SKL_DFSM ) &SKL_DFSM_CDCLK_LIMIT_MASK ;int max_cdclk, vco;@@ -10666,7 +10666,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 (dev_priv) && !IS_LP (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);@@ -15667,7 +15667,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 (dev_priv) && !IS_LP (dev_priv)))intel_ddi_init (dev_priv,PORT_A );/* DDI B, C and D detection is indicated by the SFUSE_STRAP @@ -15683,7 +15683,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 (dev_priv) && !IS_LP (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))@@ -16182,7 +16182,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 (dev_priv) && !IS_LP (dev_priv)) dev_priv->display.get_display_clock_speed = skylake_get_display_clock_speed;else if (IS_GEN9_LP (dev_priv))@@ -16263,7 +16263,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 (dev_priv) && !IS_LP (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 @@ intel_dp_source_rates(struct intel_dp *intel_dp, const int **source_rates)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 (dev_priv) && !IS_LP (dev_priv)) { *source_rates = skl_rates; size =ARRAY_SIZE (skl_rates); }else {@@ -1752,7 +1752,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,* clock for eDP. This will affect cdclk as well. */ if (is_edp (intel_dp) && - (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv))) { + (IS_GEN9 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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
-1@@ -538,7 +538,7 @@ static int find_compression_threshold(struct drm_i915_private *dev_priv,* 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)) + (IS_GEN9 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (dev_priv)) { table->size =ARRAY_SIZE (skylake_mocs_table); table->table = skylake_mocs_table; result = true;drivers/gpu/drm/i915/intel_pm.c +4
-5@@ -5293,8 +5293,7 @@ static void gen6_init_rps_frequencies(struct drm_i915_private *dev_priv) dev_priv->rps.max_freq = dev_priv->rps.rp0_freq; 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)) { +if ((INTEL_GEN (dev_priv) >=7 ) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (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 (dev_priv) && !IS_LP (dev_priv)) {/* * ring_freq = 2 * GT. ring_freq is in 100MHz units * No floor required for ring frequency on SKL. drivers/gpu/drm/i915/intel_pm.c void intel_enable_gt_powersave(struct drm_i915_private *dev_priv) · line 6780
Quoted 8 lines
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 (dev_priv) && !IS_LP (dev_priv))gen6_update_ring_freq (dev_priv); }else if (IS_BROADWELL (dev_priv)) {gen8_enable_rps (dev_priv);--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
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
Quoted 18 lines · Rodrigo Vivi
Quoted 9 lines · Jani Nikula
Quoted 7 lines · Anusha Srivatsa
With GLK was introduced
IS_LP.
With this, we can useIS_GEN9andIS_LPto put Skylake and Kabylake in the same bucket. The main intention is to simplify the if and else statements that gets added for every new platform.Quoted 8 lines
Quoted 4 lines
This approach proposes the idea to create a common bucket to put multiple platforms (SKL and KBL in this case) together. Another approach would be to introduce
IS_GEN9_BCas suggested by Rodrigo, where_BCstands for Big Core.I think we need to come up with an alias like
IS_GEN9_BC(), although I'm not convinced about that paraticular name. The current (FOO || BAR) for specific FOO and BAR is *much* faster to read than the slightly confusing (GROUP && !SUBGROUP).
Quoted 7 lines
I don't have a strong opinion on this one except that I believe we need to group somehow.
But I didn't try to merge the reviewed
is_gen9_bcbecause someone raised concerns on irc like naking it...
maybe Mika or Marteen, I can't remember...
Ander, do you remember who complained that day on irc?
I think it was Joonas. He didn't like my suggestion of _HP for high power. To be honest, I don't like it either. :)
Quoted 2 lines
I remember Tvrtko was the one in favor of using !is_lp...
IS_GEN9_NP for not-low power. Or even normal power.
Quoted 6 lines
I agree
_BC(Big Core) is not a good name... but I couldn't come with something better. :(So either way works for me as long as we bucket is somehow... So, comments?
I don't know either. I think there's value in the change and I wouldn't mind if it is called _BC, and that's why that patch has my R-b. Wouldn't it be easier to do sed 's/IS_GEN9_BC/something else/' if some one has a great moment of inspiration?
Ander
Quoted 37 lines
Quoted 37 lines
One other comment inline.
Quoted 32 lines
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.Cc Rodrigo Vivi <[email protected]>Cc Ander Conselvan de Oliveira <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 12 ++++++------ 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_device_info.c| 2 +- 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 | 2 +- drivers/gpu/drm/i915/intel_i2c.c | 4 ++-- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 11 +++++------12 files changed, 38 insertions(+), 39 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -1224,20 +1224,20 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
Quoted 438 lines
Quoted 7 lines
Quoted 5 lines
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)? + max_freq *= ((IS_GEN9(dev_priv)&& !IS_LP(dev_priv)) ?GEN9_FREQ_SCALER: 1);There's already superfluous braces to begin with, please don't add more! Same all around.
indeed
Quoted 427 lines
Quoted 420 lines
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)? + max_freq *= ((IS_GEN9(dev_priv)&& !IS_LP(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)? + max_freq *= ((IS_GEN9(dev_priv)&& !IS_LP(dev_priv)) ?GEN9_FREQ_SCALER: 1); seq_printf(m, "Max non-overclocked (RP0) frequency:
%dMHz\n",
intel_gpu_freq(dev_priv,max_freq));drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -1814,7 +1814,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(dev_priv) && !IS_LP(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,7 +1834,7 @@ 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)?
+ ((IS_GEN9(dev_priv) && !IS_LP(dev_priv)) ?GEN9_FREQ_SCALER: 1))), ((ia_freq>> 0) &0xff) * 100, ((ia_freq>> 8) &0xff) * 100);drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -4444,7 +4444,7 @@ static void gen9_sseu_device_status(structdrm_i915_private *dev_priv, sseu->slice_mask |= BIT(s); - if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) + if (IS_GEN9(dev_priv) && !IS_LP(dev_priv))sseu->subslice_mask = INTEL_INFO(dev_priv)->sseu.subslice_mask;
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(dev_priv) && !IS_LP(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(dev_priv) && + !IS_GEMINILAKE(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))
returnhdmi_level;- if (
IS_SKYLAKE(dev_priv)||IS_KABYLAKE(dev_priv)) { + if (IS_GEN9(dev_priv)&& !IS_LP(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 +1
-1@@ -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(dev_priv) && !IS_LP(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 +1
-1@@ -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(dev_priv) && !IS_LP(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 +1
-1@@ -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(dev_priv) && !IS_LP(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);- if (
IS_SKYLAKE(dev_priv)||IS_KABYLAKE(dev_priv)) + if (IS_GEN9(dev_priv)&& !IS_LP(dev_priv)) returnskl_ddi_pll_select(intel_crtc, crtc_state, intel_encoder); else if (IS_GEN9_LP(dev_priv))drivers/gpu/drm/i915/intel_ddi.c +1
-1@@ -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(dev_priv) && !IS_LP(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 +1
-1@@ -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(dev_priv) && !IS_LP(dev_priv)) { uint32_t val;/* 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(dev_priv) && !IS_LP(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 +1
-1@@ -1784,7 +1784,7 @@ static void intel_ddi_post_disable(structintel_encoder *intel_encoder, intel_edp_panel_off(intel_dp); } - if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) + if (IS_GEN9(dev_priv) && !IS_LP(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 @@ intel_ddi_get_link_dpll(struct intel_dp *intel_dp, int clock) pll->state = tmp_pll_state; return NULL; } - } else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) { + } else if (IS_GEN9(dev_priv) && !IS_LP(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_device_info.c +0
-0@@ -189,7 +189,7 @@ static void gen9_sseu_info_init(structdrm_i915_private *dev_priv) * pair per subslice. */ sseu->has_slice_pg =
- (IS_SKYLAKE(dev_priv) ||IS_KABYLAKE(dev_priv)) && + (IS_GEN9(dev_priv) && !IS_LP(dev_priv)) &&hweight8(sseu->slice_mask)> 1;sseu->has_subslice_pg=
IS_GEN9_LP(dev_priv) &&sseu_subslice_total(sseu)> 1;drivers/gpu/drm/i915/intel_display.c +2
-2@@ -5799,7 +5799,7 @@ static int skl_calc_cdclk(int max_pixclk, int vco); static void intel_update_max_cdclk(struct drm_i915_private *dev_priv) { - if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) { + if (IS_GEN9(dev_priv) && !IS_LP(dev_priv)) { u32 limit = I915_READ(SKL_DFSM) & SKL_DFSM_CDCLK_LIMIT_MASK; int max_cdclk, vco;@@ -10666,7 +10666,7 @@ static void haswell_get_ddi_port_state(structintel_crtc *crtc, port = (tmp & TRANS_DDI_PORT_MASK) >> TRANS_DDI_PORT_SHIFT; - if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) + if (IS_GEN9(dev_priv) && !IS_LP(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@@ -15667,7 +15667,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 */- if (found || IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) + if (found || (IS_GEN9(dev_priv) && !IS_LP(dev_priv)))intel_ddi_init(dev_priv,
PORT_A);/* DDI B, C and D detection is indicated by the
SFUSE_STRAPdrivers/gpu/drm/i915/intel_display.c +0
-0@@ -15683,7 +15683,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(dev_priv)&& !IS_LP(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))drivers/gpu/drm/i915/intel_display.c +1
-1@@ -16182,7 +16182,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(dev_priv) && !IS_LP(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@@ -16263,7 +16263,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(dev_priv)&& !IS_LP(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 @@ intel_dp_source_rates(struct intel_dp *intel_dp, const int **source_rates) 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(dev_priv) && !IS_LP(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 @@ intel_dp_compute_config(struct intel_encoder*encoder, * clock for eDP. This will affect cdclk as well. */ if (
is_edp(intel_dp)&&
- (IS_SKYLAKE(dev_priv) ||IS_KABYLAKE(dev_priv))) { + (IS_GEN9(dev_priv) && !IS_LP(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(dev_priv) && !IS_LP(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@@ -538,7 +538,7 @@ static int find_compression_threshold(structdrm_i915_private *dev_priv, * 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)) + (IS_GEN9(dev_priv) && !IS_LP(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(dev_priv) && !IS_LP(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 +1
-1@@ -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(dev_priv) && !IS_LP(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(dev_priv) && !IS_LP(dev_priv)) { table->size = ARRAY_SIZE(skylake_mocs_table); table->table = skylake_mocs_table;result = true;
drivers/gpu/drm/i915/intel_pm.c +1
-2@@ -5293,8 +5293,7 @@ static void gen6_init_rps_frequencies(struct drm_i915_private *dev_priv) dev_priv->rps.max_freq = dev_priv->rps.rp0_freq; 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)) { + if ((INTEL_GEN(dev_priv) >= 7) && !IS_LP(dev_priv)) { u32 ddcc_status = 0;if (sandybridge_pcode_read(dev_priv,
drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -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(dev_priv) && !IS_LP(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 +1
-1@@ -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(dev_priv) && !IS_LP(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 +1
-1@@ -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(dev_priv) && !IS_LP(dev_priv)) { /** ring_freq = 2 * GT. ring_freq is 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(dev_priv) && !IS_LP(dev_priv)) gen6_update_ring_freq(dev_priv); } else if (IS_BROADWELL(dev_priv)) {Quoted 1 line
gen8_enable_rps(dev_priv);
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 38 lines · Ander
Quoted 18 lines · Rodrigo Vivi
Quoted 9 lines · Jani Nikula
Quoted 7 lines · Anusha Srivatsa
With GLK was introduced
IS_LP.
With this, we can useIS_GEN9andIS_LPto put Skylake and Kabylake in the same bucket. The main intention is to simplify the if and else statements that gets added for every new platform.Quoted 8 lines
Quoted 4 lines
This approach proposes the idea to create a common bucket to put multiple platforms (SKL and KBL in this case) together. Another approach would be to introduce
IS_GEN9_BCas suggested by Rodrigo, where_BCstands for Big Core.I think we need to come up with an alias like
IS_GEN9_BC(), although I'm not convinced about that paraticular name. The current (FOO || BAR) for specific FOO and BAR is *much* faster to read than the slightly confusing (GROUP && !SUBGROUP).Quoted 7 lines
I don't have a strong opinion on this one except that I believe we need to group somehow.
But I didn't try to merge the reviewed
is_gen9_bcbecause someone raised concerns on irc like naking it...
maybe Mika or Marteen, I can't remember...
Ander, do you remember who complained that day on irc?I think it was Joonas. He didn't like my suggestion of
_HPfor high power. To be honest, I don't like it either. :)Quoted 2 lines
I remember Tvrtko was the one in favor of using !is_lp...
IS_GEN9_NPfor not-low power. Or even normal power.Quoted 4 lines
I agree
_BC(Big Core) is not a good name... but I couldn't come with something better. :(
Quoted 7 lines
Quoted 2 lines
So either way works for me as long as we bucket is somehow... So, comments?
I don't know either. I think there's value in the change and I wouldn't mind if it is called
_BC, and that's why that patch has my R-b. Wouldn't it be easier to do sed 's/IS_GEN9_BC/something else/' if some one has a great moment of inspiration?
Ack on that.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx