* [PATCH 1/2] drm/i915: Clean-up and organize transition WM code.
@ 2018-02-20 19:09 Rodrigo Vivi
2018-02-20 19:09 ` [PATCH 2/2] drm/i915: Remove CNL A0 exclusive WA Rodrigo Vivi
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Rodrigo Vivi @ 2018-02-20 19:09 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
Transition WM exist on gen9 but it is not recommended.
Let's make this decision clear and call rename the
function from "skl_" to "cnl_" so we don't have false
expectations that transitions should be running on CNL.
Also we remove two redundant checks inside this function
if (gen <= 9) exit
if (gen >= 10)...
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mahesh Kumar <mahesh1.kumar@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index a88f0f213604..1c2f824b1238 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4690,7 +4690,7 @@ skl_compute_linetime_wm(struct intel_crtc_state *cstate)
return linetime_wm;
}
-static void skl_compute_transition_wm(struct intel_crtc_state *cstate,
+static void cnl_compute_transition_wm(struct intel_crtc_state *cstate,
struct skl_wm_params *wp,
struct skl_wm_level *wm_l0,
uint16_t ddb_allocation,
@@ -4698,25 +4698,17 @@ static void skl_compute_transition_wm(struct intel_crtc_state *cstate,
{
struct drm_device *dev = cstate->base.crtc->dev;
const struct drm_i915_private *dev_priv = to_i915(dev);
- uint16_t trans_min, trans_y_tile_min;
+ uint16_t trans_min = 4, trans_y_tile_min;
const uint16_t trans_amount = 10; /* This is configurable amount */
uint16_t trans_offset_b, res_blocks;
if (!cstate->base.active)
goto exit;
- /* Transition WM are not recommended by HW team for GEN9 */
- if (INTEL_GEN(dev_priv) <= 9)
- goto exit;
-
/* Transition WM don't make any sense if ipc is disabled */
if (!dev_priv->ipc_enabled)
goto exit;
- trans_min = 0;
- if (INTEL_GEN(dev_priv) >= 10)
- trans_min = 4;
-
trans_offset_b = trans_min + trans_amount;
if (wp->y_tiled) {
@@ -4784,8 +4776,12 @@ static int skl_build_pipe_wm(struct intel_crtc_state *cstate,
intel_pstate, &wm_params, wm);
if (ret)
return ret;
- skl_compute_transition_wm(cstate, &wm_params, &wm->wm[0],
- ddb_blocks, &wm->trans_wm);
+
+ /* Transition WM are not recommended by HW team for GEN9 */
+ if (INTEL_GEN(dev_priv) >= 10)
+ cnl_compute_transition_wm(cstate, &wm_params,
+ &wm->wm[0], ddb_blocks,
+ &wm->trans_wm);
}
pipe_wm->linetime = skl_compute_linetime_wm(cstate);
--
2.13.6
_______________________________________________
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 2/2] drm/i915: Remove CNL A0 exclusive WA.
2018-02-20 19:09 [PATCH 1/2] drm/i915: Clean-up and organize transition WM code Rodrigo Vivi
@ 2018-02-20 19:09 ` Rodrigo Vivi
2018-02-20 19:47 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915: Clean-up and organize transition WM code Patchwork
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Rodrigo Vivi @ 2018-02-20 19:09 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
We never added any other CNL A0 workaround because we never
got any A0 platform.
So besides never being executed it is not valid for
reference anymore since it is not applicable to ICL.
So let's start some clean up here.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mahesh Kumar <mahesh1.kumar@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 1c2f824b1238..17ff3b200010 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4718,11 +4718,6 @@ static void cnl_compute_transition_wm(struct intel_crtc_state *cstate,
trans_offset_b;
} else {
res_blocks = wm_l0->plane_res_b + trans_offset_b;
-
- /* WA BUG:1938466 add one block for non y-tile planes */
- if (IS_CNL_REVID(dev_priv, CNL_REVID_A0, CNL_REVID_A0))
- res_blocks += 1;
-
}
res_blocks += 1;
--
2.13.6
_______________________________________________
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.CHECKPATCH: warning for series starting with [1/2] drm/i915: Clean-up and organize transition WM code.
2018-02-20 19:09 [PATCH 1/2] drm/i915: Clean-up and organize transition WM code Rodrigo Vivi
2018-02-20 19:09 ` [PATCH 2/2] drm/i915: Remove CNL A0 exclusive WA Rodrigo Vivi
@ 2018-02-20 19:47 ` Patchwork
2018-02-20 20:02 ` ✓ Fi.CI.BAT: success " Patchwork
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-02-20 19:47 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915: Clean-up and organize transition WM code.
URL : https://patchwork.freedesktop.org/series/38629/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
28d5d357b8fe drm/i915: Clean-up and organize transition WM code.
-:38: CHECK: Prefer kernel type 'u16' over 'uint16_t'
#38: FILE: drivers/gpu/drm/i915/intel_pm.c:4697:
+ uint16_t trans_min = 4, trans_y_tile_min;
total: 0 errors, 0 warnings, 1 checks, 48 lines checked
16ecd4465e36 drm/i915: Remove CNL A0 exclusive WA.
_______________________________________________
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.BAT: success for series starting with [1/2] drm/i915: Clean-up and organize transition WM code.
2018-02-20 19:09 [PATCH 1/2] drm/i915: Clean-up and organize transition WM code Rodrigo Vivi
2018-02-20 19:09 ` [PATCH 2/2] drm/i915: Remove CNL A0 exclusive WA Rodrigo Vivi
2018-02-20 19:47 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915: Clean-up and organize transition WM code Patchwork
@ 2018-02-20 20:02 ` Patchwork
2018-02-20 21:02 ` [PATCH 1/2] " Chris Wilson
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-02-20 20:02 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915: Clean-up and organize transition WM code.
URL : https://patchwork.freedesktop.org/series/38629/
State : success
== Summary ==
Series 38629v1 series starting with [1/2] drm/i915: Clean-up and organize transition WM code.
https://patchwork.freedesktop.org/api/1.0/series/38629/revisions/1/mbox/
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:416s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:428s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:371s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:484s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:283s
fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:477s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:478s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:466s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:451s
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:564s
fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:417s
fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:283s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:507s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:384s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:405s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:453s
fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:410s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:446s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:486s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:448s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:490s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:589s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:425s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:503s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:518s
fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:484s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:467s
fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:404s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:426s
fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:522s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:391s
924528430cb0e1468d5412decc269e09445391f5 drm-tip: 2018y-02m-20d-18h-55m-55s UTC integration manifest
16ecd4465e36 drm/i915: Remove CNL A0 exclusive WA.
28d5d357b8fe drm/i915: Clean-up and organize transition WM code.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8089/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
* Re: [PATCH 1/2] drm/i915: Clean-up and organize transition WM code.
2018-02-20 19:09 [PATCH 1/2] drm/i915: Clean-up and organize transition WM code Rodrigo Vivi
` (2 preceding siblings ...)
2018-02-20 20:02 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2018-02-20 21:02 ` Chris Wilson
2018-02-20 21:03 ` Chris Wilson
2018-02-21 3:18 ` ✗ Fi.CI.IGT: warning for series starting with [1/2] " Patchwork
5 siblings, 0 replies; 8+ messages in thread
From: Chris Wilson @ 2018-02-20 21:02 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
Quoting Rodrigo Vivi (2018-02-20 19:09:18)
> Transition WM exist on gen9 but it is not recommended.
>
> Let's make this decision clear and call rename the
> function from "skl_" to "cnl_" so we don't have false
> expectations that transitions should be running on CNL.
>
> Also we remove two redundant checks inside this function
> if (gen <= 9) exit
> if (gen >= 10)...
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mahesh Kumar <mahesh1.kumar@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
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
* Re: [PATCH 1/2] drm/i915: Clean-up and organize transition WM code.
2018-02-20 19:09 [PATCH 1/2] drm/i915: Clean-up and organize transition WM code Rodrigo Vivi
` (3 preceding siblings ...)
2018-02-20 21:02 ` [PATCH 1/2] " Chris Wilson
@ 2018-02-20 21:03 ` Chris Wilson
2018-02-20 22:41 ` Rodrigo Vivi
2018-02-21 3:18 ` ✗ Fi.CI.IGT: warning for series starting with [1/2] " Patchwork
5 siblings, 1 reply; 8+ messages in thread
From: Chris Wilson @ 2018-02-20 21:03 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
Quoting Rodrigo Vivi (2018-02-20 19:09:18)
> Transition WM exist on gen9 but it is not recommended.
>
> Let's make this decision clear and call rename the
> function from "skl_" to "cnl_" so we don't have false
> expectations that transitions should be running on CNL.
s/CNL/SKL/
-Chris
_______________________________________________
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
* Re: [PATCH 1/2] drm/i915: Clean-up and organize transition WM code.
2018-02-20 21:03 ` Chris Wilson
@ 2018-02-20 22:41 ` Rodrigo Vivi
0 siblings, 0 replies; 8+ messages in thread
From: Rodrigo Vivi @ 2018-02-20 22:41 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Tue, Feb 20, 2018 at 09:03:16PM +0000, Chris Wilson wrote:
> Quoting Rodrigo Vivi (2018-02-20 19:09:18)
> > Transition WM exist on gen9 but it is not recommended.
> >
> > Let's make this decision clear and call rename the
> > function from "skl_" to "cnl_" so we don't have false
> > expectations that transitions should be running on CNL.
>
> s/CNL/SKL/
oh ops...
can I use "gen9"? to include kbl and cfl as well
> -Chris
> _______________________________________________
> 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] 8+ messages in thread
* ✗ Fi.CI.IGT: warning for series starting with [1/2] drm/i915: Clean-up and organize transition WM code.
2018-02-20 19:09 [PATCH 1/2] drm/i915: Clean-up and organize transition WM code Rodrigo Vivi
` (4 preceding siblings ...)
2018-02-20 21:03 ` Chris Wilson
@ 2018-02-21 3:18 ` Patchwork
5 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-02-21 3:18 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915: Clean-up and organize transition WM code.
URL : https://patchwork.freedesktop.org/series/38629/
State : warning
== Summary ==
Test kms_cursor_legacy:
Subgroup 2x-long-flip-vs-cursor-legacy:
fail -> PASS (shard-hsw) fdo#104873 +1
Test kms_flip:
Subgroup 2x-flip-vs-expired-vblank:
pass -> FAIL (shard-hsw) fdo#102887
Subgroup flip-vs-panning-vs-hang:
pass -> DMESG-WARN (shard-snb) fdo#103821
Test perf:
Subgroup oa-exponents:
pass -> FAIL (shard-apl) fdo#102254
Subgroup buffer-fill:
fail -> PASS (shard-apl) fdo#103755
Test kms_chv_cursor_fail:
Subgroup pipe-b-64x64-right-edge:
pass -> DMESG-WARN (shard-snb)
fdo#104873 https://bugs.freedesktop.org/show_bug.cgi?id=104873
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103821 https://bugs.freedesktop.org/show_bug.cgi?id=103821
fdo#102254 https://bugs.freedesktop.org/show_bug.cgi?id=102254
fdo#103755 https://bugs.freedesktop.org/show_bug.cgi?id=103755
shard-apl total:3367 pass:1764 dwarn:1 dfail:0 fail:9 skip:1592 time:12036s
shard-hsw total:3429 pass:1758 dwarn:1 dfail:0 fail:4 skip:1665 time:11589s
shard-snb total:3429 pass:1348 dwarn:3 dfail:0 fail:2 skip:2076 time:6540s
Blacklisted hosts:
shard-kbl total:3411 pass:1910 dwarn:1 dfail:0 fail:9 skip:1490 time:9342s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8089/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
end of thread, other threads:[~2018-02-21 3:18 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-20 19:09 [PATCH 1/2] drm/i915: Clean-up and organize transition WM code Rodrigo Vivi
2018-02-20 19:09 ` [PATCH 2/2] drm/i915: Remove CNL A0 exclusive WA Rodrigo Vivi
2018-02-20 19:47 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915: Clean-up and organize transition WM code Patchwork
2018-02-20 20:02 ` ✓ Fi.CI.BAT: success " Patchwork
2018-02-20 21:02 ` [PATCH 1/2] " Chris Wilson
2018-02-20 21:03 ` Chris Wilson
2018-02-20 22:41 ` Rodrigo Vivi
2018-02-21 3:18 ` ✗ Fi.CI.IGT: warning for series starting with [1/2] " 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.