* [PATCH 0/3] Trivial comments and small changes
@ 2019-04-04 23:04 Lucas De Marchi
2019-04-04 23:04 ` [PATCH 1/3] drm/i915/icl: fix step numbers in icl_display_core_init() Lucas De Marchi
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Lucas De Marchi @ 2019-04-04 23:04 UTC (permalink / raw)
To: intel-gfx; +Cc: Lucas De Marchi
I was fixing a pm thing that ended up not being needed. So, just get the
small/trivial changes out.
No change in behavior.
Lucas De Marchi (3):
drm/i915/icl: fix step numbers in icl_display_core_init()
drm/i915: reorder if chain to have last gen first
drm/i915: do not mix workaround with normal flow
drivers/gpu/drm/i915/intel_pm.c | 21 ++++++++++++---------
drivers/gpu/drm/i915/intel_runtime_pm.c | 10 +++++-----
2 files changed, 17 insertions(+), 14 deletions(-)
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/3] drm/i915/icl: fix step numbers in icl_display_core_init()
2019-04-04 23:04 [PATCH 0/3] Trivial comments and small changes Lucas De Marchi
@ 2019-04-04 23:04 ` Lucas De Marchi
2019-04-08 22:36 ` Rodrigo Vivi
2019-04-04 23:04 ` [PATCH 2/3] drm/i915: reorder if chain to have last gen first Lucas De Marchi
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Lucas De Marchi @ 2019-04-04 23:04 UTC (permalink / raw)
To: intel-gfx; +Cc: Lucas De Marchi
At some point the spec was changed and we never updated the numbers to
match it. Let's try once more to keep them in sync.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
drivers/gpu/drm/i915/intel_runtime_pm.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 40ddfbb97acb..25053dfc3a12 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -3832,11 +3832,11 @@ void icl_display_core_init(struct drm_i915_private *dev_priv,
/* 1. Enable PCH reset handshake. */
intel_pch_reset_handshake(dev_priv, !HAS_PCH_NOP(dev_priv));
- /* 2-3. */
+ /* 2. Initialize all combo phys */
icl_combo_phys_init(dev_priv);
/*
- * 4. Enable Power Well 1 (PG1).
+ * 3. Enable Power Well 1 (PG1).
* The AUX IO power wells will be enabled on demand.
*/
mutex_lock(&power_domains->lock);
@@ -3844,13 +3844,13 @@ void icl_display_core_init(struct drm_i915_private *dev_priv,
intel_power_well_enable(dev_priv, well);
mutex_unlock(&power_domains->lock);
- /* 5. Enable CDCLK. */
+ /* 4. Enable CDCLK. */
icl_init_cdclk(dev_priv);
- /* 6. Enable DBUF. */
+ /* 5. Enable DBUF. */
icl_dbuf_enable(dev_priv);
- /* 7. Setup MBUS. */
+ /* 6. Setup MBUS. */
icl_mbus_init(dev_priv);
if (resume && dev_priv->csr.dmc_payload)
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] drm/i915: reorder if chain to have last gen first
2019-04-04 23:04 [PATCH 0/3] Trivial comments and small changes Lucas De Marchi
2019-04-04 23:04 ` [PATCH 1/3] drm/i915/icl: fix step numbers in icl_display_core_init() Lucas De Marchi
@ 2019-04-04 23:04 ` Lucas De Marchi
2019-04-08 22:36 ` Rodrigo Vivi
2019-04-04 23:04 ` [PATCH 3/3] drm/i915: do not mix workaround with normal flow Lucas De Marchi
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Lucas De Marchi @ 2019-04-04 23:04 UTC (permalink / raw)
To: intel-gfx; +Cc: Lucas De Marchi
Reorder if/else so we check for gen >= 11 first, similar to most of
other checks in the driver.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 0e05ee1f3ea0..25eff3728fcd 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4367,15 +4367,16 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
return 0;
}
- if (INTEL_GEN(dev_priv) < 11)
+ if (INTEL_GEN(dev_priv) >= 11)
+ total_data_rate =
+ icl_get_total_relative_data_rate(cstate,
+ plane_data_rate);
+ else
total_data_rate =
skl_get_total_relative_data_rate(cstate,
plane_data_rate,
uv_plane_data_rate);
- else
- total_data_rate =
- icl_get_total_relative_data_rate(cstate,
- plane_data_rate);
+
skl_ddb_get_pipe_allocation_limits(dev_priv, cstate, total_data_rate,
ddb, alloc, &num_active);
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] drm/i915: do not mix workaround with normal flow
2019-04-04 23:04 [PATCH 0/3] Trivial comments and small changes Lucas De Marchi
2019-04-04 23:04 ` [PATCH 1/3] drm/i915/icl: fix step numbers in icl_display_core_init() Lucas De Marchi
2019-04-04 23:04 ` [PATCH 2/3] drm/i915: reorder if chain to have last gen first Lucas De Marchi
@ 2019-04-04 23:04 ` Lucas De Marchi
2019-04-08 22:37 ` Rodrigo Vivi
2019-04-05 0:05 ` ✓ Fi.CI.BAT: success for Trivial comments and small changes Patchwork
2019-04-05 19:53 ` ✓ Fi.CI.IGT: " Patchwork
4 siblings, 1 reply; 9+ messages in thread
From: Lucas De Marchi @ 2019-04-04 23:04 UTC (permalink / raw)
To: intel-gfx; +Cc: Lucas De Marchi
Separate the two comments: one is a workaround and the other is a sanity
check. We could just compare != 1, but let's treat them differently due
to having different meaning.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 25eff3728fcd..b4d1078727dc 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3760,14 +3760,16 @@ bool intel_can_enable_sagv(struct drm_atomic_state *state)
sagv_block_time_us = 10;
/*
- * SKL+ workaround: bspec recommends we disable SAGV when we have
- * more then one pipe enabled
- *
* If there are no active CRTCs, no additional checks need be performed
*/
if (hweight32(intel_state->active_crtcs) == 0)
return true;
- else if (hweight32(intel_state->active_crtcs) > 1)
+
+ /*
+ * SKL+ workaround: bspec recommends we disable SAGV when we have
+ * more then one pipe enabled
+ */
+ if (hweight32(intel_state->active_crtcs) > 1)
return false;
/* Since we're now guaranteed to only have one active CRTC... */
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread
* ✓ Fi.CI.BAT: success for Trivial comments and small changes
2019-04-04 23:04 [PATCH 0/3] Trivial comments and small changes Lucas De Marchi
` (2 preceding siblings ...)
2019-04-04 23:04 ` [PATCH 3/3] drm/i915: do not mix workaround with normal flow Lucas De Marchi
@ 2019-04-05 0:05 ` Patchwork
2019-04-05 19:53 ` ✓ Fi.CI.IGT: " Patchwork
4 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2019-04-05 0:05 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: Trivial comments and small changes
URL : https://patchwork.freedesktop.org/series/59027/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5875 -> Patchwork_12688
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/59027/revisions/1/mbox/
Known issues
------------
Here are the changes found in Patchwork_12688 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_basic@basic-bsd2:
- fi-kbl-7500u: NOTRUN -> SKIP [fdo#109271] +9
* igt@gem_exec_basic@gtt-bsd2:
- fi-byt-clapper: NOTRUN -> SKIP [fdo#109271] +57
* igt@i915_module_load@reload:
- fi-blb-e6850: NOTRUN -> INCOMPLETE [fdo#107718]
* igt@i915_pm_rpm@basic-rte:
- fi-hsw-4770: PASS -> INCOMPLETE [fdo#107807]
* igt@i915_selftest@live_execlists:
- fi-apl-guc: PASS -> INCOMPLETE [fdo#103927] / [fdo#109720]
* igt@kms_busy@basic-flip-c:
- fi-blb-e6850: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
- fi-byt-clapper: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_chamelium@dp-crc-fast:
- fi-kbl-7500u: NOTRUN -> DMESG-WARN [fdo#103841]
* igt@kms_flip@basic-flip-vs-wf_vblank:
- fi-blb-e6850: NOTRUN -> FAIL [fdo#100368]
* igt@kms_pipe_crc_basic@hang-read-crc-pipe-c:
- fi-blb-e6850: NOTRUN -> SKIP [fdo#109271] +29
* igt@runner@aborted:
- fi-kbl-7500u: NOTRUN -> FAIL [fdo#103841]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS
* igt@i915_selftest@live_hangcheck:
- fi-skl-iommu: INCOMPLETE [fdo#108602] / [fdo#108744] -> PASS
* igt@kms_flip@basic-flip-vs-wf_vblank:
- fi-bsw-n3050: FAIL [fdo#100368] -> PASS
[fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
[fdo#103841]: https://bugs.freedesktop.org/show_bug.cgi?id=103841
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
[fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720
Participating hosts (48 -> 42)
------------------------------
Additional (2): fi-byt-clapper fi-kbl-7500u
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-gdg-551 fi-icl-y
Build changes
-------------
* Linux: CI_DRM_5875 -> Patchwork_12688
CI_DRM_5875: 5cc7c47c44aaef5bfe07e7307d06caa98e401fad @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4928: 014a6fa238322b497116b359cb92df1ce7fa8847 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12688: 011da257e505f089da15171375e301fd90e1c592 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
011da257e505 drm/i915: do not mix workaround with normal flow
cc1c2dc7e7c8 drm/i915: reorder if chain to have last gen first
ad25ad7d0a25 drm/i915/icl: fix step numbers in icl_display_core_init()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12688/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* ✓ Fi.CI.IGT: success for Trivial comments and small changes
2019-04-04 23:04 [PATCH 0/3] Trivial comments and small changes Lucas De Marchi
` (3 preceding siblings ...)
2019-04-05 0:05 ` ✓ Fi.CI.BAT: success for Trivial comments and small changes Patchwork
@ 2019-04-05 19:53 ` Patchwork
4 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2019-04-05 19:53 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: Trivial comments and small changes
URL : https://patchwork.freedesktop.org/series/59027/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5875_full -> Patchwork_12688_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12688_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_parse@basic-allocation:
- shard-glk: NOTRUN -> SKIP [fdo#109271] +46
* igt@gem_mmap_gtt@hang:
- shard-iclb: PASS -> FAIL [fdo#109677]
* igt@gem_pread@stolen-uncached:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] +13
* igt@kms_atomic_transition@3x-modeset-transitions-nonblocking:
- shard-snb: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +9
* igt@kms_busy@extended-modeset-hang-oldfb-render-d:
- shard-skl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +14
* igt@kms_busy@extended-pageflip-hang-newfb-render-c:
- shard-apl: PASS -> DMESG-WARN [fdo#110222]
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
- shard-skl: NOTRUN -> DMESG-WARN [fdo#110222] +2
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-d:
- shard-glk: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1
* igt@kms_ccs@pipe-a-ccs-on-another-bo:
- shard-snb: NOTRUN -> SKIP [fdo#109271] +78
* igt@kms_chamelium@dp-hpd-storm:
- shard-iclb: NOTRUN -> SKIP [fdo#109284] +1
* igt@kms_color@pipe-a-ctm-0-75:
- shard-iclb: PASS -> DMESG-WARN [fdo#106107]
* igt@kms_cursor_crc@cursor-256x256-sliding:
- shard-glk: NOTRUN -> FAIL [fdo#103232] +4
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: NOTRUN -> SKIP [fdo#109349]
* igt@kms_flip@2x-flip-vs-absolute-wf_vblank:
- shard-iclb: NOTRUN -> SKIP [fdo#109274] +2
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: PASS -> FAIL [fdo#103167] +3
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite:
- shard-iclb: NOTRUN -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-render:
- shard-iclb: NOTRUN -> SKIP [fdo#109280] +6
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-blt:
- shard-skl: NOTRUN -> SKIP [fdo#109271] +195
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-mmap-gtt:
- shard-iclb: PASS -> FAIL [fdo#109247] +15
* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-cpu:
- shard-iclb: PASS -> FAIL [fdo#105682] / [fdo#109247]
* igt@kms_panel_fitting@legacy:
- shard-skl: NOTRUN -> FAIL [fdo#105456]
* igt@kms_pipe_b_c_ivb@pipe-b-double-modeset-then-modeset-pipe-c:
- shard-apl: NOTRUN -> SKIP [fdo#109271]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d:
- shard-iclb: NOTRUN -> SKIP [fdo#109278] +2
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-skl: NOTRUN -> FAIL [fdo#108145] +1
* igt@kms_plane_alpha_blend@pipe-b-alpha-7efc:
- shard-skl: NOTRUN -> FAIL [fdo#107815] / [fdo#108145] +1
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: PASS -> FAIL [fdo#107815]
* igt@kms_plane_alpha_blend@pipe-c-alpha-transparant-fb:
- shard-glk: NOTRUN -> FAIL [fdo#108145] +1
* igt@kms_plane_scaling@pipe-b-scaler-with-clipping-clamping:
- shard-glk: PASS -> SKIP [fdo#109271] / [fdo#109278] +1
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: PASS -> SKIP [fdo#109642]
* igt@kms_psr@psr2_cursor_blt:
- shard-iclb: NOTRUN -> SKIP [fdo#109441]
* igt@kms_psr@sprite_mmap_cpu:
- shard-iclb: PASS -> FAIL [fdo#107383] / [fdo#110215] +4
* igt@kms_rotation_crc@multiplane-rotation:
- shard-kbl: PASS -> INCOMPLETE [fdo#103665]
* igt@kms_setmode@basic:
- shard-apl: PASS -> FAIL [fdo#99912]
- shard-skl: NOTRUN -> FAIL [fdo#99912]
* igt@kms_universal_plane@disable-primary-vs-flip-pipe-d:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1
* igt@kms_vblank@pipe-b-query-forked-hang:
- shard-snb: PASS -> SKIP [fdo#109271] +6
* igt@prime_busy@hang-bsd2:
- shard-iclb: NOTRUN -> SKIP [fdo#109276] +4
* igt@prime_nv_pcopy@test1_micro:
- shard-iclb: NOTRUN -> SKIP [fdo#109291] +1
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- shard-apl: DMESG-WARN [fdo#108566] -> PASS
* igt@gem_flink_race@flink_close:
- shard-iclb: DMESG-WARN -> PASS
* igt@gem_mmap_gtt@forked-big-copy-xy:
- shard-iclb: TIMEOUT [fdo#109673] -> PASS
* igt@i915_selftest@live_workarounds:
- shard-iclb: DMESG-FAIL [fdo#108954] -> PASS
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
- shard-iclb: DMESG-WARN [fdo#110222] -> PASS
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-skl: INCOMPLETE [fdo#104108] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-gtt:
- shard-glk: FAIL [fdo#103167] -> PASS
* igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw:
- shard-iclb: FAIL [fdo#103167] -> PASS +6
* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-blt:
- shard-iclb: FAIL [fdo#105682] / [fdo#109247] -> PASS
* igt@kms_frontbuffer_tracking@fbcpsr-suspend:
- shard-skl: INCOMPLETE [fdo#104108] / [fdo#106978] -> PASS
* igt@kms_frontbuffer_tracking@psr-rgb101010-draw-blt:
- shard-iclb: FAIL [fdo#109247] -> PASS +19
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: FAIL [fdo#107815] / [fdo#108145] -> PASS
* igt@kms_plane_scaling@pipe-b-scaler-with-rotation:
- shard-glk: SKIP [fdo#109271] / [fdo#109278] -> PASS
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: SKIP [fdo#109441] -> PASS +2
* igt@kms_psr@sprite_mmap_gtt:
- shard-iclb: FAIL [fdo#107383] / [fdo#110215] -> PASS +2
* igt@kms_rotation_crc@multiplane-rotation-cropping-bottom:
- shard-kbl: DMESG-FAIL [fdo#105763] -> PASS
* igt@tools_test@tools_test:
- shard-apl: SKIP [fdo#109271] -> PASS
#### Warnings ####
* igt@gem_tiled_swapping@non-threaded:
- shard-iclb: INCOMPLETE [fdo#108686] -> FAIL [fdo#108686]
* igt@kms_lease@cursor_implicit_plane:
- shard-snb: FAIL [fdo#110278] -> SKIP [fdo#109271]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[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#105456]: https://bugs.freedesktop.org/show_bug.cgi?id=105456
[fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
[fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
[fdo#107383]: https://bugs.freedesktop.org/show_bug.cgi?id=107383
[fdo#107815]: https://bugs.freedesktop.org/show_bug.cgi?id=107815
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#108954]: https://bugs.freedesktop.org/show_bug.cgi?id=108954
[fdo#109247]: https://bugs.freedesktop.org/show_bug.cgi?id=109247
[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#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673
[fdo#109677]: https://bugs.freedesktop.org/show_bug.cgi?id=109677
[fdo#110215]: https://bugs.freedesktop.org/show_bug.cgi?id=110215
[fdo#110222]: https://bugs.freedesktop.org/show_bug.cgi?id=110222
[fdo#110278]: https://bugs.freedesktop.org/show_bug.cgi?id=110278
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 9)
------------------------------
Missing (1): shard-hsw
Build changes
-------------
* Linux: CI_DRM_5875 -> Patchwork_12688
CI_DRM_5875: 5cc7c47c44aaef5bfe07e7307d06caa98e401fad @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4928: 014a6fa238322b497116b359cb92df1ce7fa8847 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12688: 011da257e505f089da15171375e301fd90e1c592 @ 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_12688/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] drm/i915/icl: fix step numbers in icl_display_core_init()
2019-04-04 23:04 ` [PATCH 1/3] drm/i915/icl: fix step numbers in icl_display_core_init() Lucas De Marchi
@ 2019-04-08 22:36 ` Rodrigo Vivi
0 siblings, 0 replies; 9+ messages in thread
From: Rodrigo Vivi @ 2019-04-08 22:36 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
On Thu, Apr 04, 2019 at 04:04:24PM -0700, Lucas De Marchi wrote:
> At some point the spec was changed and we never updated the numbers to
> match it. Let's try once more to keep them in sync.
or maybe we just copied the numers from CNL ones?
Anyway let's keep in sync with spec:
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_runtime_pm.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index 40ddfbb97acb..25053dfc3a12 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -3832,11 +3832,11 @@ void icl_display_core_init(struct drm_i915_private *dev_priv,
> /* 1. Enable PCH reset handshake. */
> intel_pch_reset_handshake(dev_priv, !HAS_PCH_NOP(dev_priv));
>
> - /* 2-3. */
> + /* 2. Initialize all combo phys */
> icl_combo_phys_init(dev_priv);
>
> /*
> - * 4. Enable Power Well 1 (PG1).
> + * 3. Enable Power Well 1 (PG1).
> * The AUX IO power wells will be enabled on demand.
> */
> mutex_lock(&power_domains->lock);
> @@ -3844,13 +3844,13 @@ void icl_display_core_init(struct drm_i915_private *dev_priv,
> intel_power_well_enable(dev_priv, well);
> mutex_unlock(&power_domains->lock);
>
> - /* 5. Enable CDCLK. */
> + /* 4. Enable CDCLK. */
> icl_init_cdclk(dev_priv);
>
> - /* 6. Enable DBUF. */
> + /* 5. Enable DBUF. */
> icl_dbuf_enable(dev_priv);
>
> - /* 7. Setup MBUS. */
> + /* 6. Setup MBUS. */
> icl_mbus_init(dev_priv);
>
> if (resume && dev_priv->csr.dmc_payload)
> --
> 2.21.0
>
> _______________________________________________
> 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] 9+ messages in thread
* Re: [PATCH 2/3] drm/i915: reorder if chain to have last gen first
2019-04-04 23:04 ` [PATCH 2/3] drm/i915: reorder if chain to have last gen first Lucas De Marchi
@ 2019-04-08 22:36 ` Rodrigo Vivi
0 siblings, 0 replies; 9+ messages in thread
From: Rodrigo Vivi @ 2019-04-08 22:36 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
On Thu, Apr 04, 2019 at 04:04:25PM -0700, Lucas De Marchi wrote:
> Reorder if/else so we check for gen >= 11 first, similar to most of
> other checks in the driver.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 0e05ee1f3ea0..25eff3728fcd 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4367,15 +4367,16 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
> return 0;
> }
>
> - if (INTEL_GEN(dev_priv) < 11)
> + if (INTEL_GEN(dev_priv) >= 11)
> + total_data_rate =
> + icl_get_total_relative_data_rate(cstate,
> + plane_data_rate);
> + else
> total_data_rate =
> skl_get_total_relative_data_rate(cstate,
> plane_data_rate,
> uv_plane_data_rate);
> - else
> - total_data_rate =
> - icl_get_total_relative_data_rate(cstate,
> - plane_data_rate);
> +
>
> skl_ddb_get_pipe_allocation_limits(dev_priv, cstate, total_data_rate,
> ddb, alloc, &num_active);
> --
> 2.21.0
>
> _______________________________________________
> 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] 9+ messages in thread
* Re: [PATCH 3/3] drm/i915: do not mix workaround with normal flow
2019-04-04 23:04 ` [PATCH 3/3] drm/i915: do not mix workaround with normal flow Lucas De Marchi
@ 2019-04-08 22:37 ` Rodrigo Vivi
0 siblings, 0 replies; 9+ messages in thread
From: Rodrigo Vivi @ 2019-04-08 22:37 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
On Thu, Apr 04, 2019 at 04:04:26PM -0700, Lucas De Marchi wrote:
> Separate the two comments: one is a workaround and the other is a sanity
> check. We could just compare != 1, but let's treat them differently due
> to having different meaning.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 25eff3728fcd..b4d1078727dc 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3760,14 +3760,16 @@ bool intel_can_enable_sagv(struct drm_atomic_state *state)
> sagv_block_time_us = 10;
>
> /*
> - * SKL+ workaround: bspec recommends we disable SAGV when we have
> - * more then one pipe enabled
> - *
> * If there are no active CRTCs, no additional checks need be performed
> */
> if (hweight32(intel_state->active_crtcs) == 0)
> return true;
> - else if (hweight32(intel_state->active_crtcs) > 1)
> +
> + /*
> + * SKL+ workaround: bspec recommends we disable SAGV when we have
> + * more then one pipe enabled
> + */
> + if (hweight32(intel_state->active_crtcs) > 1)
> return false;
>
> /* Since we're now guaranteed to only have one active CRTC... */
> --
> 2.21.0
>
> _______________________________________________
> 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] 9+ messages in thread
end of thread, other threads:[~2019-04-08 22:37 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-04 23:04 [PATCH 0/3] Trivial comments and small changes Lucas De Marchi
2019-04-04 23:04 ` [PATCH 1/3] drm/i915/icl: fix step numbers in icl_display_core_init() Lucas De Marchi
2019-04-08 22:36 ` Rodrigo Vivi
2019-04-04 23:04 ` [PATCH 2/3] drm/i915: reorder if chain to have last gen first Lucas De Marchi
2019-04-08 22:36 ` Rodrigo Vivi
2019-04-04 23:04 ` [PATCH 3/3] drm/i915: do not mix workaround with normal flow Lucas De Marchi
2019-04-08 22:37 ` Rodrigo Vivi
2019-04-05 0:05 ` ✓ Fi.CI.BAT: success for Trivial comments and small changes Patchwork
2019-04-05 19:53 ` ✓ 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.