All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Yet another if/else sort of newer to older platforms.
@ 2019-02-22 22:11 Rodrigo Vivi
  2019-02-22 22:59 ` ✗ Fi.CI.BAT: failure for " Patchwork
                   ` (5 more replies)
  0 siblings, 6 replies; 12+ messages in thread
From: Rodrigo Vivi @ 2019-02-22 22:11 UTC (permalink / raw)
  To: intel-gfx; +Cc: Lucas De Marchi

No functional change. Just a reorg to match the preferred
behavior.

When rebasing internal branch on top of latest sort I noticed
few more cases that needs to get reordered.

Let's do in a bundle this time and hoping there's no other
missing places.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c          | 24 ++++-----
 drivers/gpu/drm/i915/i915_perf.c         | 50 +++++++++---------
 drivers/gpu/drm/i915/intel_cdclk.c       | 38 +++++++-------
 drivers/gpu/drm/i915/intel_workarounds.c | 64 ++++++++++++------------
 4 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c6354f6cdbdb..0e3d5cf2c4f8 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -219,20 +219,20 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv)
 	 * make an educated guess as to which PCH is really there.
 	 */
 
-	if (IS_GEN(dev_priv, 5))
-		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
-	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
-		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
-	else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
-		id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
-	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
-		id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
-	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
-		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
+	if (IS_ICELAKE(dev_priv))
+		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
 	else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
 		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
-	else if (IS_ICELAKE(dev_priv))
-		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
+	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
+		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
+	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
+		id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
+	else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
+		id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
+	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
+		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
+	else if (IS_GEN(dev_priv, 5))
+		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
 
 	if (id)
 		DRM_DEBUG_KMS("Assuming PCH ID %04x\n", id);
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 9ebf99f3d8d3..72a9a35b40e2 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -2881,12 +2881,24 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
 
 	sysfs_attr_init(&dev_priv->perf.oa.test_config.sysfs_metric_id.attr);
 
-	if (IS_HASWELL(dev_priv)) {
-		i915_perf_load_test_config_hsw(dev_priv);
-	} else if (IS_BROADWELL(dev_priv)) {
-		i915_perf_load_test_config_bdw(dev_priv);
-	} else if (IS_CHERRYVIEW(dev_priv)) {
-		i915_perf_load_test_config_chv(dev_priv);
+	if (IS_ICELAKE(dev_priv)) {
+		i915_perf_load_test_config_icl(dev_priv);
+	} else if (IS_CANNONLAKE(dev_priv)) {
+		i915_perf_load_test_config_cnl(dev_priv);
+	} else if (IS_COFFEELAKE(dev_priv)) {
+		if (IS_CFL_GT2(dev_priv))
+			i915_perf_load_test_config_cflgt2(dev_priv);
+		if (IS_CFL_GT3(dev_priv))
+			i915_perf_load_test_config_cflgt3(dev_priv);
+	} else if (IS_GEMINILAKE(dev_priv)) {
+		i915_perf_load_test_config_glk(dev_priv);
+	} else if (IS_KABYLAKE(dev_priv)) {
+		if (IS_KBL_GT2(dev_priv))
+			i915_perf_load_test_config_kblgt2(dev_priv);
+		else if (IS_KBL_GT3(dev_priv))
+			i915_perf_load_test_config_kblgt3(dev_priv);
+	} else if (IS_BROXTON(dev_priv)) {
+		i915_perf_load_test_config_bxt(dev_priv);
 	} else if (IS_SKYLAKE(dev_priv)) {
 		if (IS_SKL_GT2(dev_priv))
 			i915_perf_load_test_config_sklgt2(dev_priv);
@@ -2894,25 +2906,13 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
 			i915_perf_load_test_config_sklgt3(dev_priv);
 		else if (IS_SKL_GT4(dev_priv))
 			i915_perf_load_test_config_sklgt4(dev_priv);
-	} else if (IS_BROXTON(dev_priv)) {
-		i915_perf_load_test_config_bxt(dev_priv);
-	} else if (IS_KABYLAKE(dev_priv)) {
-		if (IS_KBL_GT2(dev_priv))
-			i915_perf_load_test_config_kblgt2(dev_priv);
-		else if (IS_KBL_GT3(dev_priv))
-			i915_perf_load_test_config_kblgt3(dev_priv);
-	} else if (IS_GEMINILAKE(dev_priv)) {
-		i915_perf_load_test_config_glk(dev_priv);
-	} else if (IS_COFFEELAKE(dev_priv)) {
-		if (IS_CFL_GT2(dev_priv))
-			i915_perf_load_test_config_cflgt2(dev_priv);
-		if (IS_CFL_GT3(dev_priv))
-			i915_perf_load_test_config_cflgt3(dev_priv);
-	} else if (IS_CANNONLAKE(dev_priv)) {
-		i915_perf_load_test_config_cnl(dev_priv);
-	} else if (IS_ICELAKE(dev_priv)) {
-		i915_perf_load_test_config_icl(dev_priv);
-	}
+	} else if (IS_CHERRYVIEW(dev_priv)) {
+		i915_perf_load_test_config_chv(dev_priv);
+	} else if (IS_BROADWELL(dev_priv)) {
+		i915_perf_load_test_config_bdw(dev_priv);
+	} else if (IS_HASWELL(dev_priv)) {
+		i915_perf_load_test_config_hsw(dev_priv);
+}
 
 	if (dev_priv->perf.oa.test_config.id == 0)
 		goto sysfs_error;
diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c
index 26e01a8465af..5d266538036d 100644
--- a/drivers/gpu/drm/i915/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/intel_cdclk.c
@@ -2744,18 +2744,13 @@ void intel_update_rawclk(struct drm_i915_private *dev_priv)
  */
 void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
 {
-	if (IS_CHERRYVIEW(dev_priv)) {
-		dev_priv->display.set_cdclk = chv_set_cdclk;
-		dev_priv->display.modeset_calc_cdclk =
-			vlv_modeset_calc_cdclk;
-	} else if (IS_VALLEYVIEW(dev_priv)) {
-		dev_priv->display.set_cdclk = vlv_set_cdclk;
-		dev_priv->display.modeset_calc_cdclk =
-			vlv_modeset_calc_cdclk;
-	} else if (IS_BROADWELL(dev_priv)) {
-		dev_priv->display.set_cdclk = bdw_set_cdclk;
+	if (IS_ICELAKE(dev_priv)) {
+		dev_priv->display.set_cdclk = icl_set_cdclk;
+		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
+	} else if (IS_CANNONLAKE(dev_priv)) {
+		dev_priv->display.set_cdclk = cnl_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
-			bdw_modeset_calc_cdclk;
+			cnl_modeset_calc_cdclk;
 	} else if (IS_GEN9_LP(dev_priv)) {
 		dev_priv->display.set_cdclk = bxt_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
@@ -2764,23 +2759,28 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
 		dev_priv->display.set_cdclk = skl_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
 			skl_modeset_calc_cdclk;
-	} else if (IS_CANNONLAKE(dev_priv)) {
-		dev_priv->display.set_cdclk = cnl_set_cdclk;
+	} else if (IS_BROADWELL(dev_priv)) {
+		dev_priv->display.set_cdclk = bdw_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
-			cnl_modeset_calc_cdclk;
-	} else if (IS_ICELAKE(dev_priv)) {
-		dev_priv->display.set_cdclk = icl_set_cdclk;
-		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
+			bdw_modeset_calc_cdclk;
+	} else if (IS_CHERRYVIEW(dev_priv)) {
+		dev_priv->display.set_cdclk = chv_set_cdclk;
+		dev_priv->display.modeset_calc_cdclk =
+			vlv_modeset_calc_cdclk;
+	} else if (IS_VALLEYVIEW(dev_priv)) {
+		dev_priv->display.set_cdclk = vlv_set_cdclk;
+		dev_priv->display.modeset_calc_cdclk =
+			vlv_modeset_calc_cdclk;
 	}
 
 	if (IS_ICELAKE(dev_priv))
 		dev_priv->display.get_cdclk = icl_get_cdclk;
 	else if (IS_CANNONLAKE(dev_priv))
 		dev_priv->display.get_cdclk = cnl_get_cdclk;
-	else if (IS_GEN9_BC(dev_priv))
-		dev_priv->display.get_cdclk = skl_get_cdclk;
 	else if (IS_GEN9_LP(dev_priv))
 		dev_priv->display.get_cdclk = bxt_get_cdclk;
+	else if (IS_GEN9_BC(dev_priv))
+		dev_priv->display.get_cdclk = skl_get_cdclk;
 	else if (IS_BROADWELL(dev_priv))
 		dev_priv->display.get_cdclk = bdw_get_cdclk;
 	else if (IS_HASWELL(dev_priv))
diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
index 743cf5b00155..3e8138b66191 100644
--- a/drivers/gpu/drm/i915/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/intel_workarounds.c
@@ -862,26 +862,26 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
 static void
 gt_init_workarounds(struct drm_i915_private *i915, struct i915_wa_list *wal)
 {
-	if (INTEL_GEN(i915) < 8)
+	if (IS_ICELAKE(i915))
+		icl_gt_workarounds_init(i915, wal);
+	else if (IS_CANNONLAKE(i915))
+		cnl_gt_workarounds_init(i915, wal);
+	else if (IS_COFFEELAKE(i915))
+		cfl_gt_workarounds_init(i915, wal);
+	else if (IS_GEMINILAKE(i915))
+		glk_gt_workarounds_init(i915, wal);
+	else if (IS_KABYLAKE(i915))
+		kbl_gt_workarounds_init(i915, wal);
+	else if (IS_BROXTON(i915))
+		bxt_gt_workarounds_init(i915, wal);
+	else if (IS_SKYLAKE(i915))
+		skl_gt_workarounds_init(i915, wal);
+	else if (IS_CHERRYVIEW(i915))
 		return;
 	else if (IS_BROADWELL(i915))
 		return;
-	else if (IS_CHERRYVIEW(i915))
+	else if (INTEL_GEN(i915) < 8)
 		return;
-	else if (IS_SKYLAKE(i915))
-		skl_gt_workarounds_init(i915, wal);
-	else if (IS_BROXTON(i915))
-		bxt_gt_workarounds_init(i915, wal);
-	else if (IS_KABYLAKE(i915))
-		kbl_gt_workarounds_init(i915, wal);
-	else if (IS_GEMINILAKE(i915))
-		glk_gt_workarounds_init(i915, wal);
-	else if (IS_COFFEELAKE(i915))
-		cfl_gt_workarounds_init(i915, wal);
-	else if (IS_CANNONLAKE(i915))
-		cnl_gt_workarounds_init(i915, wal);
-	else if (IS_ICELAKE(i915))
-		icl_gt_workarounds_init(i915, wal);
 	else
 		MISSING_CASE(INTEL_GEN(i915));
 }
@@ -1063,26 +1063,26 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine)
 
 	wa_init_start(w, "whitelist");
 
-	if (INTEL_GEN(i915) < 8)
+	if (IS_ICELAKE(i915))
+		icl_whitelist_build(w);
+	else if (IS_CANNONLAKE(i915))
+		cnl_whitelist_build(w);
+	else if (IS_COFFEELAKE(i915))
+		cfl_whitelist_build(w);
+	else if (IS_GEMINILAKE(i915))
+		glk_whitelist_build(w);
+	else if (IS_KABYLAKE(i915))
+		kbl_whitelist_build(w);
+	else if (IS_BROXTON(i915))
+		bxt_whitelist_build(w);
+	else if (IS_SKYLAKE(i915))
+		skl_whitelist_build(w);
+	else if (IS_CHERRYVIEW(i915))
 		return;
 	else if (IS_BROADWELL(i915))
 		return;
-	else if (IS_CHERRYVIEW(i915))
+	else if (INTEL_GEN(i915) < 8)
 		return;
-	else if (IS_SKYLAKE(i915))
-		skl_whitelist_build(w);
-	else if (IS_BROXTON(i915))
-		bxt_whitelist_build(w);
-	else if (IS_KABYLAKE(i915))
-		kbl_whitelist_build(w);
-	else if (IS_GEMINILAKE(i915))
-		glk_whitelist_build(w);
-	else if (IS_COFFEELAKE(i915))
-		cfl_whitelist_build(w);
-	else if (IS_CANNONLAKE(i915))
-		cnl_whitelist_build(w);
-	else if (IS_ICELAKE(i915))
-		icl_whitelist_build(w);
 	else
 		MISSING_CASE(INTEL_GEN(i915));
 
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Yet another if/else sort of newer to older platforms.
  2019-02-22 22:11 [PATCH] drm/i915: Yet another if/else sort of newer to older platforms Rodrigo Vivi
@ 2019-02-22 22:59 ` Patchwork
  2019-02-25 16:32 ` [PATCH] " Ville Syrjälä
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-02-22 22:59 UTC (permalink / raw)
  To: intel-gfx

== Series Details ==

Series: drm/i915: Yet another if/else sort of newer to older platforms.
URL   : https://patchwork.freedesktop.org/series/57112/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_5655 -> Patchwork_12287
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_12287 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_12287, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/57112/revisions/1/mbox/

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_12287:

### IGT changes ###

#### Possible regressions ####

  * igt@runner@aborted:
    - fi-bdw-gvtdvm:      NOTRUN -> FAIL

  
Known issues
------------

  Here are the changes found in Patchwork_12287 that come from known issues:

### IGT changes ###

#### Possible fixes ####

  * igt@i915_pm_rpm@basic-pci-d3-state:
    - fi-bsw-kefka:       SKIP [fdo#109271] -> PASS

  * igt@i915_pm_rpm@basic-rte:
    - fi-bsw-kefka:       FAIL [fdo#108800] -> PASS

  
#### Warnings ####

  * igt@i915_selftest@live_contexts:
    - fi-icl-u2:          INCOMPLETE [fdo#108569] -> DMESG-FAIL [fdo#108569]

  
  [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
  [fdo#108800]: https://bugs.freedesktop.org/show_bug.cgi?id=108800
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271


Participating hosts (45 -> 37)
------------------------------

  Missing    (8): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-kbl-7500u fi-pnv-d510 fi-icl-y fi-bdw-samus 


Build changes
-------------

    * Linux: CI_DRM_5655 -> Patchwork_12287

  CI_DRM_5655: a40729237602fa7454aaf3355ad3058cad5c6ee9 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4853: 8afdfd8fa9ce17043d9105dedca46ad4555fdcdb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_12287: e4360cf48be29c1b2f3561299b303471bd0e6854 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

e4360cf48be2 drm/i915: Yet another if/else sort of newer to older platforms.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12287/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Yet another if/else sort of newer to older platforms.
  2019-02-22 22:11 [PATCH] drm/i915: Yet another if/else sort of newer to older platforms Rodrigo Vivi
  2019-02-22 22:59 ` ✗ Fi.CI.BAT: failure for " Patchwork
@ 2019-02-25 16:32 ` Ville Syrjälä
  2019-02-25 19:08   ` Rodrigo Vivi
  2019-02-25 19:11   ` Rodrigo Vivi
  2019-02-25 19:58 ` ✓ Fi.CI.BAT: success for drm/i915: Yet another if/else sort of newer to older platforms. (rev2) Patchwork
                   ` (3 subsequent siblings)
  5 siblings, 2 replies; 12+ messages in thread
From: Ville Syrjälä @ 2019-02-25 16:32 UTC (permalink / raw)
  To: Rodrigo Vivi; +Cc: intel-gfx, Lucas De Marchi

On Fri, Feb 22, 2019 at 02:11:12PM -0800, Rodrigo Vivi wrote:
> No functional change. Just a reorg to match the preferred
> behavior.
> 
> When rebasing internal branch on top of latest sort I noticed
> few more cases that needs to get reordered.
> 
> Let's do in a bundle this time and hoping there's no other
> missing places.
> 
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c          | 24 ++++-----
>  drivers/gpu/drm/i915/i915_perf.c         | 50 +++++++++---------
>  drivers/gpu/drm/i915/intel_cdclk.c       | 38 +++++++-------
>  drivers/gpu/drm/i915/intel_workarounds.c | 64 ++++++++++++------------
>  4 files changed, 88 insertions(+), 88 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index c6354f6cdbdb..0e3d5cf2c4f8 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -219,20 +219,20 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv)
>  	 * make an educated guess as to which PCH is really there.
>  	 */
>  
> -	if (IS_GEN(dev_priv, 5))
> -		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
> -	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
> -		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
> -	else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
> -		id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
> -	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
> -		id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
> -	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
> -		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
> +	if (IS_ICELAKE(dev_priv))
> +		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
>  	else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
>  		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
> -	else if (IS_ICELAKE(dev_priv))
> -		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
> +	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
> +		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
> +	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
> +		id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
> +	else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
> +		id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;

Generic match before the more specific one. That's not going to work.

> +	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
> +		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
> +	else if (IS_GEN(dev_priv, 5))
> +		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
>  
>  	if (id)
>  		DRM_DEBUG_KMS("Assuming PCH ID %04x\n", id);
> diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> index 9ebf99f3d8d3..72a9a35b40e2 100644
> --- a/drivers/gpu/drm/i915/i915_perf.c
> +++ b/drivers/gpu/drm/i915/i915_perf.c
> @@ -2881,12 +2881,24 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
>  
>  	sysfs_attr_init(&dev_priv->perf.oa.test_config.sysfs_metric_id.attr);
>  
> -	if (IS_HASWELL(dev_priv)) {
> -		i915_perf_load_test_config_hsw(dev_priv);
> -	} else if (IS_BROADWELL(dev_priv)) {
> -		i915_perf_load_test_config_bdw(dev_priv);
> -	} else if (IS_CHERRYVIEW(dev_priv)) {
> -		i915_perf_load_test_config_chv(dev_priv);
> +	if (IS_ICELAKE(dev_priv)) {
> +		i915_perf_load_test_config_icl(dev_priv);
> +	} else if (IS_CANNONLAKE(dev_priv)) {
> +		i915_perf_load_test_config_cnl(dev_priv);
> +	} else if (IS_COFFEELAKE(dev_priv)) {
> +		if (IS_CFL_GT2(dev_priv))
> +			i915_perf_load_test_config_cflgt2(dev_priv);
> +		if (IS_CFL_GT3(dev_priv))
> +			i915_perf_load_test_config_cflgt3(dev_priv);
> +	} else if (IS_GEMINILAKE(dev_priv)) {
> +		i915_perf_load_test_config_glk(dev_priv);
> +	} else if (IS_KABYLAKE(dev_priv)) {
> +		if (IS_KBL_GT2(dev_priv))
> +			i915_perf_load_test_config_kblgt2(dev_priv);
> +		else if (IS_KBL_GT3(dev_priv))
> +			i915_perf_load_test_config_kblgt3(dev_priv);
> +	} else if (IS_BROXTON(dev_priv)) {
> +		i915_perf_load_test_config_bxt(dev_priv);
>  	} else if (IS_SKYLAKE(dev_priv)) {
>  		if (IS_SKL_GT2(dev_priv))
>  			i915_perf_load_test_config_sklgt2(dev_priv);
> @@ -2894,25 +2906,13 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
>  			i915_perf_load_test_config_sklgt3(dev_priv);
>  		else if (IS_SKL_GT4(dev_priv))
>  			i915_perf_load_test_config_sklgt4(dev_priv);
> -	} else if (IS_BROXTON(dev_priv)) {
> -		i915_perf_load_test_config_bxt(dev_priv);
> -	} else if (IS_KABYLAKE(dev_priv)) {
> -		if (IS_KBL_GT2(dev_priv))
> -			i915_perf_load_test_config_kblgt2(dev_priv);
> -		else if (IS_KBL_GT3(dev_priv))
> -			i915_perf_load_test_config_kblgt3(dev_priv);
> -	} else if (IS_GEMINILAKE(dev_priv)) {
> -		i915_perf_load_test_config_glk(dev_priv);
> -	} else if (IS_COFFEELAKE(dev_priv)) {
> -		if (IS_CFL_GT2(dev_priv))
> -			i915_perf_load_test_config_cflgt2(dev_priv);
> -		if (IS_CFL_GT3(dev_priv))
> -			i915_perf_load_test_config_cflgt3(dev_priv);
> -	} else if (IS_CANNONLAKE(dev_priv)) {
> -		i915_perf_load_test_config_cnl(dev_priv);
> -	} else if (IS_ICELAKE(dev_priv)) {
> -		i915_perf_load_test_config_icl(dev_priv);
> -	}
> +	} else if (IS_CHERRYVIEW(dev_priv)) {
> +		i915_perf_load_test_config_chv(dev_priv);
> +	} else if (IS_BROADWELL(dev_priv)) {
> +		i915_perf_load_test_config_bdw(dev_priv);
> +	} else if (IS_HASWELL(dev_priv)) {
> +		i915_perf_load_test_config_hsw(dev_priv);
> +}
>  
>  	if (dev_priv->perf.oa.test_config.id == 0)
>  		goto sysfs_error;
> diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c
> index 26e01a8465af..5d266538036d 100644
> --- a/drivers/gpu/drm/i915/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/intel_cdclk.c
> @@ -2744,18 +2744,13 @@ void intel_update_rawclk(struct drm_i915_private *dev_priv)
>   */
>  void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
>  {
> -	if (IS_CHERRYVIEW(dev_priv)) {
> -		dev_priv->display.set_cdclk = chv_set_cdclk;
> -		dev_priv->display.modeset_calc_cdclk =
> -			vlv_modeset_calc_cdclk;
> -	} else if (IS_VALLEYVIEW(dev_priv)) {
> -		dev_priv->display.set_cdclk = vlv_set_cdclk;
> -		dev_priv->display.modeset_calc_cdclk =
> -			vlv_modeset_calc_cdclk;
> -	} else if (IS_BROADWELL(dev_priv)) {
> -		dev_priv->display.set_cdclk = bdw_set_cdclk;
> +	if (IS_ICELAKE(dev_priv)) {
> +		dev_priv->display.set_cdclk = icl_set_cdclk;
> +		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
> +	} else if (IS_CANNONLAKE(dev_priv)) {
> +		dev_priv->display.set_cdclk = cnl_set_cdclk;
>  		dev_priv->display.modeset_calc_cdclk =
> -			bdw_modeset_calc_cdclk;
> +			cnl_modeset_calc_cdclk;
>  	} else if (IS_GEN9_LP(dev_priv)) {
>  		dev_priv->display.set_cdclk = bxt_set_cdclk;
>  		dev_priv->display.modeset_calc_cdclk =
> @@ -2764,23 +2759,28 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
>  		dev_priv->display.set_cdclk = skl_set_cdclk;
>  		dev_priv->display.modeset_calc_cdclk =
>  			skl_modeset_calc_cdclk;
> -	} else if (IS_CANNONLAKE(dev_priv)) {
> -		dev_priv->display.set_cdclk = cnl_set_cdclk;
> +	} else if (IS_BROADWELL(dev_priv)) {
> +		dev_priv->display.set_cdclk = bdw_set_cdclk;
>  		dev_priv->display.modeset_calc_cdclk =
> -			cnl_modeset_calc_cdclk;
> -	} else if (IS_ICELAKE(dev_priv)) {
> -		dev_priv->display.set_cdclk = icl_set_cdclk;
> -		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
> +			bdw_modeset_calc_cdclk;
> +	} else if (IS_CHERRYVIEW(dev_priv)) {
> +		dev_priv->display.set_cdclk = chv_set_cdclk;
> +		dev_priv->display.modeset_calc_cdclk =
> +			vlv_modeset_calc_cdclk;
> +	} else if (IS_VALLEYVIEW(dev_priv)) {
> +		dev_priv->display.set_cdclk = vlv_set_cdclk;
> +		dev_priv->display.modeset_calc_cdclk =
> +			vlv_modeset_calc_cdclk;
>  	}
>  
>  	if (IS_ICELAKE(dev_priv))
>  		dev_priv->display.get_cdclk = icl_get_cdclk;
>  	else if (IS_CANNONLAKE(dev_priv))
>  		dev_priv->display.get_cdclk = cnl_get_cdclk;
> -	else if (IS_GEN9_BC(dev_priv))
> -		dev_priv->display.get_cdclk = skl_get_cdclk;
>  	else if (IS_GEN9_LP(dev_priv))
>  		dev_priv->display.get_cdclk = bxt_get_cdclk;
> +	else if (IS_GEN9_BC(dev_priv))
> +		dev_priv->display.get_cdclk = skl_get_cdclk;
>  	else if (IS_BROADWELL(dev_priv))
>  		dev_priv->display.get_cdclk = bdw_get_cdclk;
>  	else if (IS_HASWELL(dev_priv))
> diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
> index 743cf5b00155..3e8138b66191 100644
> --- a/drivers/gpu/drm/i915/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/intel_workarounds.c
> @@ -862,26 +862,26 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
>  static void
>  gt_init_workarounds(struct drm_i915_private *i915, struct i915_wa_list *wal)
>  {
> -	if (INTEL_GEN(i915) < 8)
> +	if (IS_ICELAKE(i915))
> +		icl_gt_workarounds_init(i915, wal);
> +	else if (IS_CANNONLAKE(i915))
> +		cnl_gt_workarounds_init(i915, wal);
> +	else if (IS_COFFEELAKE(i915))
> +		cfl_gt_workarounds_init(i915, wal);
> +	else if (IS_GEMINILAKE(i915))
> +		glk_gt_workarounds_init(i915, wal);
> +	else if (IS_KABYLAKE(i915))
> +		kbl_gt_workarounds_init(i915, wal);
> +	else if (IS_BROXTON(i915))
> +		bxt_gt_workarounds_init(i915, wal);
> +	else if (IS_SKYLAKE(i915))
> +		skl_gt_workarounds_init(i915, wal);
> +	else if (IS_CHERRYVIEW(i915))
>  		return;
>  	else if (IS_BROADWELL(i915))
>  		return;
> -	else if (IS_CHERRYVIEW(i915))
> +	else if (INTEL_GEN(i915) < 8)
>  		return;

else if (gen >= 8)
	MISSING_CASE(...);
?

> -	else if (IS_SKYLAKE(i915))
> -		skl_gt_workarounds_init(i915, wal);
> -	else if (IS_BROXTON(i915))
> -		bxt_gt_workarounds_init(i915, wal);
> -	else if (IS_KABYLAKE(i915))
> -		kbl_gt_workarounds_init(i915, wal);
> -	else if (IS_GEMINILAKE(i915))
> -		glk_gt_workarounds_init(i915, wal);
> -	else if (IS_COFFEELAKE(i915))
> -		cfl_gt_workarounds_init(i915, wal);
> -	else if (IS_CANNONLAKE(i915))
> -		cnl_gt_workarounds_init(i915, wal);
> -	else if (IS_ICELAKE(i915))
> -		icl_gt_workarounds_init(i915, wal);
>  	else
>  		MISSING_CASE(INTEL_GEN(i915));
>  }
> @@ -1063,26 +1063,26 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine)
>  
>  	wa_init_start(w, "whitelist");
>  
> -	if (INTEL_GEN(i915) < 8)
> +	if (IS_ICELAKE(i915))
> +		icl_whitelist_build(w);
> +	else if (IS_CANNONLAKE(i915))
> +		cnl_whitelist_build(w);
> +	else if (IS_COFFEELAKE(i915))
> +		cfl_whitelist_build(w);
> +	else if (IS_GEMINILAKE(i915))
> +		glk_whitelist_build(w);
> +	else if (IS_KABYLAKE(i915))
> +		kbl_whitelist_build(w);
> +	else if (IS_BROXTON(i915))
> +		bxt_whitelist_build(w);
> +	else if (IS_SKYLAKE(i915))
> +		skl_whitelist_build(w);
> +	else if (IS_CHERRYVIEW(i915))
>  		return;
>  	else if (IS_BROADWELL(i915))
>  		return;
> -	else if (IS_CHERRYVIEW(i915))
> +	else if (INTEL_GEN(i915) < 8)
>  		return;
> -	else if (IS_SKYLAKE(i915))
> -		skl_whitelist_build(w);
> -	else if (IS_BROXTON(i915))
> -		bxt_whitelist_build(w);
> -	else if (IS_KABYLAKE(i915))
> -		kbl_whitelist_build(w);
> -	else if (IS_GEMINILAKE(i915))
> -		glk_whitelist_build(w);
> -	else if (IS_COFFEELAKE(i915))
> -		cfl_whitelist_build(w);
> -	else if (IS_CANNONLAKE(i915))
> -		cnl_whitelist_build(w);
> -	else if (IS_ICELAKE(i915))
> -		icl_whitelist_build(w);
>  	else
>  		MISSING_CASE(INTEL_GEN(i915));
>  
> -- 
> 2.20.1

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Yet another if/else sort of newer to older platforms.
  2019-02-25 16:32 ` [PATCH] " Ville Syrjälä
@ 2019-02-25 19:08   ` Rodrigo Vivi
  2019-02-25 19:11   ` Rodrigo Vivi
  1 sibling, 0 replies; 12+ messages in thread
From: Rodrigo Vivi @ 2019-02-25 19:08 UTC (permalink / raw)
  To: Ville Syrjälä; +Cc: intel-gfx, Lucas De Marchi

On Mon, Feb 25, 2019 at 06:32:51PM +0200, Ville Syrjälä wrote:
> On Fri, Feb 22, 2019 at 02:11:12PM -0800, Rodrigo Vivi wrote:
> > No functional change. Just a reorg to match the preferred
> > behavior.
> > 
> > When rebasing internal branch on top of latest sort I noticed
> > few more cases that needs to get reordered.
> > 
> > Let's do in a bundle this time and hoping there's no other
> > missing places.
> > 
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_drv.c          | 24 ++++-----
> >  drivers/gpu/drm/i915/i915_perf.c         | 50 +++++++++---------
> >  drivers/gpu/drm/i915/intel_cdclk.c       | 38 +++++++-------
> >  drivers/gpu/drm/i915/intel_workarounds.c | 64 ++++++++++++------------
> >  4 files changed, 88 insertions(+), 88 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> > index c6354f6cdbdb..0e3d5cf2c4f8 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -219,20 +219,20 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv)
> >  	 * make an educated guess as to which PCH is really there.
> >  	 */
> >  
> > -	if (IS_GEN(dev_priv, 5))
> > -		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
> > -	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
> > -		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
> > -	else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
> > -		id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
> > -	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
> > -		id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
> > -	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
> > -		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
> > +	if (IS_ICELAKE(dev_priv))
> > +		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
> >  	else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
> >  		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
> > -	else if (IS_ICELAKE(dev_priv))
> > -		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
> > +	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
> > +		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
> > +	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
> > +		id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
> > +	else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
> > +		id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
> 
> Generic match before the more specific one. That's not going to work.

ops, indeed... v2 is coming...

> 
> > +	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
> > +		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
> > +	else if (IS_GEN(dev_priv, 5))
> > +		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
> >  
> >  	if (id)
> >  		DRM_DEBUG_KMS("Assuming PCH ID %04x\n", id);
> > diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> > index 9ebf99f3d8d3..72a9a35b40e2 100644
> > --- a/drivers/gpu/drm/i915/i915_perf.c
> > +++ b/drivers/gpu/drm/i915/i915_perf.c
> > @@ -2881,12 +2881,24 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
> >  
> >  	sysfs_attr_init(&dev_priv->perf.oa.test_config.sysfs_metric_id.attr);
> >  
> > -	if (IS_HASWELL(dev_priv)) {
> > -		i915_perf_load_test_config_hsw(dev_priv);
> > -	} else if (IS_BROADWELL(dev_priv)) {
> > -		i915_perf_load_test_config_bdw(dev_priv);
> > -	} else if (IS_CHERRYVIEW(dev_priv)) {
> > -		i915_perf_load_test_config_chv(dev_priv);
> > +	if (IS_ICELAKE(dev_priv)) {
> > +		i915_perf_load_test_config_icl(dev_priv);
> > +	} else if (IS_CANNONLAKE(dev_priv)) {
> > +		i915_perf_load_test_config_cnl(dev_priv);
> > +	} else if (IS_COFFEELAKE(dev_priv)) {
> > +		if (IS_CFL_GT2(dev_priv))
> > +			i915_perf_load_test_config_cflgt2(dev_priv);
> > +		if (IS_CFL_GT3(dev_priv))
> > +			i915_perf_load_test_config_cflgt3(dev_priv);
> > +	} else if (IS_GEMINILAKE(dev_priv)) {
> > +		i915_perf_load_test_config_glk(dev_priv);
> > +	} else if (IS_KABYLAKE(dev_priv)) {
> > +		if (IS_KBL_GT2(dev_priv))
> > +			i915_perf_load_test_config_kblgt2(dev_priv);
> > +		else if (IS_KBL_GT3(dev_priv))
> > +			i915_perf_load_test_config_kblgt3(dev_priv);
> > +	} else if (IS_BROXTON(dev_priv)) {
> > +		i915_perf_load_test_config_bxt(dev_priv);
> >  	} else if (IS_SKYLAKE(dev_priv)) {
> >  		if (IS_SKL_GT2(dev_priv))
> >  			i915_perf_load_test_config_sklgt2(dev_priv);
> > @@ -2894,25 +2906,13 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
> >  			i915_perf_load_test_config_sklgt3(dev_priv);
> >  		else if (IS_SKL_GT4(dev_priv))
> >  			i915_perf_load_test_config_sklgt4(dev_priv);
> > -	} else if (IS_BROXTON(dev_priv)) {
> > -		i915_perf_load_test_config_bxt(dev_priv);
> > -	} else if (IS_KABYLAKE(dev_priv)) {
> > -		if (IS_KBL_GT2(dev_priv))
> > -			i915_perf_load_test_config_kblgt2(dev_priv);
> > -		else if (IS_KBL_GT3(dev_priv))
> > -			i915_perf_load_test_config_kblgt3(dev_priv);
> > -	} else if (IS_GEMINILAKE(dev_priv)) {
> > -		i915_perf_load_test_config_glk(dev_priv);
> > -	} else if (IS_COFFEELAKE(dev_priv)) {
> > -		if (IS_CFL_GT2(dev_priv))
> > -			i915_perf_load_test_config_cflgt2(dev_priv);
> > -		if (IS_CFL_GT3(dev_priv))
> > -			i915_perf_load_test_config_cflgt3(dev_priv);
> > -	} else if (IS_CANNONLAKE(dev_priv)) {
> > -		i915_perf_load_test_config_cnl(dev_priv);
> > -	} else if (IS_ICELAKE(dev_priv)) {
> > -		i915_perf_load_test_config_icl(dev_priv);
> > -	}
> > +	} else if (IS_CHERRYVIEW(dev_priv)) {
> > +		i915_perf_load_test_config_chv(dev_priv);
> > +	} else if (IS_BROADWELL(dev_priv)) {
> > +		i915_perf_load_test_config_bdw(dev_priv);
> > +	} else if (IS_HASWELL(dev_priv)) {
> > +		i915_perf_load_test_config_hsw(dev_priv);
> > +}
> >  
> >  	if (dev_priv->perf.oa.test_config.id == 0)
> >  		goto sysfs_error;
> > diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c
> > index 26e01a8465af..5d266538036d 100644
> > --- a/drivers/gpu/drm/i915/intel_cdclk.c
> > +++ b/drivers/gpu/drm/i915/intel_cdclk.c
> > @@ -2744,18 +2744,13 @@ void intel_update_rawclk(struct drm_i915_private *dev_priv)
> >   */
> >  void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
> >  {
> > -	if (IS_CHERRYVIEW(dev_priv)) {
> > -		dev_priv->display.set_cdclk = chv_set_cdclk;
> > -		dev_priv->display.modeset_calc_cdclk =
> > -			vlv_modeset_calc_cdclk;
> > -	} else if (IS_VALLEYVIEW(dev_priv)) {
> > -		dev_priv->display.set_cdclk = vlv_set_cdclk;
> > -		dev_priv->display.modeset_calc_cdclk =
> > -			vlv_modeset_calc_cdclk;
> > -	} else if (IS_BROADWELL(dev_priv)) {
> > -		dev_priv->display.set_cdclk = bdw_set_cdclk;
> > +	if (IS_ICELAKE(dev_priv)) {
> > +		dev_priv->display.set_cdclk = icl_set_cdclk;
> > +		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
> > +	} else if (IS_CANNONLAKE(dev_priv)) {
> > +		dev_priv->display.set_cdclk = cnl_set_cdclk;
> >  		dev_priv->display.modeset_calc_cdclk =
> > -			bdw_modeset_calc_cdclk;
> > +			cnl_modeset_calc_cdclk;
> >  	} else if (IS_GEN9_LP(dev_priv)) {
> >  		dev_priv->display.set_cdclk = bxt_set_cdclk;
> >  		dev_priv->display.modeset_calc_cdclk =
> > @@ -2764,23 +2759,28 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
> >  		dev_priv->display.set_cdclk = skl_set_cdclk;
> >  		dev_priv->display.modeset_calc_cdclk =
> >  			skl_modeset_calc_cdclk;
> > -	} else if (IS_CANNONLAKE(dev_priv)) {
> > -		dev_priv->display.set_cdclk = cnl_set_cdclk;
> > +	} else if (IS_BROADWELL(dev_priv)) {
> > +		dev_priv->display.set_cdclk = bdw_set_cdclk;
> >  		dev_priv->display.modeset_calc_cdclk =
> > -			cnl_modeset_calc_cdclk;
> > -	} else if (IS_ICELAKE(dev_priv)) {
> > -		dev_priv->display.set_cdclk = icl_set_cdclk;
> > -		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
> > +			bdw_modeset_calc_cdclk;
> > +	} else if (IS_CHERRYVIEW(dev_priv)) {
> > +		dev_priv->display.set_cdclk = chv_set_cdclk;
> > +		dev_priv->display.modeset_calc_cdclk =
> > +			vlv_modeset_calc_cdclk;
> > +	} else if (IS_VALLEYVIEW(dev_priv)) {
> > +		dev_priv->display.set_cdclk = vlv_set_cdclk;
> > +		dev_priv->display.modeset_calc_cdclk =
> > +			vlv_modeset_calc_cdclk;
> >  	}
> >  
> >  	if (IS_ICELAKE(dev_priv))
> >  		dev_priv->display.get_cdclk = icl_get_cdclk;
> >  	else if (IS_CANNONLAKE(dev_priv))
> >  		dev_priv->display.get_cdclk = cnl_get_cdclk;
> > -	else if (IS_GEN9_BC(dev_priv))
> > -		dev_priv->display.get_cdclk = skl_get_cdclk;
> >  	else if (IS_GEN9_LP(dev_priv))
> >  		dev_priv->display.get_cdclk = bxt_get_cdclk;
> > +	else if (IS_GEN9_BC(dev_priv))
> > +		dev_priv->display.get_cdclk = skl_get_cdclk;
> >  	else if (IS_BROADWELL(dev_priv))
> >  		dev_priv->display.get_cdclk = bdw_get_cdclk;
> >  	else if (IS_HASWELL(dev_priv))
> > diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
> > index 743cf5b00155..3e8138b66191 100644
> > --- a/drivers/gpu/drm/i915/intel_workarounds.c
> > +++ b/drivers/gpu/drm/i915/intel_workarounds.c
> > @@ -862,26 +862,26 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
> >  static void
> >  gt_init_workarounds(struct drm_i915_private *i915, struct i915_wa_list *wal)
> >  {
> > -	if (INTEL_GEN(i915) < 8)
> > +	if (IS_ICELAKE(i915))
> > +		icl_gt_workarounds_init(i915, wal);
> > +	else if (IS_CANNONLAKE(i915))
> > +		cnl_gt_workarounds_init(i915, wal);
> > +	else if (IS_COFFEELAKE(i915))
> > +		cfl_gt_workarounds_init(i915, wal);
> > +	else if (IS_GEMINILAKE(i915))
> > +		glk_gt_workarounds_init(i915, wal);
> > +	else if (IS_KABYLAKE(i915))
> > +		kbl_gt_workarounds_init(i915, wal);
> > +	else if (IS_BROXTON(i915))
> > +		bxt_gt_workarounds_init(i915, wal);
> > +	else if (IS_SKYLAKE(i915))
> > +		skl_gt_workarounds_init(i915, wal);
> > +	else if (IS_CHERRYVIEW(i915))
> >  		return;
> >  	else if (IS_BROADWELL(i915))
> >  		return;
> > -	else if (IS_CHERRYVIEW(i915))
> > +	else if (INTEL_GEN(i915) < 8)
> >  		return;
> 
> else if (gen >= 8)
> 	MISSING_CASE(...);
> ?

hmm... I actually want to remove the missing cases
in a follow-up after I make the standard behavior of

if (gen >= last-known)
   //use latest known code.
else if ...

> 
> > -	else if (IS_SKYLAKE(i915))
> > -		skl_gt_workarounds_init(i915, wal);
> > -	else if (IS_BROXTON(i915))
> > -		bxt_gt_workarounds_init(i915, wal);
> > -	else if (IS_KABYLAKE(i915))
> > -		kbl_gt_workarounds_init(i915, wal);
> > -	else if (IS_GEMINILAKE(i915))
> > -		glk_gt_workarounds_init(i915, wal);
> > -	else if (IS_COFFEELAKE(i915))
> > -		cfl_gt_workarounds_init(i915, wal);
> > -	else if (IS_CANNONLAKE(i915))
> > -		cnl_gt_workarounds_init(i915, wal);
> > -	else if (IS_ICELAKE(i915))
> > -		icl_gt_workarounds_init(i915, wal);
> >  	else
> >  		MISSING_CASE(INTEL_GEN(i915));
> >  }
> > @@ -1063,26 +1063,26 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine)
> >  
> >  	wa_init_start(w, "whitelist");
> >  
> > -	if (INTEL_GEN(i915) < 8)
> > +	if (IS_ICELAKE(i915))
> > +		icl_whitelist_build(w);
> > +	else if (IS_CANNONLAKE(i915))
> > +		cnl_whitelist_build(w);
> > +	else if (IS_COFFEELAKE(i915))
> > +		cfl_whitelist_build(w);
> > +	else if (IS_GEMINILAKE(i915))
> > +		glk_whitelist_build(w);
> > +	else if (IS_KABYLAKE(i915))
> > +		kbl_whitelist_build(w);
> > +	else if (IS_BROXTON(i915))
> > +		bxt_whitelist_build(w);
> > +	else if (IS_SKYLAKE(i915))
> > +		skl_whitelist_build(w);
> > +	else if (IS_CHERRYVIEW(i915))
> >  		return;
> >  	else if (IS_BROADWELL(i915))
> >  		return;
> > -	else if (IS_CHERRYVIEW(i915))
> > +	else if (INTEL_GEN(i915) < 8)
> >  		return;
> > -	else if (IS_SKYLAKE(i915))
> > -		skl_whitelist_build(w);
> > -	else if (IS_BROXTON(i915))
> > -		bxt_whitelist_build(w);
> > -	else if (IS_KABYLAKE(i915))
> > -		kbl_whitelist_build(w);
> > -	else if (IS_GEMINILAKE(i915))
> > -		glk_whitelist_build(w);
> > -	else if (IS_COFFEELAKE(i915))
> > -		cfl_whitelist_build(w);
> > -	else if (IS_CANNONLAKE(i915))
> > -		cnl_whitelist_build(w);
> > -	else if (IS_ICELAKE(i915))
> > -		icl_whitelist_build(w);
> >  	else
> >  		MISSING_CASE(INTEL_GEN(i915));
> >  
> > -- 
> > 2.20.1
> 
> -- 
> Ville Syrjälä
> Intel
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH] drm/i915: Yet another if/else sort of newer to older platforms.
  2019-02-25 16:32 ` [PATCH] " Ville Syrjälä
  2019-02-25 19:08   ` Rodrigo Vivi
@ 2019-02-25 19:11   ` Rodrigo Vivi
  2019-02-28 23:19     ` Lucas De Marchi
  1 sibling, 1 reply; 12+ messages in thread
From: Rodrigo Vivi @ 2019-02-25 19:11 UTC (permalink / raw)
  To: intel-gfx; +Cc: Lucas De Marchi

No functional change. Just a reorg to match the preferred
behavior.

When rebasing internal branch on top of latest sort I noticed
few more cases that needs to get reordered.

Let's do in a bundle this time and hoping there's no other
missing places.

v2: Check for HSW/BDW ULT before generic IS_HASWELL or
    IS_BROADWELL or it doesn't work as pointed by Ville.
    But also ULT came afterwards anyway.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c          | 20 ++++----
 drivers/gpu/drm/i915/i915_perf.c         | 50 +++++++++---------
 drivers/gpu/drm/i915/intel_cdclk.c       | 38 +++++++-------
 drivers/gpu/drm/i915/intel_workarounds.c | 64 ++++++++++++------------
 4 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c6354f6cdbdb..ed48aac1487d 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -219,20 +219,20 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv)
 	 * make an educated guess as to which PCH is really there.
 	 */
 
-	if (IS_GEN(dev_priv, 5))
-		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
-	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
-		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
+	if (IS_ICELAKE(dev_priv))
+		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
+	else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
+		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
+	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
+		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
 	else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
 		id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
 	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
 		id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
-	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
-		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
-	else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
-		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
-	else if (IS_ICELAKE(dev_priv))
-		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
+	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
+		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
+	else if (IS_GEN(dev_priv, 5))
+		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
 
 	if (id)
 		DRM_DEBUG_KMS("Assuming PCH ID %04x\n", id);
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 9ebf99f3d8d3..72a9a35b40e2 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -2881,12 +2881,24 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
 
 	sysfs_attr_init(&dev_priv->perf.oa.test_config.sysfs_metric_id.attr);
 
-	if (IS_HASWELL(dev_priv)) {
-		i915_perf_load_test_config_hsw(dev_priv);
-	} else if (IS_BROADWELL(dev_priv)) {
-		i915_perf_load_test_config_bdw(dev_priv);
-	} else if (IS_CHERRYVIEW(dev_priv)) {
-		i915_perf_load_test_config_chv(dev_priv);
+	if (IS_ICELAKE(dev_priv)) {
+		i915_perf_load_test_config_icl(dev_priv);
+	} else if (IS_CANNONLAKE(dev_priv)) {
+		i915_perf_load_test_config_cnl(dev_priv);
+	} else if (IS_COFFEELAKE(dev_priv)) {
+		if (IS_CFL_GT2(dev_priv))
+			i915_perf_load_test_config_cflgt2(dev_priv);
+		if (IS_CFL_GT3(dev_priv))
+			i915_perf_load_test_config_cflgt3(dev_priv);
+	} else if (IS_GEMINILAKE(dev_priv)) {
+		i915_perf_load_test_config_glk(dev_priv);
+	} else if (IS_KABYLAKE(dev_priv)) {
+		if (IS_KBL_GT2(dev_priv))
+			i915_perf_load_test_config_kblgt2(dev_priv);
+		else if (IS_KBL_GT3(dev_priv))
+			i915_perf_load_test_config_kblgt3(dev_priv);
+	} else if (IS_BROXTON(dev_priv)) {
+		i915_perf_load_test_config_bxt(dev_priv);
 	} else if (IS_SKYLAKE(dev_priv)) {
 		if (IS_SKL_GT2(dev_priv))
 			i915_perf_load_test_config_sklgt2(dev_priv);
@@ -2894,25 +2906,13 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
 			i915_perf_load_test_config_sklgt3(dev_priv);
 		else if (IS_SKL_GT4(dev_priv))
 			i915_perf_load_test_config_sklgt4(dev_priv);
-	} else if (IS_BROXTON(dev_priv)) {
-		i915_perf_load_test_config_bxt(dev_priv);
-	} else if (IS_KABYLAKE(dev_priv)) {
-		if (IS_KBL_GT2(dev_priv))
-			i915_perf_load_test_config_kblgt2(dev_priv);
-		else if (IS_KBL_GT3(dev_priv))
-			i915_perf_load_test_config_kblgt3(dev_priv);
-	} else if (IS_GEMINILAKE(dev_priv)) {
-		i915_perf_load_test_config_glk(dev_priv);
-	} else if (IS_COFFEELAKE(dev_priv)) {
-		if (IS_CFL_GT2(dev_priv))
-			i915_perf_load_test_config_cflgt2(dev_priv);
-		if (IS_CFL_GT3(dev_priv))
-			i915_perf_load_test_config_cflgt3(dev_priv);
-	} else if (IS_CANNONLAKE(dev_priv)) {
-		i915_perf_load_test_config_cnl(dev_priv);
-	} else if (IS_ICELAKE(dev_priv)) {
-		i915_perf_load_test_config_icl(dev_priv);
-	}
+	} else if (IS_CHERRYVIEW(dev_priv)) {
+		i915_perf_load_test_config_chv(dev_priv);
+	} else if (IS_BROADWELL(dev_priv)) {
+		i915_perf_load_test_config_bdw(dev_priv);
+	} else if (IS_HASWELL(dev_priv)) {
+		i915_perf_load_test_config_hsw(dev_priv);
+}
 
 	if (dev_priv->perf.oa.test_config.id == 0)
 		goto sysfs_error;
diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c
index 26e01a8465af..5d266538036d 100644
--- a/drivers/gpu/drm/i915/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/intel_cdclk.c
@@ -2744,18 +2744,13 @@ void intel_update_rawclk(struct drm_i915_private *dev_priv)
  */
 void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
 {
-	if (IS_CHERRYVIEW(dev_priv)) {
-		dev_priv->display.set_cdclk = chv_set_cdclk;
-		dev_priv->display.modeset_calc_cdclk =
-			vlv_modeset_calc_cdclk;
-	} else if (IS_VALLEYVIEW(dev_priv)) {
-		dev_priv->display.set_cdclk = vlv_set_cdclk;
-		dev_priv->display.modeset_calc_cdclk =
-			vlv_modeset_calc_cdclk;
-	} else if (IS_BROADWELL(dev_priv)) {
-		dev_priv->display.set_cdclk = bdw_set_cdclk;
+	if (IS_ICELAKE(dev_priv)) {
+		dev_priv->display.set_cdclk = icl_set_cdclk;
+		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
+	} else if (IS_CANNONLAKE(dev_priv)) {
+		dev_priv->display.set_cdclk = cnl_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
-			bdw_modeset_calc_cdclk;
+			cnl_modeset_calc_cdclk;
 	} else if (IS_GEN9_LP(dev_priv)) {
 		dev_priv->display.set_cdclk = bxt_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
@@ -2764,23 +2759,28 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
 		dev_priv->display.set_cdclk = skl_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
 			skl_modeset_calc_cdclk;
-	} else if (IS_CANNONLAKE(dev_priv)) {
-		dev_priv->display.set_cdclk = cnl_set_cdclk;
+	} else if (IS_BROADWELL(dev_priv)) {
+		dev_priv->display.set_cdclk = bdw_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
-			cnl_modeset_calc_cdclk;
-	} else if (IS_ICELAKE(dev_priv)) {
-		dev_priv->display.set_cdclk = icl_set_cdclk;
-		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
+			bdw_modeset_calc_cdclk;
+	} else if (IS_CHERRYVIEW(dev_priv)) {
+		dev_priv->display.set_cdclk = chv_set_cdclk;
+		dev_priv->display.modeset_calc_cdclk =
+			vlv_modeset_calc_cdclk;
+	} else if (IS_VALLEYVIEW(dev_priv)) {
+		dev_priv->display.set_cdclk = vlv_set_cdclk;
+		dev_priv->display.modeset_calc_cdclk =
+			vlv_modeset_calc_cdclk;
 	}
 
 	if (IS_ICELAKE(dev_priv))
 		dev_priv->display.get_cdclk = icl_get_cdclk;
 	else if (IS_CANNONLAKE(dev_priv))
 		dev_priv->display.get_cdclk = cnl_get_cdclk;
-	else if (IS_GEN9_BC(dev_priv))
-		dev_priv->display.get_cdclk = skl_get_cdclk;
 	else if (IS_GEN9_LP(dev_priv))
 		dev_priv->display.get_cdclk = bxt_get_cdclk;
+	else if (IS_GEN9_BC(dev_priv))
+		dev_priv->display.get_cdclk = skl_get_cdclk;
 	else if (IS_BROADWELL(dev_priv))
 		dev_priv->display.get_cdclk = bdw_get_cdclk;
 	else if (IS_HASWELL(dev_priv))
diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
index 743cf5b00155..3e8138b66191 100644
--- a/drivers/gpu/drm/i915/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/intel_workarounds.c
@@ -862,26 +862,26 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
 static void
 gt_init_workarounds(struct drm_i915_private *i915, struct i915_wa_list *wal)
 {
-	if (INTEL_GEN(i915) < 8)
+	if (IS_ICELAKE(i915))
+		icl_gt_workarounds_init(i915, wal);
+	else if (IS_CANNONLAKE(i915))
+		cnl_gt_workarounds_init(i915, wal);
+	else if (IS_COFFEELAKE(i915))
+		cfl_gt_workarounds_init(i915, wal);
+	else if (IS_GEMINILAKE(i915))
+		glk_gt_workarounds_init(i915, wal);
+	else if (IS_KABYLAKE(i915))
+		kbl_gt_workarounds_init(i915, wal);
+	else if (IS_BROXTON(i915))
+		bxt_gt_workarounds_init(i915, wal);
+	else if (IS_SKYLAKE(i915))
+		skl_gt_workarounds_init(i915, wal);
+	else if (IS_CHERRYVIEW(i915))
 		return;
 	else if (IS_BROADWELL(i915))
 		return;
-	else if (IS_CHERRYVIEW(i915))
+	else if (INTEL_GEN(i915) < 8)
 		return;
-	else if (IS_SKYLAKE(i915))
-		skl_gt_workarounds_init(i915, wal);
-	else if (IS_BROXTON(i915))
-		bxt_gt_workarounds_init(i915, wal);
-	else if (IS_KABYLAKE(i915))
-		kbl_gt_workarounds_init(i915, wal);
-	else if (IS_GEMINILAKE(i915))
-		glk_gt_workarounds_init(i915, wal);
-	else if (IS_COFFEELAKE(i915))
-		cfl_gt_workarounds_init(i915, wal);
-	else if (IS_CANNONLAKE(i915))
-		cnl_gt_workarounds_init(i915, wal);
-	else if (IS_ICELAKE(i915))
-		icl_gt_workarounds_init(i915, wal);
 	else
 		MISSING_CASE(INTEL_GEN(i915));
 }
@@ -1063,26 +1063,26 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine)
 
 	wa_init_start(w, "whitelist");
 
-	if (INTEL_GEN(i915) < 8)
+	if (IS_ICELAKE(i915))
+		icl_whitelist_build(w);
+	else if (IS_CANNONLAKE(i915))
+		cnl_whitelist_build(w);
+	else if (IS_COFFEELAKE(i915))
+		cfl_whitelist_build(w);
+	else if (IS_GEMINILAKE(i915))
+		glk_whitelist_build(w);
+	else if (IS_KABYLAKE(i915))
+		kbl_whitelist_build(w);
+	else if (IS_BROXTON(i915))
+		bxt_whitelist_build(w);
+	else if (IS_SKYLAKE(i915))
+		skl_whitelist_build(w);
+	else if (IS_CHERRYVIEW(i915))
 		return;
 	else if (IS_BROADWELL(i915))
 		return;
-	else if (IS_CHERRYVIEW(i915))
+	else if (INTEL_GEN(i915) < 8)
 		return;
-	else if (IS_SKYLAKE(i915))
-		skl_whitelist_build(w);
-	else if (IS_BROXTON(i915))
-		bxt_whitelist_build(w);
-	else if (IS_KABYLAKE(i915))
-		kbl_whitelist_build(w);
-	else if (IS_GEMINILAKE(i915))
-		glk_whitelist_build(w);
-	else if (IS_COFFEELAKE(i915))
-		cfl_whitelist_build(w);
-	else if (IS_CANNONLAKE(i915))
-		cnl_whitelist_build(w);
-	else if (IS_ICELAKE(i915))
-		icl_whitelist_build(w);
 	else
 		MISSING_CASE(INTEL_GEN(i915));
 
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Yet another if/else sort of newer to older platforms. (rev2)
  2019-02-22 22:11 [PATCH] drm/i915: Yet another if/else sort of newer to older platforms Rodrigo Vivi
  2019-02-22 22:59 ` ✗ Fi.CI.BAT: failure for " Patchwork
  2019-02-25 16:32 ` [PATCH] " Ville Syrjälä
@ 2019-02-25 19:58 ` Patchwork
  2019-02-26  4:44 ` ✓ Fi.CI.IGT: " Patchwork
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-02-25 19:58 UTC (permalink / raw)
  To: intel-gfx

== Series Details ==

Series: drm/i915: Yet another if/else sort of newer to older platforms. (rev2)
URL   : https://patchwork.freedesktop.org/series/57112/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5659 -> Patchwork_12300
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/57112/revisions/2/mbox/

Known issues
------------

  Here are the changes found in Patchwork_12300 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@i915_module_load@reload:
    - fi-blb-e6850:       PASS -> INCOMPLETE [fdo#107718]

  * igt@i915_pm_rpm@basic-pci-d3-state:
    - fi-bsw-kefka:       PASS -> SKIP [fdo#109271]

  * igt@i915_pm_rpm@basic-rte:
    - fi-bsw-kefka:       PASS -> FAIL [fdo#108800]

  * igt@kms_frontbuffer_tracking@basic:
    - fi-icl-u3:          PASS -> FAIL [fdo#103167]

  * igt@prime_vgem@basic-fence-flip:
    - fi-gdg-551:         PASS -> FAIL [fdo#103182]

  
#### Possible fixes ####

  * igt@i915_selftest@live_execlists:
    - fi-apl-guc:         INCOMPLETE [fdo#103927] / [fdo#109720] -> PASS

  
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
  [fdo#108800]: https://bugs.freedesktop.org/show_bug.cgi?id=108800
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720


Participating hosts (44 -> 39)
------------------------------

  Missing    (5): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-icl-u2 fi-ctg-p8600 


Build changes
-------------

    * Linux: CI_DRM_5659 -> Patchwork_12300

  CI_DRM_5659: bffea990c63087245e8501df82fd45f24ce6ad1f @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4854: 06b0830fb948b9b632342cd26100342aa01cbc79 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_12300: f7dba310f48d67552dc591d7f130fe3063c656d5 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

f7dba310f48d drm/i915: Yet another if/else sort of newer to older platforms.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12300/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Yet another if/else sort of newer to older platforms. (rev2)
  2019-02-22 22:11 [PATCH] drm/i915: Yet another if/else sort of newer to older platforms Rodrigo Vivi
                   ` (2 preceding siblings ...)
  2019-02-25 19:58 ` ✓ Fi.CI.BAT: success for drm/i915: Yet another if/else sort of newer to older platforms. (rev2) Patchwork
@ 2019-02-26  4:44 ` Patchwork
  2019-03-01 18:46 ` ✓ Fi.CI.BAT: success for drm/i915: Yet another if/else sort of newer to older platforms. (rev3) Patchwork
  2019-03-02  1:09 ` ✓ Fi.CI.IGT: " Patchwork
  5 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-02-26  4:44 UTC (permalink / raw)
  To: intel-gfx

== Series Details ==

Series: drm/i915: Yet another if/else sort of newer to older platforms. (rev2)
URL   : https://patchwork.freedesktop.org/series/57112/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5659_full -> Patchwork_12300_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  

Known issues
------------

  Here are the changes found in Patchwork_12300_full that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_busy@busy-bsd1:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109276] +1

  * igt@gem_mocs_settings@mocs-reset-bsd2:
    - shard-snb:          NOTRUN -> SKIP [fdo#109271] +103

  * igt@gem_mocs_settings@mocs-settings-blt:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109287]

  * igt@i915_pm_rpm@fences:
    - shard-iclb:         PASS -> DMESG-WARN [fdo#107724] +9

  * igt@i915_selftest@live_workarounds:
    - shard-iclb:         PASS -> DMESG-FAIL [fdo#108954]

  * igt@i915_suspend@fence-restore-tiled2untiled:
    - shard-iclb:         PASS -> FAIL [fdo#103375] +2

  * igt@kms_atomic_transition@3x-modeset-transitions-nonblocking-fencing:
    - shard-snb:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +9

  * igt@kms_atomic_transition@5x-modeset-transitions-nonblocking:
    - shard-glk:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278]

  * igt@kms_atomic_transition@6x-modeset-transitions-nonblocking-fencing:
    - shard-apl:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278]

  * igt@kms_busy@extended-modeset-hang-newfb-render-b:
    - shard-snb:          NOTRUN -> DMESG-WARN [fdo#107956]

  * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
    - shard-hsw:          PASS -> DMESG-WARN [fdo#107956]

  * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
    - shard-glk:          NOTRUN -> DMESG-WARN [fdo#107956]

  * igt@kms_busy@extended-modeset-hang-oldfb-render-d:
    - shard-kbl:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1

  * igt@kms_chamelium@hdmi-crc-single:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109284]

  * igt@kms_color@pipe-a-degamma:
    - shard-apl:          PASS -> FAIL [fdo#104782] / [fdo#108145]

  * igt@kms_cursor_crc@cursor-256x85-random:
    - shard-apl:          PASS -> FAIL [fdo#103232] +2

  * igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
    - shard-hsw:          PASS -> FAIL [fdo#105767]

  * igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109274] +1

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen:
    - shard-glk:          PASS -> FAIL [fdo#103167] +2
    - shard-apl:          PASS -> FAIL [fdo#103167] +1

  * igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-render:
    - shard-kbl:          NOTRUN -> SKIP [fdo#109271] +17

  * igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-blt:
    - shard-iclb:         PASS -> FAIL [fdo#103167] +1

  * igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-onoff:
    - shard-glk:          NOTRUN -> SKIP [fdo#109271] +8

  * igt@kms_frontbuffer_tracking@psr-2p-scndscrn-indfb-pgflip-blt:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109280] +2

  * igt@kms_invalid_dotclock:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109310]

  * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
    - shard-glk:          PASS -> INCOMPLETE [fdo#103359] / [k.org#198133]

  * igt@kms_plane@plane-position-covered-pipe-c-planes:
    - shard-apl:          PASS -> FAIL [fdo#103166] +2

  * igt@kms_plane_multiple@atomic-pipe-b-tiling-none:
    - shard-glk:          PASS -> FAIL [fdo#103166]

  * igt@kms_plane_multiple@atomic-pipe-c-tiling-none:
    - shard-iclb:         PASS -> FAIL [fdo#103166] +1

  * igt@kms_rotation_crc@multiplane-rotation-cropping-top:
    - shard-glk:          PASS -> DMESG-FAIL [fdo#105763] / [fdo#106538]

  * igt@prime_vgem@fence-write-hang:
    - shard-apl:          NOTRUN -> SKIP [fdo#109271] +8

  * igt@v3d_get_param@get-bad-param:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109315]

  
#### Possible fixes ####

  * igt@i915_pm_rpm@gem-idle:
    - shard-iclb:         DMESG-WARN [fdo#107724] -> PASS +6

  * igt@i915_pm_rpm@legacy-planes-dpms:
    - shard-iclb:         INCOMPLETE [fdo#108840] / [fdo#109369] -> PASS

  * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
    - shard-snb:          DMESG-WARN [fdo#107956] -> PASS

  * igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
    - shard-apl:          FAIL [fdo#106510] / [fdo#108145] -> PASS

  * igt@kms_color@pipe-a-ctm-max:
    - shard-apl:          FAIL [fdo#108147] -> PASS

  * igt@kms_cursor_crc@cursor-256x85-onscreen:
    - shard-apl:          FAIL [fdo#103232] -> PASS +3

  * igt@kms_cursor_crc@cursor-size-change:
    - shard-glk:          FAIL [fdo#103232] -> PASS

  * igt@kms_flip@flip-vs-expired-vblank:
    - shard-iclb:         FAIL [fdo#105363] -> PASS

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
    - shard-apl:          FAIL [fdo#103167] -> PASS +4

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
    - shard-iclb:         FAIL [fdo#103167] -> PASS +6

  * igt@kms_frontbuffer_tracking@fbc-1p-rte:
    - shard-apl:          FAIL [fdo#103167] / [fdo#105682] -> PASS

  * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-mmap-cpu:
    - shard-glk:          FAIL [fdo#103167] -> PASS +2

  * igt@kms_plane@pixel-format-pipe-b-planes-source-clamping:
    - shard-apl:          FAIL [fdo#108948] -> PASS

  * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
    - shard-glk:          INCOMPLETE [fdo#103359] / [k.org#198133] -> PASS

  * igt@kms_plane@plane-position-covered-pipe-c-planes:
    - shard-glk:          FAIL [fdo#103166] -> PASS +2

  * igt@kms_plane@plane-position-hole-dpms-pipe-b-planes:
    - shard-snb:          SKIP [fdo#109271] -> PASS +1

  * igt@kms_plane_multiple@atomic-pipe-a-tiling-none:
    - shard-apl:          FAIL [fdo#103166] -> PASS +1

  * igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
    - shard-iclb:         FAIL [fdo#103166] -> PASS +3

  * igt@kms_rotation_crc@multiplane-rotation:
    - shard-kbl:          INCOMPLETE [fdo#103665] -> PASS

  * igt@kms_rotation_crc@multiplane-rotation-cropping-bottom:
    - shard-kbl:          DMESG-FAIL [fdo#105763] -> PASS

  * igt@kms_setmode@basic:
    - shard-kbl:          FAIL [fdo#99912] -> PASS

  * igt@prime_busy@hang-vebox:
    - shard-hsw:          FAIL [fdo#108807] -> PASS

  
#### Warnings ####

  * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-indfb-pgflip-blt:
    - shard-apl:          SKIP [fdo#109271] -> INCOMPLETE [fdo#103927]

  
  [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
  [fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
  [fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
  [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
  [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
  [fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
  [fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
  [fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
  [fdo#106510]: https://bugs.freedesktop.org/show_bug.cgi?id=106510
  [fdo#106538]: https://bugs.freedesktop.org/show_bug.cgi?id=106538
  [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
  [fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
  [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
  [fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
  [fdo#108807]: https://bugs.freedesktop.org/show_bug.cgi?id=108807
  [fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
  [fdo#108948]: https://bugs.freedesktop.org/show_bug.cgi?id=108948
  [fdo#108954]: https://bugs.freedesktop.org/show_bug.cgi?id=108954
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
  [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
  [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
  [fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
  [fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
  [fdo#109287]: https://bugs.freedesktop.org/show_bug.cgi?id=109287
  [fdo#109310]: https://bugs.freedesktop.org/show_bug.cgi?id=109310
  [fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
  [fdo#109369]: https://bugs.freedesktop.org/show_bug.cgi?id=109369
  [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
  [k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133


Participating hosts (7 -> 6)
------------------------------

  Missing    (1): shard-skl 


Build changes
-------------

    * Linux: CI_DRM_5659 -> Patchwork_12300

  CI_DRM_5659: bffea990c63087245e8501df82fd45f24ce6ad1f @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4854: 06b0830fb948b9b632342cd26100342aa01cbc79 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_12300: f7dba310f48d67552dc591d7f130fe3063c656d5 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12300/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Yet another if/else sort of newer to older platforms.
  2019-02-25 19:11   ` Rodrigo Vivi
@ 2019-02-28 23:19     ` Lucas De Marchi
  2019-03-01 17:24       ` Rodrigo Vivi
  2019-03-01 17:27       ` Rodrigo Vivi
  0 siblings, 2 replies; 12+ messages in thread
From: Lucas De Marchi @ 2019-02-28 23:19 UTC (permalink / raw)
  To: Rodrigo Vivi; +Cc: intel-gfx

On Mon, Feb 25, 2019 at 11:11:30AM -0800, Rodrigo Vivi wrote:
>No functional change. Just a reorg to match the preferred
>behavior.
>
>When rebasing internal branch on top of latest sort I noticed
>few more cases that needs to get reordered.
>
>Let's do in a bundle this time and hoping there's no other
>missing places.
>
>v2: Check for HSW/BDW ULT before generic IS_HASWELL or
>    IS_BROADWELL or it doesn't work as pointed by Ville.
>    But also ULT came afterwards anyway.
>
>Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>Cc: Chris Wilson <chris@chris-wilson.co.uk>
>Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>---
> drivers/gpu/drm/i915/i915_drv.c          | 20 ++++----
> drivers/gpu/drm/i915/i915_perf.c         | 50 +++++++++---------
> drivers/gpu/drm/i915/intel_cdclk.c       | 38 +++++++-------
> drivers/gpu/drm/i915/intel_workarounds.c | 64 ++++++++++++------------
> 4 files changed, 86 insertions(+), 86 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index c6354f6cdbdb..ed48aac1487d 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -219,20 +219,20 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv)
> 	 * make an educated guess as to which PCH is really there.
> 	 */
>
>-	if (IS_GEN(dev_priv, 5))
>-		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
>-	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
>-		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
>+	if (IS_ICELAKE(dev_priv))
>+		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
>+	else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv))

if you want to be strict about the order, then this should be:

	else if (IS_CANNONLAKE(dev_priv) || IS_COFFELAKE(dev_priv))

>+		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
>+	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))

ditto

>+		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
> 	else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
> 		id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
> 	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
> 		id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
>-	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
>-		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
>-	else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
>-		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
>-	else if (IS_ICELAKE(dev_priv))
>-		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
>+	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
>+		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
>+	else if (IS_GEN(dev_priv, 5))
>+		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
>
> 	if (id)
> 		DRM_DEBUG_KMS("Assuming PCH ID %04x\n", id);
>diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
>index 9ebf99f3d8d3..72a9a35b40e2 100644
>--- a/drivers/gpu/drm/i915/i915_perf.c
>+++ b/drivers/gpu/drm/i915/i915_perf.c
>@@ -2881,12 +2881,24 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
>
> 	sysfs_attr_init(&dev_priv->perf.oa.test_config.sysfs_metric_id.attr);
>
>-	if (IS_HASWELL(dev_priv)) {
>-		i915_perf_load_test_config_hsw(dev_priv);
>-	} else if (IS_BROADWELL(dev_priv)) {
>-		i915_perf_load_test_config_bdw(dev_priv);
>-	} else if (IS_CHERRYVIEW(dev_priv)) {
>-		i915_perf_load_test_config_chv(dev_priv);
>+	if (IS_ICELAKE(dev_priv)) {
>+		i915_perf_load_test_config_icl(dev_priv);
>+	} else if (IS_CANNONLAKE(dev_priv)) {
>+		i915_perf_load_test_config_cnl(dev_priv);
>+	} else if (IS_COFFEELAKE(dev_priv)) {
>+		if (IS_CFL_GT2(dev_priv))
>+			i915_perf_load_test_config_cflgt2(dev_priv);
>+		if (IS_CFL_GT3(dev_priv))
>+			i915_perf_load_test_config_cflgt3(dev_priv);
>+	} else if (IS_GEMINILAKE(dev_priv)) {
>+		i915_perf_load_test_config_glk(dev_priv);
>+	} else if (IS_KABYLAKE(dev_priv)) {
>+		if (IS_KBL_GT2(dev_priv))
>+			i915_perf_load_test_config_kblgt2(dev_priv);
>+		else if (IS_KBL_GT3(dev_priv))
>+			i915_perf_load_test_config_kblgt3(dev_priv);
>+	} else if (IS_BROXTON(dev_priv)) {
>+		i915_perf_load_test_config_bxt(dev_priv);
> 	} else if (IS_SKYLAKE(dev_priv)) {
> 		if (IS_SKL_GT2(dev_priv))
> 			i915_perf_load_test_config_sklgt2(dev_priv);
>@@ -2894,25 +2906,13 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
> 			i915_perf_load_test_config_sklgt3(dev_priv);
> 		else if (IS_SKL_GT4(dev_priv))
> 			i915_perf_load_test_config_sklgt4(dev_priv);
>-	} else if (IS_BROXTON(dev_priv)) {
>-		i915_perf_load_test_config_bxt(dev_priv);
>-	} else if (IS_KABYLAKE(dev_priv)) {
>-		if (IS_KBL_GT2(dev_priv))
>-			i915_perf_load_test_config_kblgt2(dev_priv);
>-		else if (IS_KBL_GT3(dev_priv))
>-			i915_perf_load_test_config_kblgt3(dev_priv);
>-	} else if (IS_GEMINILAKE(dev_priv)) {
>-		i915_perf_load_test_config_glk(dev_priv);
>-	} else if (IS_COFFEELAKE(dev_priv)) {
>-		if (IS_CFL_GT2(dev_priv))
>-			i915_perf_load_test_config_cflgt2(dev_priv);
>-		if (IS_CFL_GT3(dev_priv))
>-			i915_perf_load_test_config_cflgt3(dev_priv);
>-	} else if (IS_CANNONLAKE(dev_priv)) {
>-		i915_perf_load_test_config_cnl(dev_priv);
>-	} else if (IS_ICELAKE(dev_priv)) {
>-		i915_perf_load_test_config_icl(dev_priv);
>-	}
>+	} else if (IS_CHERRYVIEW(dev_priv)) {
>+		i915_perf_load_test_config_chv(dev_priv);
>+	} else if (IS_BROADWELL(dev_priv)) {
>+		i915_perf_load_test_config_bdw(dev_priv);
>+	} else if (IS_HASWELL(dev_priv)) {
>+		i915_perf_load_test_config_hsw(dev_priv);
>+}
>
> 	if (dev_priv->perf.oa.test_config.id == 0)
> 		goto sysfs_error;
>diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c
>index 26e01a8465af..5d266538036d 100644
>--- a/drivers/gpu/drm/i915/intel_cdclk.c
>+++ b/drivers/gpu/drm/i915/intel_cdclk.c
>@@ -2744,18 +2744,13 @@ void intel_update_rawclk(struct drm_i915_private *dev_priv)
>  */
> void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
> {
>-	if (IS_CHERRYVIEW(dev_priv)) {
>-		dev_priv->display.set_cdclk = chv_set_cdclk;
>-		dev_priv->display.modeset_calc_cdclk =
>-			vlv_modeset_calc_cdclk;
>-	} else if (IS_VALLEYVIEW(dev_priv)) {
>-		dev_priv->display.set_cdclk = vlv_set_cdclk;
>-		dev_priv->display.modeset_calc_cdclk =
>-			vlv_modeset_calc_cdclk;
>-	} else if (IS_BROADWELL(dev_priv)) {
>-		dev_priv->display.set_cdclk = bdw_set_cdclk;
>+	if (IS_ICELAKE(dev_priv)) {
>+		dev_priv->display.set_cdclk = icl_set_cdclk;
>+		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
>+	} else if (IS_CANNONLAKE(dev_priv)) {
>+		dev_priv->display.set_cdclk = cnl_set_cdclk;
> 		dev_priv->display.modeset_calc_cdclk =
>-			bdw_modeset_calc_cdclk;
>+			cnl_modeset_calc_cdclk;
> 	} else if (IS_GEN9_LP(dev_priv)) {
> 		dev_priv->display.set_cdclk = bxt_set_cdclk;
> 		dev_priv->display.modeset_calc_cdclk =
>@@ -2764,23 +2759,28 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
> 		dev_priv->display.set_cdclk = skl_set_cdclk;
> 		dev_priv->display.modeset_calc_cdclk =
> 			skl_modeset_calc_cdclk;
>-	} else if (IS_CANNONLAKE(dev_priv)) {
>-		dev_priv->display.set_cdclk = cnl_set_cdclk;
>+	} else if (IS_BROADWELL(dev_priv)) {
>+		dev_priv->display.set_cdclk = bdw_set_cdclk;
> 		dev_priv->display.modeset_calc_cdclk =
>-			cnl_modeset_calc_cdclk;
>-	} else if (IS_ICELAKE(dev_priv)) {
>-		dev_priv->display.set_cdclk = icl_set_cdclk;
>-		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
>+			bdw_modeset_calc_cdclk;
>+	} else if (IS_CHERRYVIEW(dev_priv)) {
>+		dev_priv->display.set_cdclk = chv_set_cdclk;
>+		dev_priv->display.modeset_calc_cdclk =
>+			vlv_modeset_calc_cdclk;
>+	} else if (IS_VALLEYVIEW(dev_priv)) {
>+		dev_priv->display.set_cdclk = vlv_set_cdclk;
>+		dev_priv->display.modeset_calc_cdclk =
>+			vlv_modeset_calc_cdclk;
> 	}
>
> 	if (IS_ICELAKE(dev_priv))
> 		dev_priv->display.get_cdclk = icl_get_cdclk;
> 	else if (IS_CANNONLAKE(dev_priv))
> 		dev_priv->display.get_cdclk = cnl_get_cdclk;
>-	else if (IS_GEN9_BC(dev_priv))
>-		dev_priv->display.get_cdclk = skl_get_cdclk;
> 	else if (IS_GEN9_LP(dev_priv))
> 		dev_priv->display.get_cdclk = bxt_get_cdclk;
>+	else if (IS_GEN9_BC(dev_priv))
>+		dev_priv->display.get_cdclk = skl_get_cdclk;

no reason to change these...

> 	else if (IS_BROADWELL(dev_priv))
> 		dev_priv->display.get_cdclk = bdw_get_cdclk;
> 	else if (IS_HASWELL(dev_priv))
>diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
>index 743cf5b00155..3e8138b66191 100644
>--- a/drivers/gpu/drm/i915/intel_workarounds.c
>+++ b/drivers/gpu/drm/i915/intel_workarounds.c
>@@ -862,26 +862,26 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
> static void
> gt_init_workarounds(struct drm_i915_private *i915, struct i915_wa_list *wal)
> {
>-	if (INTEL_GEN(i915) < 8)
>+	if (IS_ICELAKE(i915))
>+		icl_gt_workarounds_init(i915, wal);
>+	else if (IS_CANNONLAKE(i915))
>+		cnl_gt_workarounds_init(i915, wal);
>+	else if (IS_COFFEELAKE(i915))
>+		cfl_gt_workarounds_init(i915, wal);
>+	else if (IS_GEMINILAKE(i915))
>+		glk_gt_workarounds_init(i915, wal);
>+	else if (IS_KABYLAKE(i915))
>+		kbl_gt_workarounds_init(i915, wal);
>+	else if (IS_BROXTON(i915))
>+		bxt_gt_workarounds_init(i915, wal);
>+	else if (IS_SKYLAKE(i915))
>+		skl_gt_workarounds_init(i915, wal);
>+	else if (IS_CHERRYVIEW(i915))
> 		return;
> 	else if (IS_BROADWELL(i915))
> 		return;
>-	else if (IS_CHERRYVIEW(i915))
>+	else if (INTEL_GEN(i915) < 8)
> 		return;
>-	else if (IS_SKYLAKE(i915))
>-		skl_gt_workarounds_init(i915, wal);
>-	else if (IS_BROXTON(i915))
>-		bxt_gt_workarounds_init(i915, wal);
>-	else if (IS_KABYLAKE(i915))
>-		kbl_gt_workarounds_init(i915, wal);
>-	else if (IS_GEMINILAKE(i915))
>-		glk_gt_workarounds_init(i915, wal);
>-	else if (IS_COFFEELAKE(i915))
>-		cfl_gt_workarounds_init(i915, wal);
>-	else if (IS_CANNONLAKE(i915))
>-		cnl_gt_workarounds_init(i915, wal);
>-	else if (IS_ICELAKE(i915))
>-		icl_gt_workarounds_init(i915, wal);
> 	else
> 		MISSING_CASE(INTEL_GEN(i915));
> }
>@@ -1063,26 +1063,26 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine)
>
> 	wa_init_start(w, "whitelist");
>
>-	if (INTEL_GEN(i915) < 8)
>+	if (IS_ICELAKE(i915))
>+		icl_whitelist_build(w);
>+	else if (IS_CANNONLAKE(i915))
>+		cnl_whitelist_build(w);
>+	else if (IS_COFFEELAKE(i915))
>+		cfl_whitelist_build(w);
>+	else if (IS_GEMINILAKE(i915))
>+		glk_whitelist_build(w);
>+	else if (IS_KABYLAKE(i915))
>+		kbl_whitelist_build(w);
>+	else if (IS_BROXTON(i915))
>+		bxt_whitelist_build(w);
>+	else if (IS_SKYLAKE(i915))
>+		skl_whitelist_build(w);
>+	else if (IS_CHERRYVIEW(i915))
> 		return;
> 	else if (IS_BROADWELL(i915))
> 		return;
>-	else if (IS_CHERRYVIEW(i915))
>+	else if (INTEL_GEN(i915) < 8)

make this INTEL_GEN(i915) <= 8) and remove IS_CHERRYVIEW() above?
The meaning would be that "BROADWELL is the only gen8 that has this, the
others and below => do nothing."


I went through each of the if/else chains and did my best to manually
verify them: I didn't find any bug. Comments above are basically
nitpicks.  Your call if you are actually going to change them.

Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>


Lucas De Marchi

> 		return;
>-	else if (IS_SKYLAKE(i915))
>-		skl_whitelist_build(w);
>-	else if (IS_BROXTON(i915))
>-		bxt_whitelist_build(w);
>-	else if (IS_KABYLAKE(i915))
>-		kbl_whitelist_build(w);
>-	else if (IS_GEMINILAKE(i915))
>-		glk_whitelist_build(w);
>-	else if (IS_COFFEELAKE(i915))
>-		cfl_whitelist_build(w);
>-	else if (IS_CANNONLAKE(i915))
>-		cnl_whitelist_build(w);
>-	else if (IS_ICELAKE(i915))
>-		icl_whitelist_build(w);
> 	else
> 		MISSING_CASE(INTEL_GEN(i915));
>
>-- 
>2.20.1
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Yet another if/else sort of newer to older platforms.
  2019-02-28 23:19     ` Lucas De Marchi
@ 2019-03-01 17:24       ` Rodrigo Vivi
  2019-03-01 17:27       ` Rodrigo Vivi
  1 sibling, 0 replies; 12+ messages in thread
From: Rodrigo Vivi @ 2019-03-01 17:24 UTC (permalink / raw)
  To: Lucas De Marchi; +Cc: intel-gfx

On Thu, Feb 28, 2019 at 03:19:39PM -0800, Lucas De Marchi wrote:
> On Mon, Feb 25, 2019 at 11:11:30AM -0800, Rodrigo Vivi wrote:
> > No functional change. Just a reorg to match the preferred
> > behavior.
> > 
> > When rebasing internal branch on top of latest sort I noticed
> > few more cases that needs to get reordered.
> > 
> > Let's do in a bundle this time and hoping there's no other
> > missing places.
> > 
> > v2: Check for HSW/BDW ULT before generic IS_HASWELL or
> >    IS_BROADWELL or it doesn't work as pointed by Ville.
> >    But also ULT came afterwards anyway.
> > 
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> > drivers/gpu/drm/i915/i915_drv.c          | 20 ++++----
> > drivers/gpu/drm/i915/i915_perf.c         | 50 +++++++++---------
> > drivers/gpu/drm/i915/intel_cdclk.c       | 38 +++++++-------
> > drivers/gpu/drm/i915/intel_workarounds.c | 64 ++++++++++++------------
> > 4 files changed, 86 insertions(+), 86 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> > index c6354f6cdbdb..ed48aac1487d 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -219,20 +219,20 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv)
> > 	 * make an educated guess as to which PCH is really there.
> > 	 */
> > 
> > -	if (IS_GEN(dev_priv, 5))
> > -		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
> > -	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
> > -		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
> > +	if (IS_ICELAKE(dev_priv))
> > +		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
> > +	else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
> 
> if you want to be strict about the order, then this should be:

accepted. It seems the most used one and makes sense
to keep CFL near the gen9 ones although cfl came after cnl
chronologically

> 
> 	else if (IS_CANNONLAKE(dev_priv) || IS_COFFELAKE(dev_priv))
> 
> > +		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
> > +	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
> 
> ditto

accepted.

> 
> > +		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
> > 	else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
> > 		id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
> > 	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
> > 		id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
> > -	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
> > -		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
> > -	else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
> > -		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
> > -	else if (IS_ICELAKE(dev_priv))
> > -		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
> > +	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
> > +		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
> > +	else if (IS_GEN(dev_priv, 5))
> > +		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
> > 
> > 	if (id)
> > 		DRM_DEBUG_KMS("Assuming PCH ID %04x\n", id);
> > diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> > index 9ebf99f3d8d3..72a9a35b40e2 100644
> > --- a/drivers/gpu/drm/i915/i915_perf.c
> > +++ b/drivers/gpu/drm/i915/i915_perf.c
> > @@ -2881,12 +2881,24 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
> > 
> > 	sysfs_attr_init(&dev_priv->perf.oa.test_config.sysfs_metric_id.attr);
> > 
> > -	if (IS_HASWELL(dev_priv)) {
> > -		i915_perf_load_test_config_hsw(dev_priv);
> > -	} else if (IS_BROADWELL(dev_priv)) {
> > -		i915_perf_load_test_config_bdw(dev_priv);
> > -	} else if (IS_CHERRYVIEW(dev_priv)) {
> > -		i915_perf_load_test_config_chv(dev_priv);
> > +	if (IS_ICELAKE(dev_priv)) {
> > +		i915_perf_load_test_config_icl(dev_priv);
> > +	} else if (IS_CANNONLAKE(dev_priv)) {
> > +		i915_perf_load_test_config_cnl(dev_priv);
> > +	} else if (IS_COFFEELAKE(dev_priv)) {
> > +		if (IS_CFL_GT2(dev_priv))
> > +			i915_perf_load_test_config_cflgt2(dev_priv);
> > +		if (IS_CFL_GT3(dev_priv))
> > +			i915_perf_load_test_config_cflgt3(dev_priv);
> > +	} else if (IS_GEMINILAKE(dev_priv)) {
> > +		i915_perf_load_test_config_glk(dev_priv);
> > +	} else if (IS_KABYLAKE(dev_priv)) {
> > +		if (IS_KBL_GT2(dev_priv))
> > +			i915_perf_load_test_config_kblgt2(dev_priv);
> > +		else if (IS_KBL_GT3(dev_priv))
> > +			i915_perf_load_test_config_kblgt3(dev_priv);
> > +	} else if (IS_BROXTON(dev_priv)) {
> > +		i915_perf_load_test_config_bxt(dev_priv);
> > 	} else if (IS_SKYLAKE(dev_priv)) {
> > 		if (IS_SKL_GT2(dev_priv))
> > 			i915_perf_load_test_config_sklgt2(dev_priv);
> > @@ -2894,25 +2906,13 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
> > 			i915_perf_load_test_config_sklgt3(dev_priv);
> > 		else if (IS_SKL_GT4(dev_priv))
> > 			i915_perf_load_test_config_sklgt4(dev_priv);
> > -	} else if (IS_BROXTON(dev_priv)) {
> > -		i915_perf_load_test_config_bxt(dev_priv);
> > -	} else if (IS_KABYLAKE(dev_priv)) {
> > -		if (IS_KBL_GT2(dev_priv))
> > -			i915_perf_load_test_config_kblgt2(dev_priv);
> > -		else if (IS_KBL_GT3(dev_priv))
> > -			i915_perf_load_test_config_kblgt3(dev_priv);
> > -	} else if (IS_GEMINILAKE(dev_priv)) {
> > -		i915_perf_load_test_config_glk(dev_priv);
> > -	} else if (IS_COFFEELAKE(dev_priv)) {
> > -		if (IS_CFL_GT2(dev_priv))
> > -			i915_perf_load_test_config_cflgt2(dev_priv);
> > -		if (IS_CFL_GT3(dev_priv))
> > -			i915_perf_load_test_config_cflgt3(dev_priv);
> > -	} else if (IS_CANNONLAKE(dev_priv)) {
> > -		i915_perf_load_test_config_cnl(dev_priv);
> > -	} else if (IS_ICELAKE(dev_priv)) {
> > -		i915_perf_load_test_config_icl(dev_priv);
> > -	}
> > +	} else if (IS_CHERRYVIEW(dev_priv)) {
> > +		i915_perf_load_test_config_chv(dev_priv);
> > +	} else if (IS_BROADWELL(dev_priv)) {
> > +		i915_perf_load_test_config_bdw(dev_priv);
> > +	} else if (IS_HASWELL(dev_priv)) {
> > +		i915_perf_load_test_config_hsw(dev_priv);
> > +}
> > 
> > 	if (dev_priv->perf.oa.test_config.id == 0)
> > 		goto sysfs_error;
> > diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c
> > index 26e01a8465af..5d266538036d 100644
> > --- a/drivers/gpu/drm/i915/intel_cdclk.c
> > +++ b/drivers/gpu/drm/i915/intel_cdclk.c
> > @@ -2744,18 +2744,13 @@ void intel_update_rawclk(struct drm_i915_private *dev_priv)
> >  */
> > void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
> > {
> > -	if (IS_CHERRYVIEW(dev_priv)) {
> > -		dev_priv->display.set_cdclk = chv_set_cdclk;
> > -		dev_priv->display.modeset_calc_cdclk =
> > -			vlv_modeset_calc_cdclk;
> > -	} else if (IS_VALLEYVIEW(dev_priv)) {
> > -		dev_priv->display.set_cdclk = vlv_set_cdclk;
> > -		dev_priv->display.modeset_calc_cdclk =
> > -			vlv_modeset_calc_cdclk;
> > -	} else if (IS_BROADWELL(dev_priv)) {
> > -		dev_priv->display.set_cdclk = bdw_set_cdclk;
> > +	if (IS_ICELAKE(dev_priv)) {
> > +		dev_priv->display.set_cdclk = icl_set_cdclk;
> > +		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
> > +	} else if (IS_CANNONLAKE(dev_priv)) {
> > +		dev_priv->display.set_cdclk = cnl_set_cdclk;
> > 		dev_priv->display.modeset_calc_cdclk =
> > -			bdw_modeset_calc_cdclk;
> > +			cnl_modeset_calc_cdclk;
> > 	} else if (IS_GEN9_LP(dev_priv)) {
> > 		dev_priv->display.set_cdclk = bxt_set_cdclk;
> > 		dev_priv->display.modeset_calc_cdclk =
> > @@ -2764,23 +2759,28 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
> > 		dev_priv->display.set_cdclk = skl_set_cdclk;
> > 		dev_priv->display.modeset_calc_cdclk =
> > 			skl_modeset_calc_cdclk;
> > -	} else if (IS_CANNONLAKE(dev_priv)) {
> > -		dev_priv->display.set_cdclk = cnl_set_cdclk;
> > +	} else if (IS_BROADWELL(dev_priv)) {
> > +		dev_priv->display.set_cdclk = bdw_set_cdclk;
> > 		dev_priv->display.modeset_calc_cdclk =
> > -			cnl_modeset_calc_cdclk;
> > -	} else if (IS_ICELAKE(dev_priv)) {
> > -		dev_priv->display.set_cdclk = icl_set_cdclk;
> > -		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
> > +			bdw_modeset_calc_cdclk;
> > +	} else if (IS_CHERRYVIEW(dev_priv)) {
> > +		dev_priv->display.set_cdclk = chv_set_cdclk;
> > +		dev_priv->display.modeset_calc_cdclk =
> > +			vlv_modeset_calc_cdclk;
> > +	} else if (IS_VALLEYVIEW(dev_priv)) {
> > +		dev_priv->display.set_cdclk = vlv_set_cdclk;
> > +		dev_priv->display.modeset_calc_cdclk =
> > +			vlv_modeset_calc_cdclk;
> > 	}
> > 
> > 	if (IS_ICELAKE(dev_priv))
> > 		dev_priv->display.get_cdclk = icl_get_cdclk;
> > 	else if (IS_CANNONLAKE(dev_priv))
> > 		dev_priv->display.get_cdclk = cnl_get_cdclk;
> > -	else if (IS_GEN9_BC(dev_priv))
> > -		dev_priv->display.get_cdclk = skl_get_cdclk;
> > 	else if (IS_GEN9_LP(dev_priv))
> > 		dev_priv->display.get_cdclk = bxt_get_cdclk;
> > +	else if (IS_GEN9_BC(dev_priv))
> > +		dev_priv->display.get_cdclk = skl_get_cdclk;
> 
> no reason to change these...

LP came after BC chronologically and I changed just to match
the above group.

> 
> > 	else if (IS_BROADWELL(dev_priv))
> > 		dev_priv->display.get_cdclk = bdw_get_cdclk;
> > 	else if (IS_HASWELL(dev_priv))
> > diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
> > index 743cf5b00155..3e8138b66191 100644
> > --- a/drivers/gpu/drm/i915/intel_workarounds.c
> > +++ b/drivers/gpu/drm/i915/intel_workarounds.c
> > @@ -862,26 +862,26 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
> > static void
> > gt_init_workarounds(struct drm_i915_private *i915, struct i915_wa_list *wal)
> > {
> > -	if (INTEL_GEN(i915) < 8)
> > +	if (IS_ICELAKE(i915))
> > +		icl_gt_workarounds_init(i915, wal);
> > +	else if (IS_CANNONLAKE(i915))
> > +		cnl_gt_workarounds_init(i915, wal);
> > +	else if (IS_COFFEELAKE(i915))
> > +		cfl_gt_workarounds_init(i915, wal);
> > +	else if (IS_GEMINILAKE(i915))
> > +		glk_gt_workarounds_init(i915, wal);
> > +	else if (IS_KABYLAKE(i915))
> > +		kbl_gt_workarounds_init(i915, wal);
> > +	else if (IS_BROXTON(i915))
> > +		bxt_gt_workarounds_init(i915, wal);
> > +	else if (IS_SKYLAKE(i915))
> > +		skl_gt_workarounds_init(i915, wal);
> > +	else if (IS_CHERRYVIEW(i915))
> > 		return;
> > 	else if (IS_BROADWELL(i915))
> > 		return;
> > -	else if (IS_CHERRYVIEW(i915))
> > +	else if (INTEL_GEN(i915) < 8)
> > 		return;
> > -	else if (IS_SKYLAKE(i915))
> > -		skl_gt_workarounds_init(i915, wal);
> > -	else if (IS_BROXTON(i915))
> > -		bxt_gt_workarounds_init(i915, wal);
> > -	else if (IS_KABYLAKE(i915))
> > -		kbl_gt_workarounds_init(i915, wal);
> > -	else if (IS_GEMINILAKE(i915))
> > -		glk_gt_workarounds_init(i915, wal);
> > -	else if (IS_COFFEELAKE(i915))
> > -		cfl_gt_workarounds_init(i915, wal);
> > -	else if (IS_CANNONLAKE(i915))
> > -		cnl_gt_workarounds_init(i915, wal);
> > -	else if (IS_ICELAKE(i915))
> > -		icl_gt_workarounds_init(i915, wal);
> > 	else
> > 		MISSING_CASE(INTEL_GEN(i915));
> > }
> > @@ -1063,26 +1063,26 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine)
> > 
> > 	wa_init_start(w, "whitelist");
> > 
> > -	if (INTEL_GEN(i915) < 8)
> > +	if (IS_ICELAKE(i915))
> > +		icl_whitelist_build(w);
> > +	else if (IS_CANNONLAKE(i915))
> > +		cnl_whitelist_build(w);
> > +	else if (IS_COFFEELAKE(i915))
> > +		cfl_whitelist_build(w);
> > +	else if (IS_GEMINILAKE(i915))
> > +		glk_whitelist_build(w);
> > +	else if (IS_KABYLAKE(i915))
> > +		kbl_whitelist_build(w);
> > +	else if (IS_BROXTON(i915))
> > +		bxt_whitelist_build(w);
> > +	else if (IS_SKYLAKE(i915))
> > +		skl_whitelist_build(w);
> > +	else if (IS_CHERRYVIEW(i915))
> > 		return;
> > 	else if (IS_BROADWELL(i915))
> > 		return;
> > -	else if (IS_CHERRYVIEW(i915))
> > +	else if (INTEL_GEN(i915) < 8)
> 
> make this INTEL_GEN(i915) <= 8) and remove IS_CHERRYVIEW() above?

accepted.
removing chv and bdw ;)
and I found another similar spot and removing as well...

> The meaning would be that "BROADWELL is the only gen8 that has this, the
> others and below => do nothing."
> 
> 
> I went through each of the if/else chains and did my best to manually
> verify them: I didn't find any bug. Comments above are basically
> nitpicks.  Your call if you are actually going to change them.
> 
> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>

Thanks,
Rodrigo.

> 
> 
> Lucas De Marchi
> 
> > 		return;
> > -	else if (IS_SKYLAKE(i915))
> > -		skl_whitelist_build(w);
> > -	else if (IS_BROXTON(i915))
> > -		bxt_whitelist_build(w);
> > -	else if (IS_KABYLAKE(i915))
> > -		kbl_whitelist_build(w);
> > -	else if (IS_GEMINILAKE(i915))
> > -		glk_whitelist_build(w);
> > -	else if (IS_COFFEELAKE(i915))
> > -		cfl_whitelist_build(w);
> > -	else if (IS_CANNONLAKE(i915))
> > -		cnl_whitelist_build(w);
> > -	else if (IS_ICELAKE(i915))
> > -		icl_whitelist_build(w);
> > 	else
> > 		MISSING_CASE(INTEL_GEN(i915));
> > 
> > -- 
> > 2.20.1
> > 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH] drm/i915: Yet another if/else sort of newer to older platforms.
  2019-02-28 23:19     ` Lucas De Marchi
  2019-03-01 17:24       ` Rodrigo Vivi
@ 2019-03-01 17:27       ` Rodrigo Vivi
  1 sibling, 0 replies; 12+ messages in thread
From: Rodrigo Vivi @ 2019-03-01 17:27 UTC (permalink / raw)
  To: intel-gfx; +Cc: Lucas De Marchi

No functional change. Just a reorg to match the preferred
behavior.

When rebasing internal branch on top of latest sort I noticed
few more cases that needs to get reordered.

Let's do in a bundle this time and hoping there's no other
missing places.

v2: Check for HSW/BDW ULT before generic IS_HASWELL or
    IS_BROADWELL or it doesn't work as pointed by Ville.
    But also ULT came afterwards anyway.
v3: Accepting suggestions from Lucas:
    Sort CNL/CFL, KBL/SKL, and use <= 8 removing chv and bdw.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c          | 20 ++++----
 drivers/gpu/drm/i915/i915_perf.c         | 50 +++++++++---------
 drivers/gpu/drm/i915/intel_cdclk.c       | 38 +++++++-------
 drivers/gpu/drm/i915/intel_workarounds.c | 64 +++++++++++-------------
 4 files changed, 82 insertions(+), 90 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c6354f6cdbdb..946212c9c5f9 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -219,20 +219,20 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv)
 	 * make an educated guess as to which PCH is really there.
 	 */
 
-	if (IS_GEN(dev_priv, 5))
-		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
-	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
-		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
+	if (IS_ICELAKE(dev_priv))
+		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
+	else if (IS_CANNONLAKE(dev_priv) || IS_COFFEELAKE(dev_priv))
+		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
+	else if (IS_KABYLAKE(dev_priv) || IS_SKYLAKE(dev_priv))
+		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
 	else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
 		id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
 	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
 		id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
-	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
-		id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
-	else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
-		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
-	else if (IS_ICELAKE(dev_priv))
-		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
+	else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
+		id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
+	else if (IS_GEN(dev_priv, 5))
+		id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
 
 	if (id)
 		DRM_DEBUG_KMS("Assuming PCH ID %04x\n", id);
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 9ebf99f3d8d3..72a9a35b40e2 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -2881,12 +2881,24 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
 
 	sysfs_attr_init(&dev_priv->perf.oa.test_config.sysfs_metric_id.attr);
 
-	if (IS_HASWELL(dev_priv)) {
-		i915_perf_load_test_config_hsw(dev_priv);
-	} else if (IS_BROADWELL(dev_priv)) {
-		i915_perf_load_test_config_bdw(dev_priv);
-	} else if (IS_CHERRYVIEW(dev_priv)) {
-		i915_perf_load_test_config_chv(dev_priv);
+	if (IS_ICELAKE(dev_priv)) {
+		i915_perf_load_test_config_icl(dev_priv);
+	} else if (IS_CANNONLAKE(dev_priv)) {
+		i915_perf_load_test_config_cnl(dev_priv);
+	} else if (IS_COFFEELAKE(dev_priv)) {
+		if (IS_CFL_GT2(dev_priv))
+			i915_perf_load_test_config_cflgt2(dev_priv);
+		if (IS_CFL_GT3(dev_priv))
+			i915_perf_load_test_config_cflgt3(dev_priv);
+	} else if (IS_GEMINILAKE(dev_priv)) {
+		i915_perf_load_test_config_glk(dev_priv);
+	} else if (IS_KABYLAKE(dev_priv)) {
+		if (IS_KBL_GT2(dev_priv))
+			i915_perf_load_test_config_kblgt2(dev_priv);
+		else if (IS_KBL_GT3(dev_priv))
+			i915_perf_load_test_config_kblgt3(dev_priv);
+	} else if (IS_BROXTON(dev_priv)) {
+		i915_perf_load_test_config_bxt(dev_priv);
 	} else if (IS_SKYLAKE(dev_priv)) {
 		if (IS_SKL_GT2(dev_priv))
 			i915_perf_load_test_config_sklgt2(dev_priv);
@@ -2894,25 +2906,13 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
 			i915_perf_load_test_config_sklgt3(dev_priv);
 		else if (IS_SKL_GT4(dev_priv))
 			i915_perf_load_test_config_sklgt4(dev_priv);
-	} else if (IS_BROXTON(dev_priv)) {
-		i915_perf_load_test_config_bxt(dev_priv);
-	} else if (IS_KABYLAKE(dev_priv)) {
-		if (IS_KBL_GT2(dev_priv))
-			i915_perf_load_test_config_kblgt2(dev_priv);
-		else if (IS_KBL_GT3(dev_priv))
-			i915_perf_load_test_config_kblgt3(dev_priv);
-	} else if (IS_GEMINILAKE(dev_priv)) {
-		i915_perf_load_test_config_glk(dev_priv);
-	} else if (IS_COFFEELAKE(dev_priv)) {
-		if (IS_CFL_GT2(dev_priv))
-			i915_perf_load_test_config_cflgt2(dev_priv);
-		if (IS_CFL_GT3(dev_priv))
-			i915_perf_load_test_config_cflgt3(dev_priv);
-	} else if (IS_CANNONLAKE(dev_priv)) {
-		i915_perf_load_test_config_cnl(dev_priv);
-	} else if (IS_ICELAKE(dev_priv)) {
-		i915_perf_load_test_config_icl(dev_priv);
-	}
+	} else if (IS_CHERRYVIEW(dev_priv)) {
+		i915_perf_load_test_config_chv(dev_priv);
+	} else if (IS_BROADWELL(dev_priv)) {
+		i915_perf_load_test_config_bdw(dev_priv);
+	} else if (IS_HASWELL(dev_priv)) {
+		i915_perf_load_test_config_hsw(dev_priv);
+}
 
 	if (dev_priv->perf.oa.test_config.id == 0)
 		goto sysfs_error;
diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c
index 26e01a8465af..5d266538036d 100644
--- a/drivers/gpu/drm/i915/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/intel_cdclk.c
@@ -2744,18 +2744,13 @@ void intel_update_rawclk(struct drm_i915_private *dev_priv)
  */
 void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
 {
-	if (IS_CHERRYVIEW(dev_priv)) {
-		dev_priv->display.set_cdclk = chv_set_cdclk;
-		dev_priv->display.modeset_calc_cdclk =
-			vlv_modeset_calc_cdclk;
-	} else if (IS_VALLEYVIEW(dev_priv)) {
-		dev_priv->display.set_cdclk = vlv_set_cdclk;
-		dev_priv->display.modeset_calc_cdclk =
-			vlv_modeset_calc_cdclk;
-	} else if (IS_BROADWELL(dev_priv)) {
-		dev_priv->display.set_cdclk = bdw_set_cdclk;
+	if (IS_ICELAKE(dev_priv)) {
+		dev_priv->display.set_cdclk = icl_set_cdclk;
+		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
+	} else if (IS_CANNONLAKE(dev_priv)) {
+		dev_priv->display.set_cdclk = cnl_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
-			bdw_modeset_calc_cdclk;
+			cnl_modeset_calc_cdclk;
 	} else if (IS_GEN9_LP(dev_priv)) {
 		dev_priv->display.set_cdclk = bxt_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
@@ -2764,23 +2759,28 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
 		dev_priv->display.set_cdclk = skl_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
 			skl_modeset_calc_cdclk;
-	} else if (IS_CANNONLAKE(dev_priv)) {
-		dev_priv->display.set_cdclk = cnl_set_cdclk;
+	} else if (IS_BROADWELL(dev_priv)) {
+		dev_priv->display.set_cdclk = bdw_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
-			cnl_modeset_calc_cdclk;
-	} else if (IS_ICELAKE(dev_priv)) {
-		dev_priv->display.set_cdclk = icl_set_cdclk;
-		dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
+			bdw_modeset_calc_cdclk;
+	} else if (IS_CHERRYVIEW(dev_priv)) {
+		dev_priv->display.set_cdclk = chv_set_cdclk;
+		dev_priv->display.modeset_calc_cdclk =
+			vlv_modeset_calc_cdclk;
+	} else if (IS_VALLEYVIEW(dev_priv)) {
+		dev_priv->display.set_cdclk = vlv_set_cdclk;
+		dev_priv->display.modeset_calc_cdclk =
+			vlv_modeset_calc_cdclk;
 	}
 
 	if (IS_ICELAKE(dev_priv))
 		dev_priv->display.get_cdclk = icl_get_cdclk;
 	else if (IS_CANNONLAKE(dev_priv))
 		dev_priv->display.get_cdclk = cnl_get_cdclk;
-	else if (IS_GEN9_BC(dev_priv))
-		dev_priv->display.get_cdclk = skl_get_cdclk;
 	else if (IS_GEN9_LP(dev_priv))
 		dev_priv->display.get_cdclk = bxt_get_cdclk;
+	else if (IS_GEN9_BC(dev_priv))
+		dev_priv->display.get_cdclk = skl_get_cdclk;
 	else if (IS_BROADWELL(dev_priv))
 		dev_priv->display.get_cdclk = bdw_get_cdclk;
 	else if (IS_HASWELL(dev_priv))
diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
index 743cf5b00155..89b4007d5200 100644
--- a/drivers/gpu/drm/i915/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/intel_workarounds.c
@@ -862,26 +862,22 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
 static void
 gt_init_workarounds(struct drm_i915_private *i915, struct i915_wa_list *wal)
 {
-	if (INTEL_GEN(i915) < 8)
-		return;
-	else if (IS_BROADWELL(i915))
-		return;
-	else if (IS_CHERRYVIEW(i915))
-		return;
-	else if (IS_SKYLAKE(i915))
-		skl_gt_workarounds_init(i915, wal);
-	else if (IS_BROXTON(i915))
-		bxt_gt_workarounds_init(i915, wal);
-	else if (IS_KABYLAKE(i915))
-		kbl_gt_workarounds_init(i915, wal);
-	else if (IS_GEMINILAKE(i915))
-		glk_gt_workarounds_init(i915, wal);
-	else if (IS_COFFEELAKE(i915))
-		cfl_gt_workarounds_init(i915, wal);
+	if (IS_ICELAKE(i915))
+		icl_gt_workarounds_init(i915, wal);
 	else if (IS_CANNONLAKE(i915))
 		cnl_gt_workarounds_init(i915, wal);
-	else if (IS_ICELAKE(i915))
-		icl_gt_workarounds_init(i915, wal);
+	else if (IS_COFFEELAKE(i915))
+		cfl_gt_workarounds_init(i915, wal);
+	else if (IS_GEMINILAKE(i915))
+		glk_gt_workarounds_init(i915, wal);
+	else if (IS_KABYLAKE(i915))
+		kbl_gt_workarounds_init(i915, wal);
+	else if (IS_BROXTON(i915))
+		bxt_gt_workarounds_init(i915, wal);
+	else if (IS_SKYLAKE(i915))
+		skl_gt_workarounds_init(i915, wal);
+	else if (INTEL_GEN(i915) <= 8)
+		return;
 	else
 		MISSING_CASE(INTEL_GEN(i915));
 }
@@ -1063,26 +1059,22 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine)
 
 	wa_init_start(w, "whitelist");
 
-	if (INTEL_GEN(i915) < 8)
-		return;
-	else if (IS_BROADWELL(i915))
-		return;
-	else if (IS_CHERRYVIEW(i915))
-		return;
-	else if (IS_SKYLAKE(i915))
-		skl_whitelist_build(w);
-	else if (IS_BROXTON(i915))
-		bxt_whitelist_build(w);
-	else if (IS_KABYLAKE(i915))
-		kbl_whitelist_build(w);
-	else if (IS_GEMINILAKE(i915))
-		glk_whitelist_build(w);
-	else if (IS_COFFEELAKE(i915))
-		cfl_whitelist_build(w);
+	if (IS_ICELAKE(i915))
+		icl_whitelist_build(w);
 	else if (IS_CANNONLAKE(i915))
 		cnl_whitelist_build(w);
-	else if (IS_ICELAKE(i915))
-		icl_whitelist_build(w);
+	else if (IS_COFFEELAKE(i915))
+		cfl_whitelist_build(w);
+	else if (IS_GEMINILAKE(i915))
+		glk_whitelist_build(w);
+	else if (IS_KABYLAKE(i915))
+		kbl_whitelist_build(w);
+	else if (IS_BROXTON(i915))
+		bxt_whitelist_build(w);
+	else if (IS_SKYLAKE(i915))
+		skl_whitelist_build(w);
+	else if (INTEL_GEN(i915) <= 8)
+		return;
 	else
 		MISSING_CASE(INTEL_GEN(i915));
 
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Yet another if/else sort of newer to older platforms. (rev3)
  2019-02-22 22:11 [PATCH] drm/i915: Yet another if/else sort of newer to older platforms Rodrigo Vivi
                   ` (3 preceding siblings ...)
  2019-02-26  4:44 ` ✓ Fi.CI.IGT: " Patchwork
@ 2019-03-01 18:46 ` Patchwork
  2019-03-02  1:09 ` ✓ Fi.CI.IGT: " Patchwork
  5 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-03-01 18:46 UTC (permalink / raw)
  To: Rodrigo Vivi; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Yet another if/else sort of newer to older platforms. (rev3)
URL   : https://patchwork.freedesktop.org/series/57112/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5679 -> Patchwork_12348
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/57112/revisions/3/mbox/

Known issues
------------

  Here are the changes found in Patchwork_12348 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_ctx_create@basic-files:
    - fi-kbl-7560u:       PASS -> INCOMPLETE [fdo#103665]

  * igt@gem_exec_basic@readonly-bsd2:
    - fi-pnv-d510:        NOTRUN -> SKIP [fdo#109271] +76

  * igt@kms_busy@basic-flip-c:
    - fi-pnv-d510:        NOTRUN -> SKIP [fdo#109271] / [fdo#109278]

  
#### Possible fixes ####

  * igt@i915_pm_rpm@basic-pci-d3-state:
    - fi-hsw-4770:        SKIP [fdo#109271] -> PASS +4

  * igt@kms_busy@basic-flip-a:
    - fi-kbl-7567u:       SKIP [fdo#109271] / [fdo#109278] -> PASS +2

  
  [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278


Participating hosts (42 -> 39)
------------------------------

  Additional (1): fi-pnv-d510 
  Missing    (4): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u 


Build changes
-------------

    * Linux: CI_DRM_5679 -> Patchwork_12348

  CI_DRM_5679: e533152feeb49f1dc4e689a37c415a997e5d094b @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4866: 189956af183c245eb237b3be4fa22953ec93bbe0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_12348: 63d3527df83a02100affd17e78cb1690c21b71aa @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

63d3527df83a drm/i915: Yet another if/else sort of newer to older platforms.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12348/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Yet another if/else sort of newer to older platforms. (rev3)
  2019-02-22 22:11 [PATCH] drm/i915: Yet another if/else sort of newer to older platforms Rodrigo Vivi
                   ` (4 preceding siblings ...)
  2019-03-01 18:46 ` ✓ Fi.CI.BAT: success for drm/i915: Yet another if/else sort of newer to older platforms. (rev3) Patchwork
@ 2019-03-02  1:09 ` Patchwork
  5 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-03-02  1:09 UTC (permalink / raw)
  To: Rodrigo Vivi; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Yet another if/else sort of newer to older platforms. (rev3)
URL   : https://patchwork.freedesktop.org/series/57112/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5679_full -> Patchwork_12348_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  

Known issues
------------

  Here are the changes found in Patchwork_12348_full that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_busy@extended-semaphore-render:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109275]

  * igt@gem_ctx_isolation@rcs0-dirty-create:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109281] +3

  * igt@gem_ctx_param@invalid-param-set:
    - shard-skl:          NOTRUN -> FAIL [fdo#109674]

  * igt@gem_exec_params@no-bsd:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109283]

  * igt@gem_exec_schedule@preempt-other-chain-bsd2:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109276] +8

  * igt@gem_mocs_settings@mocs-rc6-bsd1:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109276] / [fdo#109287]

  * igt@gem_mocs_settings@mocs-settings-vebox:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109287] +2

  * igt@gem_pwrite@big-cpu-fbr:
    - shard-skl:          NOTRUN -> SKIP [fdo#109271] +177

  * igt@gem_pwrite@huge-gtt-forwards:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109290]

  * igt@gem_stolen@stolen-pread:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109277] +2

  * igt@i915_missed_irq:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109503]

  * igt@i915_pm_rpm@dpms-mode-unset-lpsp:
    - shard-iclb:         PASS -> INCOMPLETE [fdo#107713] / [fdo#108840]

  * igt@i915_pm_rpm@legacy-planes:
    - shard-skl:          NOTRUN -> INCOMPLETE [fdo#107807] +1

  * igt@i915_pm_rpm@modeset-lpsp-stress:
    - shard-iclb:         PASS -> DMESG-WARN [fdo#107724] +3

  * igt@i915_pm_rpm@modeset-stress-extra-wait:
    - shard-skl:          PASS -> INCOMPLETE [fdo#107807]

  * igt@i915_selftest@live_workarounds:
    - shard-iclb:         PASS -> DMESG-FAIL [fdo#108954]

  * igt@kms_atomic_transition@5x-modeset-transitions:
    - shard-skl:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +15

  * igt@kms_busy@extended-modeset-hang-newfb-render-a:
    - shard-skl:          NOTRUN -> DMESG-WARN [fdo#107956] +3

  * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
    - shard-apl:          NOTRUN -> DMESG-WARN [fdo#107956]

  * igt@kms_busy@extended-modeset-hang-oldfb-render-f:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109278] +2

  * igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
    - shard-apl:          PASS -> FAIL [fdo#106510] / [fdo#108145]

  * igt@kms_chamelium@vga-edid-read:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109284] +3

  * igt@kms_color@pipe-b-legacy-gamma:
    - shard-iclb:         NOTRUN -> FAIL [fdo#104782]

  * igt@kms_color@pipe-c-ctm-max:
    - shard-skl:          PASS -> FAIL [fdo#108147]

  * igt@kms_cursor_crc@cursor-256x256-onscreen:
    - shard-apl:          PASS -> FAIL [fdo#103232]

  * igt@kms_cursor_crc@cursor-512x512-dpms:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109279]

  * igt@kms_cursor_crc@cursor-64x21-onscreen:
    - shard-iclb:         NOTRUN -> FAIL [fdo#103232] +1

  * igt@kms_draw_crc@draw-method-xrgb8888-mmap-gtt-untiled:
    - shard-skl:          PASS -> FAIL [fdo#108472]

  * igt@kms_flip@2x-nonexisting-fb:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109274] +8

  * igt@kms_flip@flip-vs-expired-vblank:
    - shard-glk:          PASS -> FAIL [fdo#105363]

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
    - shard-apl:          PASS -> FAIL [fdo#103167]

  * igt@kms_frontbuffer_tracking@fbc-badstride:
    - shard-skl:          PASS -> FAIL [fdo#105682] +2

  * igt@kms_frontbuffer_tracking@fbc-stridechange:
    - shard-skl:          NOTRUN -> FAIL [fdo#105683]

  * igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-draw-mmap-cpu:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109280] +16

  * igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-mmap-wc:
    - shard-skl:          PASS -> FAIL [fdo#103167] +1

  * igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-fullscreen:
    - shard-iclb:         PASS -> FAIL [fdo#103167] +2

  * igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence:
    - shard-skl:          PASS -> FAIL [fdo#103191] / [fdo#107362]

  * igt@kms_plane@pixel-format-pipe-a-planes-source-clamping:
    - shard-skl:          NOTRUN -> DMESG-WARN [fdo#106885]

  * igt@kms_plane_alpha_blend@pipe-b-alpha-7efc:
    - shard-apl:          NOTRUN -> FAIL [fdo#108145]

  * igt@kms_plane_alpha_blend@pipe-b-alpha-transparant-fb:
    - shard-skl:          NOTRUN -> FAIL [fdo#108145] +4

  * igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
    - shard-skl:          NOTRUN -> FAIL [fdo#107815] / [fdo#108145] +1

  * igt@kms_plane_multiple@atomic-pipe-c-tiling-y:
    - shard-apl:          PASS -> FAIL [fdo#103166] +1
    - shard-iclb:         PASS -> FAIL [fdo#103166]

  * igt@kms_plane_scaling@pipe-a-scaler-with-pixel-format:
    - shard-iclb:         NOTRUN -> DMESG-WARN [fdo#107724] +1

  * igt@kms_psr@no_drrs:
    - shard-iclb:         PASS -> FAIL [fdo#108341]

  * igt@kms_psr@primary_mmap_cpu:
    - shard-apl:          NOTRUN -> SKIP [fdo#109271] +9

  * igt@kms_psr@psr2_dpms:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109441]

  * igt@kms_rotation_crc@multiplane-rotation-cropping-top:
    - shard-kbl:          PASS -> FAIL [fdo#109016]

  * igt@kms_sysfs_edid_timing:
    - shard-iclb:         NOTRUN -> FAIL [fdo#100047]

  * igt@prime_nv_test@i915_nv_sharing:
    - shard-iclb:         NOTRUN -> SKIP [fdo#109291] +2

  
#### Possible fixes ####

  * igt@gem_fence_thrash@bo-copy:
    - shard-apl:          INCOMPLETE [fdo#103927] -> PASS +1

  * igt@i915_pm_rpm@dpms-lpsp:
    - shard-iclb:         DMESG-WARN [fdo#107724] -> PASS +7

  * igt@i915_pm_rpm@legacy-planes:
    - shard-iclb:         DMESG-WARN [fdo#108654] -> PASS

  * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
    - shard-kbl:          DMESG-WARN [fdo#107956] -> PASS

  * igt@kms_color@pipe-b-degamma:
    - shard-apl:          FAIL [fdo#104782] -> PASS

  * igt@kms_cursor_crc@cursor-128x42-sliding:
    - shard-apl:          FAIL [fdo#103232] -> PASS +1

  * igt@kms_flip@flip-vs-suspend:
    - shard-skl:          INCOMPLETE [fdo#107773] / [fdo#109507] -> PASS

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
    - shard-apl:          FAIL [fdo#103167] -> PASS +2

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
    - shard-iclb:         FAIL [fdo#103167] -> PASS +3
    - shard-glk:          FAIL [fdo#103167] -> PASS

  * igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
    - shard-apl:          FAIL [fdo#103166] -> PASS +1

  * igt@kms_plane_multiple@atomic-pipe-c-tiling-none:
    - shard-glk:          FAIL [fdo#103166] -> PASS

  * igt@kms_setmode@basic:
    - shard-apl:          FAIL [fdo#99912] -> PASS

  * igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
    - shard-iclb:         INCOMPLETE [fdo#107713] -> PASS

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047
  [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
  [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
  [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
  [fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
  [fdo#105683]: https://bugs.freedesktop.org/show_bug.cgi?id=105683
  [fdo#106510]: https://bugs.freedesktop.org/show_bug.cgi?id=106510
  [fdo#106885]: https://bugs.freedesktop.org/show_bug.cgi?id=106885
  [fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
  [fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
  [fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
  [fdo#107815]: https://bugs.freedesktop.org/show_bug.cgi?id=107815
  [fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
  [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
  [fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
  [fdo#108341]: https://bugs.freedesktop.org/show_bug.cgi?id=108341
  [fdo#108472]: https://bugs.freedesktop.org/show_bug.cgi?id=108472
  [fdo#108654]: https://bugs.freedesktop.org/show_bug.cgi?id=108654
  [fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
  [fdo#108954]: https://bugs.freedesktop.org/show_bug.cgi?id=108954
  [fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
  [fdo#109275]: https://bugs.freedesktop.org/show_bug.cgi?id=109275
  [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
  [fdo#109277]: https://bugs.freedesktop.org/show_bug.cgi?id=109277
  [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
  [fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
  [fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
  [fdo#109281]: https://bugs.freedesktop.org/show_bug.cgi?id=109281
  [fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
  [fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
  [fdo#109287]: https://bugs.freedesktop.org/show_bug.cgi?id=109287
  [fdo#109290]: https://bugs.freedesktop.org/show_bug.cgi?id=109290
  [fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
  [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
  [fdo#109503]: https://bugs.freedesktop.org/show_bug.cgi?id=109503
  [fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
  [fdo#109674]: https://bugs.freedesktop.org/show_bug.cgi?id=109674
  [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912


Participating hosts (7 -> 7)
------------------------------

  No changes in participating hosts


Build changes
-------------

    * Linux: CI_DRM_5679 -> Patchwork_12348

  CI_DRM_5679: e533152feeb49f1dc4e689a37c415a997e5d094b @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4866: 189956af183c245eb237b3be4fa22953ec93bbe0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_12348: 63d3527df83a02100affd17e78cb1690c21b71aa @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12348/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-03-02  1:09 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-22 22:11 [PATCH] drm/i915: Yet another if/else sort of newer to older platforms Rodrigo Vivi
2019-02-22 22:59 ` ✗ Fi.CI.BAT: failure for " Patchwork
2019-02-25 16:32 ` [PATCH] " Ville Syrjälä
2019-02-25 19:08   ` Rodrigo Vivi
2019-02-25 19:11   ` Rodrigo Vivi
2019-02-28 23:19     ` Lucas De Marchi
2019-03-01 17:24       ` Rodrigo Vivi
2019-03-01 17:27       ` Rodrigo Vivi
2019-02-25 19:58 ` ✓ Fi.CI.BAT: success for drm/i915: Yet another if/else sort of newer to older platforms. (rev2) Patchwork
2019-02-26  4:44 ` ✓ Fi.CI.IGT: " Patchwork
2019-03-01 18:46 ` ✓ Fi.CI.BAT: success for drm/i915: Yet another if/else sort of newer to older platforms. (rev3) Patchwork
2019-03-02  1:09 ` ✓ Fi.CI.IGT: " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.