* [PATCH 2/5] drm/i915: compute_min_voltage_level sort platforms newer-to-older
2018-10-22 17:15 [PATCH 1/5] drm/i915: ddi_clock_get sort platforms newer-to-older Rodrigo Vivi
@ 2018-10-22 17:15 ` Rodrigo Vivi
2018-10-22 17:15 ` [PATCH 3/5] drm/i915: digital_port_connected " Rodrigo Vivi
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Rodrigo Vivi @ 2018-10-22 17:15 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula, Rodrigo Vivi
No functional change.
Just sorting this "if" block from newer to older platform.
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_ddi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index e4f8e738c47b..e40a8c97d34b 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -3373,10 +3373,10 @@ static bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv,
struct intel_crtc_state *crtc_state)
{
- if (IS_CANNONLAKE(dev_priv) && crtc_state->port_clock > 594000)
- crtc_state->min_voltage_level = 2;
- else if (IS_ICELAKE(dev_priv) && crtc_state->port_clock > 594000)
+ if (IS_ICELAKE(dev_priv) && crtc_state->port_clock > 594000)
crtc_state->min_voltage_level = 1;
+ else if (IS_CANNONLAKE(dev_priv) && crtc_state->port_clock > 594000)
+ crtc_state->min_voltage_level = 2;
}
void intel_ddi_get_config(struct intel_encoder *encoder,
--
2.19.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/5] drm/i915: digital_port_connected sort platforms newer-to-older
2018-10-22 17:15 [PATCH 1/5] drm/i915: ddi_clock_get sort platforms newer-to-older Rodrigo Vivi
2018-10-22 17:15 ` [PATCH 2/5] drm/i915: compute_min_voltage_level " Rodrigo Vivi
@ 2018-10-22 17:15 ` Rodrigo Vivi
2018-10-22 17:15 ` [PATCH 4/5] drm/i915: power_domains_init " Rodrigo Vivi
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Rodrigo Vivi @ 2018-10-22 17:15 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula, Rodrigo Vivi
Just sorting this "if" block from newer to older platform.
The main difference here is the addition of a
missing case with return false that should never occur.
And if it occurs it is better than to raise a warn
than use the icl one.
The gen >= 11 was already present in the previous logic,
although hidden.
So, in summary no real functional change.
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_dp.c | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 3384a9bbdafd..8c38efef77a1 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5035,20 +5035,23 @@ bool intel_digital_port_connected(struct intel_encoder *encoder)
return g4x_digital_port_connected(encoder);
}
- if (IS_GEN5(dev_priv))
- return ilk_digital_port_connected(encoder);
- else if (IS_GEN6(dev_priv))
- return snb_digital_port_connected(encoder);
- else if (IS_GEN7(dev_priv))
- return ivb_digital_port_connected(encoder);
- else if (IS_GEN8(dev_priv))
- return bdw_digital_port_connected(encoder);
+ if (INTEL_GEN(dev_priv) >= 11)
+ return icl_digital_port_connected(encoder);
+ else if (IS_GEN10(dev_priv) || IS_GEN9_BC(dev_priv))
+ return spt_digital_port_connected(encoder);
else if (IS_GEN9_LP(dev_priv))
return bxt_digital_port_connected(encoder);
- else if (IS_GEN9_BC(dev_priv) || IS_GEN10(dev_priv))
- return spt_digital_port_connected(encoder);
- else
- return icl_digital_port_connected(encoder);
+ else if (IS_GEN8(dev_priv))
+ return bdw_digital_port_connected(encoder);
+ else if (IS_GEN7(dev_priv))
+ return ivb_digital_port_connected(encoder);
+ else if (IS_GEN6(dev_priv))
+ return snb_digital_port_connected(encoder);
+ else if (IS_GEN5(dev_priv))
+ return ilk_digital_port_connected(encoder);
+
+ MISSING_CASE(INTEL_GEN(dev_priv));
+ return false;
}
static struct edid *
--
2.19.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/5] drm/i915: power_domains_init sort platforms newer-to-older
2018-10-22 17:15 [PATCH 1/5] drm/i915: ddi_clock_get sort platforms newer-to-older Rodrigo Vivi
2018-10-22 17:15 ` [PATCH 2/5] drm/i915: compute_min_voltage_level " Rodrigo Vivi
2018-10-22 17:15 ` [PATCH 3/5] drm/i915: digital_port_connected " Rodrigo Vivi
@ 2018-10-22 17:15 ` Rodrigo Vivi
2018-10-22 17:15 ` [PATCH 5/5] drm/i915: uncore_fw_domains_init " Rodrigo Vivi
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Rodrigo Vivi @ 2018-10-22 17:15 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula, Rodrigo Vivi
No functional change.
Just sorting this "if" block from newer to older platform.
v2: Fix few positions (Ville)
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_runtime_pm.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 31a49bdcf193..5f5416eb9644 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -3084,12 +3084,6 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
*/
if (IS_ICELAKE(dev_priv)) {
err = set_power_wells(power_domains, icl_power_wells);
- } else if (IS_HASWELL(dev_priv)) {
- err = set_power_wells(power_domains, hsw_power_wells);
- } else if (IS_BROADWELL(dev_priv)) {
- err = set_power_wells(power_domains, bdw_power_wells);
- } else if (IS_GEN9_BC(dev_priv)) {
- err = set_power_wells(power_domains, skl_power_wells);
} else if (IS_CANNONLAKE(dev_priv)) {
err = set_power_wells(power_domains, cnl_power_wells);
@@ -3101,13 +3095,18 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
*/
if (!IS_CNL_WITH_PORT_F(dev_priv))
power_domains->power_well_count -= 2;
-
- } else if (IS_BROXTON(dev_priv)) {
- err = set_power_wells(power_domains, bxt_power_wells);
} else if (IS_GEMINILAKE(dev_priv)) {
err = set_power_wells(power_domains, glk_power_wells);
+ } else if (IS_BROXTON(dev_priv)) {
+ err = set_power_wells(power_domains, bxt_power_wells);
+ } else if (IS_GEN9_BC(dev_priv)) {
+ err = set_power_wells(power_domains, skl_power_wells);
} else if (IS_CHERRYVIEW(dev_priv)) {
err = set_power_wells(power_domains, chv_power_wells);
+ } else if (IS_BROADWELL(dev_priv)) {
+ err = set_power_wells(power_domains, bdw_power_wells);
+ } else if (IS_HASWELL(dev_priv)) {
+ err = set_power_wells(power_domains, hsw_power_wells);
} else if (IS_VALLEYVIEW(dev_priv)) {
err = set_power_wells(power_domains, vlv_power_wells);
} else if (IS_I830(dev_priv)) {
--
2.19.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/5] drm/i915: uncore_fw_domains_init sort platforms newer-to-older
2018-10-22 17:15 [PATCH 1/5] drm/i915: ddi_clock_get sort platforms newer-to-older Rodrigo Vivi
` (2 preceding siblings ...)
2018-10-22 17:15 ` [PATCH 4/5] drm/i915: power_domains_init " Rodrigo Vivi
@ 2018-10-22 17:15 ` Rodrigo Vivi
2018-10-22 18:04 ` ✓ Fi.CI.BAT: success for series starting with [1/5] drm/i915: ddi_clock_get " Patchwork
2018-10-22 21:26 ` ✓ Fi.CI.IGT: " Patchwork
5 siblings, 0 replies; 8+ messages in thread
From: Rodrigo Vivi @ 2018-10-22 17:15 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula, Rodrigo Vivi
No functional change.
Just sorting this "if" statement from newer to older platform.
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_uncore.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 3ad302c66254..9289515108c3 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1437,7 +1437,7 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv)
FORCEWAKE_MEDIA_VEBOX_GEN11(i),
FORCEWAKE_ACK_MEDIA_VEBOX_GEN11(i));
}
- } else if (IS_GEN9(dev_priv) || IS_GEN10(dev_priv)) {
+ } else if (IS_GEN10(dev_priv) || IS_GEN9(dev_priv)) {
dev_priv->uncore.funcs.force_wake_get =
fw_domains_get_with_fallback;
dev_priv->uncore.funcs.force_wake_put = fw_domains_put;
--
2.19.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread* ✓ Fi.CI.BAT: success for series starting with [1/5] drm/i915: ddi_clock_get sort platforms newer-to-older.
2018-10-22 17:15 [PATCH 1/5] drm/i915: ddi_clock_get sort platforms newer-to-older Rodrigo Vivi
` (3 preceding siblings ...)
2018-10-22 17:15 ` [PATCH 5/5] drm/i915: uncore_fw_domains_init " Rodrigo Vivi
@ 2018-10-22 18:04 ` Patchwork
2018-10-22 21:26 ` ✓ Fi.CI.IGT: " Patchwork
5 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-10-22 18:04 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/5] drm/i915: ddi_clock_get sort platforms newer-to-older.
URL : https://patchwork.freedesktop.org/series/51340/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5017 -> Patchwork_10529 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/51340/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10529 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_store@basic-all:
fi-icl-u: NOTRUN -> DMESG-WARN (fdo#107724) +25
igt@gem_exec_store@basic-bsd:
fi-icl-u: NOTRUN -> DMESG-WARN (fdo#107732) +5
igt@gem_exec_suspend@basic-s3:
fi-kbl-soraka: NOTRUN -> INCOMPLETE (fdo#107859, fdo#107774, fdo#107556)
fi-icl-u: NOTRUN -> DMESG-WARN (fdo#108512)
igt@gem_mmap@basic-small-bo:
fi-icl-u2: NOTRUN -> DMESG-WARN (fdo#107732) +1
==== Possible fixes ====
igt@gem_exec_suspend@basic-s4-devices:
fi-kbl-7500u: DMESG-WARN (fdo#105128, fdo#107139) -> PASS
igt@prime_vgem@basic-fence-flip:
fi-cfl-8700k: FAIL (fdo#104008) -> PASS
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#105128 https://bugs.freedesktop.org/show_bug.cgi?id=105128
fdo#107139 https://bugs.freedesktop.org/show_bug.cgi?id=107139
fdo#107556 https://bugs.freedesktop.org/show_bug.cgi?id=107556
fdo#107724 https://bugs.freedesktop.org/show_bug.cgi?id=107724
fdo#107732 https://bugs.freedesktop.org/show_bug.cgi?id=107732
fdo#107774 https://bugs.freedesktop.org/show_bug.cgi?id=107774
fdo#107859 https://bugs.freedesktop.org/show_bug.cgi?id=107859
fdo#108512 https://bugs.freedesktop.org/show_bug.cgi?id=108512
== Participating hosts (51 -> 48) ==
Additional (2): fi-kbl-soraka fi-icl-u
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600
== Build changes ==
* Linux: CI_DRM_5017 -> Patchwork_10529
CI_DRM_5017: 9510f8e44127260f92b5b6c3127aafa22b15f741 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4685: 78619fde4008424c472906041edb1d204e014f7c @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10529: 281f4e6cccb36e3cb854f5e3fe3b38ab9506fe1b @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
281f4e6cccb3 drm/i915: uncore_fw_domains_init sort platforms newer-to-older
4c2ce0eb037b drm/i915: power_domains_init sort platforms newer-to-older
c5c88a848214 drm/i915: digital_port_connected sort platforms newer-to-older
92f26f1d122e drm/i915: compute_min_voltage_level sort platforms newer-to-older
e8d4799cea3a drm/i915: ddi_clock_get sort platforms newer-to-older.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10529/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread* ✓ Fi.CI.IGT: success for series starting with [1/5] drm/i915: ddi_clock_get sort platforms newer-to-older.
2018-10-22 17:15 [PATCH 1/5] drm/i915: ddi_clock_get sort platforms newer-to-older Rodrigo Vivi
` (4 preceding siblings ...)
2018-10-22 18:04 ` ✓ Fi.CI.BAT: success for series starting with [1/5] drm/i915: ddi_clock_get " Patchwork
@ 2018-10-22 21:26 ` Patchwork
2018-10-22 21:51 ` Rodrigo Vivi
5 siblings, 1 reply; 8+ messages in thread
From: Patchwork @ 2018-10-22 21:26 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/5] drm/i915: ddi_clock_get sort platforms newer-to-older.
URL : https://patchwork.freedesktop.org/series/51340/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5017_full -> Patchwork_10529_full =
== Summary - SUCCESS ==
No regressions found.
== Known issues ==
Here are the changes found in Patchwork_10529_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_sync@basic-each:
shard-snb: PASS -> INCOMPLETE (fdo#105411)
igt@gem_userptr_blits@readonly-unsync:
shard-skl: NOTRUN -> INCOMPLETE (fdo#108074)
igt@gem_workarounds@suspend-resume:
shard-kbl: PASS -> INCOMPLETE (fdo#103665)
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
shard-skl: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
shard-glk: PASS -> FAIL (fdo#108145)
igt@kms_cursor_crc@cursor-256x256-sliding:
shard-glk: PASS -> FAIL (fdo#103232) +1
igt@kms_draw_crc@draw-method-rgb565-blt-xtiled:
shard-skl: PASS -> FAIL (fdo#103184)
igt@kms_flip_tiling@flip-yf-tiled:
shard-skl: NOTRUN -> FAIL (fdo#108145) +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
shard-apl: PASS -> FAIL (fdo#103167) +1
igt@kms_frontbuffer_tracking@fbc-shrfb-scaledprimary:
shard-glk: PASS -> DMESG-WARN (fdo#105763, fdo#106538) +2
igt@kms_plane@plane-position-covered-pipe-a-planes:
shard-glk: PASS -> FAIL (fdo#103166)
igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
shard-skl: NOTRUN -> FAIL (fdo#107815, fdo#108145)
igt@pm_rps@reset:
shard-skl: PASS -> FAIL (fdo#102250)
igt@syncobj_wait@wait-for-submit-complex:
shard-skl: NOTRUN -> INCOMPLETE (fdo#108490)
==== Possible fixes ====
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
shard-glk: DMESG-WARN (fdo#107956) -> PASS
igt@kms_cursor_crc@cursor-64x21-onscreen:
shard-glk: FAIL (fdo#103232) -> PASS
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-apl: FAIL (fdo#105363, fdo#102887) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen:
shard-apl: FAIL (fdo#103167) -> PASS +1
igt@kms_plane@plane-position-covered-pipe-a-planes:
shard-apl: FAIL (fdo#103166) -> PASS +1
igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
shard-apl: FAIL (fdo#108145) -> PASS
igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
shard-glk: FAIL (fdo#103166) -> PASS
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS
igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm:
shard-glk: DMESG-WARN (fdo#105763, fdo#106538) -> PASS
igt@pm_rps@reset:
shard-apl: FAIL (fdo#102250) -> PASS
==== Warnings ====
igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
shard-skl: FAIL (fdo#103166) -> INCOMPLETE (fdo#104108)
fdo#102250 https://bugs.freedesktop.org/show_bug.cgi?id=102250
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103184 https://bugs.freedesktop.org/show_bug.cgi?id=103184
fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108074 https://bugs.freedesktop.org/show_bug.cgi?id=108074
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#108490 https://bugs.freedesktop.org/show_bug.cgi?id=108490
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (6 -> 6) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_5017 -> Patchwork_10529
CI_DRM_5017: 9510f8e44127260f92b5b6c3127aafa22b15f741 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4685: 78619fde4008424c472906041edb1d204e014f7c @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10529: 281f4e6cccb36e3cb854f5e3fe3b38ab9506fe1b @ 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_10529/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread