Skip to contentSkip to conversation

drm/i915: Introduce IS_GEN9_BC for Skylake and Kabylake.

PATCH In review Rodrigo Vivi 3 participants 3 messages Dec 3, 2016 – Dec 5, 2016

Subsystems (2)
lore
Share & tools
lore

Rodrigo Vivi

author maintainer
#0 lore raw

PATCH 1/1 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.

Cc Ander Conselvan de Oliveira <[email protected]>
Cc Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/i915_debugfs.c      | 17 +++++++----------
 drivers/gpu/drm/i915/i915_drv.h          |  1 +
 drivers/gpu/drm/i915/i915_gem_stolen.c   |  3 +--
 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     | 14 +++++++-------
 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 +++++-----
 15 files changed, 48 insertions(+), 53 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -10
index 1b59d12..49443da 100644
@@ -1206,21 +1206,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",
@@ -1796,7 +1793,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;
@@ -1816,8 +1813,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);
 	}
@@ -5207,7 +5204,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 +1 -0
index 035ac75..eea9685 100644
@@ -2614,6 +2614,7 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)
 #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_GEN9_BC(dev_priv)	(IS_GEN9(dev_priv) && !INTEL_INFO(dev_priv)->is_lp)
 
 #define ENGINE_MASK(id)	BIT(id)
 #define RENDER_RING	ENGINE_MASK(RCS)
drivers/gpu/drm/i915/i915_gem_stolen.c +1 -2
index b3bac255..cd880c9 100644
@@ -454,8 +454,7 @@ int i915_gem_init_stolen(struct drm_i915_private *dev_priv)
 					 &reserved_size);
 		break;
 	default:
-		if (IS_BROADWELL(dev_priv) ||
-		    IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
+		if (IS_BROADWELL(dev_priv) || IS_GEN9_BC(dev_priv))
 			bdw_get_stolen_reserved(dev_priv, &reserved_base,
 						&reserved_size);
 		else
drivers/gpu/drm/i915/intel_audio.c +1 -1
index 3bbc96c..2a8cb0f 100644
@@ -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
index d81232b..34952d0 100644
@@ -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
index d808a2c..7d84006 100644
@@ -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;
 
-	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->config = tmp_pll_config;
 			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_device_info.c +1 -1
index 602d761..031126f 100644
@@ -149,7 +149,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_BC(dev_priv)) &&
 		hweight8(sseu->slice_mask) > 1;
 	sseu->has_subslice_pg =
 		IS_BROXTON(dev_priv) && sseu_subslice_total(sseu) > 1;
drivers/gpu/drm/i915/intel_display.c +7 -7
index 1fafcce..2e09618 100644
@@ -5822,7 +5822,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;
 
@@ -10697,7 +10697,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);
@@ -12857,7 +12857,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
 			      pipe_config->dpll_hw_state.pll9,
 			      pipe_config->dpll_hw_state.pll10,
 			      pipe_config->dpll_hw_state.pcsdw12);
-	} else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
+	} else if (IS_GEN9_BC(dev_priv)) {
 		DRM_DEBUG_KMS("dpll_hw_state: "
 			      "ctrl1: 0x%x, cfgcr1: 0x%x, cfgcr2: 0x%x\n",
 			      pipe_config->dpll_hw_state.ctrl1,
@@ -15584,7 +15584,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
@@ -15600,7 +15600,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))
@@ -16087,7 +16087,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))
@@ -16168,7 +16168,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
index 1f2420c..3a7af45 100644
@@ -236,7 +236,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 {
@@ -1693,7 +1693,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
index 97f7cc9..c91930b 100644
@@ -1884,7 +1884,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
index 62f215b..8c4765b 100644
@@ -534,8 +534,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 = ggtt->stolen_usable_size;
drivers/gpu/drm/i915/intel_i2c.c +2 -2
index 0164130..7da07fe 100644
@@ -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
index c787fc4..8f98fc7 100644
@@ -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
index 59a88de..4dafb5c 100644
@@ -2886,8 +2886,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;
@@ -5258,7 +5257,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,
@@ -5271,7 +5270,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
 		 */
@@ -5601,7 +5600,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;
@@ -5619,7 +5618,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.
@@ -6739,7 +6738,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
index fb10ee6..b802b09 100644
@@ -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);
@@ -2312,7 +2312,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)) {
@@ -2387,7 +2387,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);
@@ -2719,7 +2719,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);
@@ -2758,7 +2758,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
#1 lore raw

✗ Fi.CI.BAT: warning for drm/i915: Introduce IS_GEN9_BC for Skylake and Kabylake.

== Series Details ==

== Series Details ==

Series: drm/i915: Introduce IS_GEN9_BC for Skylake and Kabylake.
URL : https://patchwork.freedesktop.org/series/16307/
State : warning

== Summary ==

Series 16307v1 drm/i915: Introduce IS_GEN9_BC for Skylake and Kabylake.
https://patchwork.freedesktop.org/api/1.0/series/16307/revisions/1/mbox/

Test kms_pipe_crc_basic:

        Subgroup suspend-read-crc-pipe-b:
                pass       -> DMESG-WARN (fi-snb-2520m)
fi-bdw-5557u     total:247  pass:232  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:247  pass:207  dwarn:0   dfail:0   fail:0   skip:40 
fi-byt-j1900     total:247  pass:219  dwarn:0   dfail:0   fail:0   skip:28 
fi-byt-n2820     total:247  pass:215  dwarn:0   dfail:0   fail:0   skip:32 
fi-hsw-4770      total:247  pass:227  dwarn:0   dfail:0   fail:0   skip:20 
fi-hsw-4770r     total:247  pass:227  dwarn:0   dfail:0   fail:0   skip:20 
fi-ilk-650       total:247  pass:194  dwarn:0   dfail:0   fail:0   skip:53 
fi-ivb-3520m     total:247  pass:225  dwarn:0   dfail:0   fail:0   skip:22 
fi-ivb-3770      total:247  pass:225  dwarn:0   dfail:0   fail:0   skip:22 
fi-kbl-7500u     total:247  pass:225  dwarn:0   dfail:0   fail:0   skip:22 
fi-skl-6260u     total:247  pass:233  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6700k     total:247  pass:223  dwarn:3   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:247  pass:233  dwarn:0   dfail:0   fail:0   skip:14 
fi-snb-2520m     total:247  pass:214  dwarn:1   dfail:0   fail:0   skip:32 
fi-snb-2600      total:247  pass:214  dwarn:0   dfail:0   fail:0   skip:33 

78c588b7383745c70d2a6b144c4c2032b120b949 drm-tip: 2016y-12m-02d-20h-20m-21s UTC integration manifest 65ef2cb drm/i915: Introduce IS_GEN9_BC for Skylake and Kabylake.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3178/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#2 lore raw
In reply to Rodrigo Vivi
Quoted 7 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_BC for "Big Core" (non Atom based platforms).

I'm not sure about the "_BC" name, but can't think of anything better. At least it aligns nicely with "_LP", but would an accurate opposite be _HP for high power?

Anyway, changes look correct, so

either way.

Ander

Quoted 501 lines

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.

Cc Ander Conselvan de Oliveira <[email protected]>
Cc Jani Nikula <[email protected]>

---
 drivers/gpu/drm/i915/i915_debugfs.c      | 17 +++++++---------- drivers/gpu/drm/i915/i915_drv.h          |  1 + drivers/gpu/drm/i915/i915_gem_stolen.c   |  3 +-- 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     | 14 +++++++------- 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 +++++-----

 15 files changed, 48 insertions(+), 53 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +0 -0
index 1b59d12..49443da 100644
@@ -1206,21 +1206,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
@@ -1796,7 +1793,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
@@ -1816,8 +1813,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 +2 -2
-				(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); }

