Skip to content

Commit 993298a

Browse files
rodrigovivirodrigovivi
committed
drm/i915: Yet another if/else sort of newer to older platforms.
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> Link: https://patchwork.freedesktop.org/patch/msgid/20190301172703.12139-1-rodrigo.vivi@intel.com
1 parent e781a7a commit 993298a

File tree

4 files changed

+82
-90
lines changed

4 files changed

+82
-90
lines changed

‎drivers/gpu/drm/i915/i915_drv.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -219,20 +219,20 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv)
219219
* make an educated guess as to which PCH is really there.
220220
*/
221221

222-
if (IS_GEN(dev_priv, 5))
223-
id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
224-
else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
225-
id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
222+
if (IS_ICELAKE(dev_priv))
223+
id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
224+
else if (IS_CANNONLAKE(dev_priv) || IS_COFFEELAKE(dev_priv))
225+
id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
226+
else if (IS_KABYLAKE(dev_priv) || IS_SKYLAKE(dev_priv))
227+
id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
226228
else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
227229
id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
228230
else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
229231
id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
230-
else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
231-
id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
232-
else if (IS_COFFEELAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
233-
id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
234-
else if (IS_ICELAKE(dev_priv))
235-
id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
232+
else if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
233+
id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
234+
else if (IS_GEN(dev_priv, 5))
235+
id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
236236

237237
if (id)
238238
DRM_DEBUG_KMS("Assuming PCH ID %04x\n", id);

‎drivers/gpu/drm/i915/i915_perf.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,38 +2881,38 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
28812881

28822882
sysfs_attr_init(&dev_priv->perf.oa.test_config.sysfs_metric_id.attr);
28832883

2884-
if (IS_HASWELL(dev_priv)) {
2885-
i915_perf_load_test_config_hsw(dev_priv);
2886-
} else if (IS_BROADWELL(dev_priv)) {
2887-
i915_perf_load_test_config_bdw(dev_priv);
2888-
} else if (IS_CHERRYVIEW(dev_priv)) {
2889-
i915_perf_load_test_config_chv(dev_priv);
2884+
if (IS_ICELAKE(dev_priv)) {
2885+
i915_perf_load_test_config_icl(dev_priv);
2886+
} else if (IS_CANNONLAKE(dev_priv)) {
2887+
i915_perf_load_test_config_cnl(dev_priv);
2888+
} else if (IS_COFFEELAKE(dev_priv)) {
2889+
if (IS_CFL_GT2(dev_priv))
2890+
i915_perf_load_test_config_cflgt2(dev_priv);
2891+
if (IS_CFL_GT3(dev_priv))
2892+
i915_perf_load_test_config_cflgt3(dev_priv);
2893+
} else if (IS_GEMINILAKE(dev_priv)) {
2894+
i915_perf_load_test_config_glk(dev_priv);
2895+
} else if (IS_KABYLAKE(dev_priv)) {
2896+
if (IS_KBL_GT2(dev_priv))
2897+
i915_perf_load_test_config_kblgt2(dev_priv);
2898+
else if (IS_KBL_GT3(dev_priv))
2899+
i915_perf_load_test_config_kblgt3(dev_priv);
2900+
} else if (IS_BROXTON(dev_priv)) {
2901+
i915_perf_load_test_config_bxt(dev_priv);
28902902
} else if (IS_SKYLAKE(dev_priv)) {
28912903
if (IS_SKL_GT2(dev_priv))
28922904
i915_perf_load_test_config_sklgt2(dev_priv);
28932905
else if (IS_SKL_GT3(dev_priv))
28942906
i915_perf_load_test_config_sklgt3(dev_priv);
28952907
else if (IS_SKL_GT4(dev_priv))
28962908
i915_perf_load_test_config_sklgt4(dev_priv);
2897-
} else if (IS_BROXTON(dev_priv)) {
2898-
i915_perf_load_test_config_bxt(dev_priv);
2899-
} else if (IS_KABYLAKE(dev_priv)) {
2900-
if (IS_KBL_GT2(dev_priv))
2901-
i915_perf_load_test_config_kblgt2(dev_priv);
2902-
else if (IS_KBL_GT3(dev_priv))
2903-
i915_perf_load_test_config_kblgt3(dev_priv);
2904-
} else if (IS_GEMINILAKE(dev_priv)) {
2905-
i915_perf_load_test_config_glk(dev_priv);
2906-
} else if (IS_COFFEELAKE(dev_priv)) {
2907-
if (IS_CFL_GT2(dev_priv))
2908-
i915_perf_load_test_config_cflgt2(dev_priv);
2909-
if (IS_CFL_GT3(dev_priv))
2910-
i915_perf_load_test_config_cflgt3(dev_priv);
2911-
} else if (IS_CANNONLAKE(dev_priv)) {
2912-
i915_perf_load_test_config_cnl(dev_priv);
2913-
} else if (IS_ICELAKE(dev_priv)) {
2914-
i915_perf_load_test_config_icl(dev_priv);
2915-
}
2909+
} else if (IS_CHERRYVIEW(dev_priv)) {
2910+
i915_perf_load_test_config_chv(dev_priv);
2911+
} else if (IS_BROADWELL(dev_priv)) {
2912+
i915_perf_load_test_config_bdw(dev_priv);
2913+
} else if (IS_HASWELL(dev_priv)) {
2914+
i915_perf_load_test_config_hsw(dev_priv);
2915+
}
29162916

29172917
if (dev_priv->perf.oa.test_config.id == 0)
29182918
goto sysfs_error;

‎drivers/gpu/drm/i915/intel_cdclk.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2744,18 +2744,13 @@ void intel_update_rawclk(struct drm_i915_private *dev_priv)
27442744
*/
27452745
void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
27462746
{
2747-
if (IS_CHERRYVIEW(dev_priv)) {
2748-
dev_priv->display.set_cdclk = chv_set_cdclk;
2749-
dev_priv->display.modeset_calc_cdclk =
2750-
vlv_modeset_calc_cdclk;
2751-
} else if (IS_VALLEYVIEW(dev_priv)) {
2752-
dev_priv->display.set_cdclk = vlv_set_cdclk;
2753-
dev_priv->display.modeset_calc_cdclk =
2754-
vlv_modeset_calc_cdclk;
2755-
} else if (IS_BROADWELL(dev_priv)) {
2756-
dev_priv->display.set_cdclk = bdw_set_cdclk;
2747+
if (IS_ICELAKE(dev_priv)) {
2748+
dev_priv->display.set_cdclk = icl_set_cdclk;
2749+
dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
2750+
} else if (IS_CANNONLAKE(dev_priv)) {
2751+
dev_priv->display.set_cdclk = cnl_set_cdclk;
27572752
dev_priv->display.modeset_calc_cdclk =
2758-
bdw_modeset_calc_cdclk;
2753+
cnl_modeset_calc_cdclk;
27592754
} else if (IS_GEN9_LP(dev_priv)) {
27602755
dev_priv->display.set_cdclk = bxt_set_cdclk;
27612756
dev_priv->display.modeset_calc_cdclk =
@@ -2764,23 +2759,28 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
27642759
dev_priv->display.set_cdclk = skl_set_cdclk;
27652760
dev_priv->display.modeset_calc_cdclk =
27662761
skl_modeset_calc_cdclk;
2767-
} else if (IS_CANNONLAKE(dev_priv)) {
2768-
dev_priv->display.set_cdclk = cnl_set_cdclk;
2762+
} else if (IS_BROADWELL(dev_priv)) {
2763+
dev_priv->display.set_cdclk = bdw_set_cdclk;
27692764
dev_priv->display.modeset_calc_cdclk =
2770-
cnl_modeset_calc_cdclk;
2771-
} else if (IS_ICELAKE(dev_priv)) {
2772-
dev_priv->display.set_cdclk = icl_set_cdclk;
2773-
dev_priv->display.modeset_calc_cdclk = icl_modeset_calc_cdclk;
2765+
bdw_modeset_calc_cdclk;
2766+
} else if (IS_CHERRYVIEW(dev_priv)) {
2767+
dev_priv->display.set_cdclk = chv_set_cdclk;
2768+
dev_priv->display.modeset_calc_cdclk =
2769+
vlv_modeset_calc_cdclk;
2770+
} else if (IS_VALLEYVIEW(dev_priv)) {
2771+
dev_priv->display.set_cdclk = vlv_set_cdclk;
2772+
dev_priv->display.modeset_calc_cdclk =
2773+
vlv_modeset_calc_cdclk;
27742774
}
27752775

27762776
if (IS_ICELAKE(dev_priv))
27772777
dev_priv->display.get_cdclk = icl_get_cdclk;
27782778
else if (IS_CANNONLAKE(dev_priv))
27792779
dev_priv->display.get_cdclk = cnl_get_cdclk;
2780-
else if (IS_GEN9_BC(dev_priv))
2781-
dev_priv->display.get_cdclk = skl_get_cdclk;
27822780
else if (IS_GEN9_LP(dev_priv))
27832781
dev_priv->display.get_cdclk = bxt_get_cdclk;
2782+
else if (IS_GEN9_BC(dev_priv))
2783+
dev_priv->display.get_cdclk = skl_get_cdclk;
27842784
else if (IS_BROADWELL(dev_priv))
27852785
dev_priv->display.get_cdclk = bdw_get_cdclk;
27862786
else if (IS_HASWELL(dev_priv))

‎drivers/gpu/drm/i915/intel_workarounds.c

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -862,26 +862,22 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
862862
static void
863863
gt_init_workarounds(struct drm_i915_private *i915, struct i915_wa_list *wal)
864864
{
865-
if (INTEL_GEN(i915) < 8)
866-
return;
867-
else if (IS_BROADWELL(i915))
868-
return;
869-
else if (IS_CHERRYVIEW(i915))
870-
return;
871-
else if (IS_SKYLAKE(i915))
872-
skl_gt_workarounds_init(i915, wal);
873-
else if (IS_BROXTON(i915))
874-
bxt_gt_workarounds_init(i915, wal);
875-
else if (IS_KABYLAKE(i915))
876-
kbl_gt_workarounds_init(i915, wal);
877-
else if (IS_GEMINILAKE(i915))
878-
glk_gt_workarounds_init(i915, wal);
879-
else if (IS_COFFEELAKE(i915))
880-
cfl_gt_workarounds_init(i915, wal);
865+
if (IS_ICELAKE(i915))
866+
icl_gt_workarounds_init(i915, wal);
881867
else if (IS_CANNONLAKE(i915))
882868
cnl_gt_workarounds_init(i915, wal);
883-
else if (IS_ICELAKE(i915))
884-
icl_gt_workarounds_init(i915, wal);
869+
else if (IS_COFFEELAKE(i915))
870+
cfl_gt_workarounds_init(i915, wal);
871+
else if (IS_GEMINILAKE(i915))
872+
glk_gt_workarounds_init(i915, wal);
873+
else if (IS_KABYLAKE(i915))
874+
kbl_gt_workarounds_init(i915, wal);
875+
else if (IS_BROXTON(i915))
876+
bxt_gt_workarounds_init(i915, wal);
877+
else if (IS_SKYLAKE(i915))
878+
skl_gt_workarounds_init(i915, wal);
879+
else if (INTEL_GEN(i915) <= 8)
880+
return;
885881
else
886882
MISSING_CASE(INTEL_GEN(i915));
887883
}
@@ -1063,26 +1059,22 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine)
10631059

10641060
wa_init_start(w, "whitelist");
10651061

1066-
if (INTEL_GEN(i915) < 8)
1067-
return;
1068-
else if (IS_BROADWELL(i915))
1069-
return;
1070-
else if (IS_CHERRYVIEW(i915))
1071-
return;
1072-
else if (IS_SKYLAKE(i915))
1073-
skl_whitelist_build(w);
1074-
else if (IS_BROXTON(i915))
1075-
bxt_whitelist_build(w);
1076-
else if (IS_KABYLAKE(i915))
1077-
kbl_whitelist_build(w);
1078-
else if (IS_GEMINILAKE(i915))
1079-
glk_whitelist_build(w);
1080-
else if (IS_COFFEELAKE(i915))
1081-
cfl_whitelist_build(w);
1062+
if (IS_ICELAKE(i915))
1063+
icl_whitelist_build(w);
10821064
else if (IS_CANNONLAKE(i915))
10831065
cnl_whitelist_build(w);
1084-
else if (IS_ICELAKE(i915))
1085-
icl_whitelist_build(w);
1066+
else if (IS_COFFEELAKE(i915))
1067+
cfl_whitelist_build(w);
1068+
else if (IS_GEMINILAKE(i915))
1069+
glk_whitelist_build(w);
1070+
else if (IS_KABYLAKE(i915))
1071+
kbl_whitelist_build(w);
1072+
else if (IS_BROXTON(i915))
1073+
bxt_whitelist_build(w);
1074+
else if (IS_SKYLAKE(i915))
1075+
skl_whitelist_build(w);
1076+
else if (INTEL_GEN(i915) <= 8)
1077+
return;
10861078
else
10871079
MISSING_CASE(INTEL_GEN(i915));
10881080

0 commit comments

Comments
 (0)