drivers/gpu/drm/i915/i915_debugfs.c +0 -0
@@ -5207,7 +5204,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
index 035ac75..eea9685 100644
@@ -2614,6 +2614,7 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)
  #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_GEN9_BC(dev_priv) (IS_GEN9(dev_priv) && !INTEL_INFO(dev_priv)->is_lp)

 #define ENGINE_MASK(id) BIT(id)
 #define RENDER_RING ENGINE_MASK(RCS)

drivers/gpu/drm/i915/i915_gem_stolen.c +0 -0
index b3bac255..cd880c9 100644
@@ -454,8 +454,7 @@ int i915_gem_init_stolen(struct drm_i915_private *dev_priv)
  					 &reserved_size);
  		break;

  default:

drivers/gpu/drm/i915/i915_gem_stolen.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))

  bdw_get_stolen_reserved(dev_priv, &reserved_base, &reserved_size); else

drivers/gpu/drm/i915/intel_audio.c +0 -0
index 3bbc96c..2a8cb0f 100644
@@ -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
index d81232b..34952d0 100644
@@ -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
index d808a2c..7d84006 100644
@@ -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->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_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(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);
  	}

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->config = tmp_pll_config;
  			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_device_info.c +0 -0
index 602d761..031126f 100644
@@ -149,7 +149,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv)
  	 * pair per subslice.
  	*/

  sseu->has_slice_pg =

drivers/gpu/drm/i915/intel_device_info.c +1 -1
-		(IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) &&
+		(IS_GEN9_BC(dev_priv)) &&

  hweight8(sseu->slice_mask) > 1; sseu->has_subslice_pg =
  IS_BROXTON(dev_priv) && sseu_subslice_total(sseu) > 1;

drivers/gpu/drm/i915/intel_display.c +0 -0
index 1fafcce..2e09618 100644
@@ -5822,7 +5822,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) {

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; int max_cdclk, vco;

drivers/gpu/drm/i915/intel_display.c +0 -0
@@ -10697,7 +10697,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 +1 -1
@@ -12857,7 +12857,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
  			      pipe_config->dpll_hw_state.pll9,
  			      pipe_config->dpll_hw_state.pll10,
  			      pipe_config->dpll_hw_state.pcsdw12);
-	} else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
+	} else if (IS_GEN9_BC(dev_priv)) {

  DRM_DEBUG_KMS("dpll_hw_state: "
        "ctrl1: 0x%x, cfgcr1: 0x%x, cfgcr2: 0x%x\n", pipe_config->dpll_hw_state.ctrl1,

drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -15584,7 +15584,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

drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -15600,7 +15600,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))

drivers/gpu/drm/i915/intel_display.c +0 -0
@@ -16087,7 +16087,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
@@ -16168,7 +16168,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
index 1f2420c..3a7af45 100644
@@ -236,7 +236,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 {
@@ -1693,7 +1693,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 +1 -1
-	    (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 +0 -0
index 97f7cc9..c91930b 100644
@@ -1884,7 +1884,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 +1 -2
index 62f215b..8c4765b 100644
@@ -534,8 +534,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 = ggtt->stolen_usable_size;

drivers/gpu/drm/i915/intel_i2c.c +1 -1
index 0164130..7da07fe 100644
@@ -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);

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
index c787fc4..8f98fc7 100644
@@ -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
index 59a88de..4dafb5c 100644
@@ -2886,8 +2886,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
@@ -5258,7 +5257,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
@@ -5271,7 +5270,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
@@ -5601,7 +5600,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
@@ -5619,7 +5618,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_freq is in 100MHz units
   * No floor required for ring frequency on SKL.

drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -6739,7 +6738,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
index fb10ee6..b802b09 100644
@@ -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 +1 -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);

drivers/gpu/drm/i915/intel_runtime_pm.c +0 -0
@@ -2312,7 +2312,7 @@ static uint32_t get_allowed_dc_mask(const struct drm_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
@@ -2387,7 +2387,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);
@@ -2719,7 +2719,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
@@ -2758,7 +2758,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);

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx