drm/i915: Precompute can_sagv for each wm level
Subsystems (3)
PATCH v2 1/3 drm/i915: Precompute can_sagv for each wm level
From: Ville Syrjälä <[email protected]>
In order to remove intel_atomic_crtc_state_for_each_plane_state() from skl_crtc_can_enable_sagv() we can simply precompute whether each wm level can tolerate the SAGV block time latency or not.
This has the nice side benefit that we remove the duplicated wm level latency calculation. In fact the copy of that code we had in skl_crtc_can_enable_sagv() didn't even handle WaIncreaseLatencyIPCEnabled/Display WA #1141 whereas the copy in skl_compute_plane_wm() did. So now we just have the one copy which handles all the w/as.
--- .../drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 21 +++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/display/intel_display_types.h +1 -0
@@ -686,6 +686,7 @@ struct skl_wm_level {u8 plane_res_l;bool plane_en;bool ignore_lines; +bool can_sagv; };struct skl_plane_wm {
drivers/gpu/drm/i915/intel_pm.c +8 -13
@@ -3873,9 +3873,7 @@ static bool skl_crtc_can_enable_sagv(const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -struct intel_plane *plane; -const struct intel_plane_state *plane_state; -int level, latency; +enum plane_id plane_id;if (!intel_has_sagv (dev_priv))return false;
@@ -3886,9 +3884,10 @@ static bool skl_crtc_can_enable_sagv(const struct intel_crtc_state *crtc_state)if (crtc_state->hw.pipe_mode.flags &DRM_MODE_FLAG_INTERLACE )return false; -intel_atomic_crtc_state_for_each_plane_state (plane, plane_state, crtc_state) { +for_each_plane_id_on_crtc (crtc, plane_id) {const struct skl_plane_wm *wm = - &crtc_state->wm.skl.optimal.planes[plane->id]; + &crtc_state->wm.skl.optimal.planes[plane_id]; +int level;/* Skip this plane if it's not enabled */ if (!wm->wm[0 ].plane_en)
@@ -3899,19 +3898,12 @@ static bool skl_crtc_can_enable_sagv(const struct intel_crtc_state *crtc_state) !wm->wm[level].plane_en; --level) { } - latency = dev_priv->wm.skl_latency[level]; - -if (skl_needs_memory_bw_wa (dev_priv) && - plane_state->uapi.fb->modifier == -I915_FORMAT_MOD_X_TILED ) - latency +=15 ; -/* * If any of the planes on this pipe don't enable wm levels that * incur memory latencies higher than sagv_block_time_us we * can't enable SAGV. */ -if (latency < dev_priv->sagv_block_time_us) +if (!wm->wm[level].can_sagv)return false; }
@@ -5375,6 +5367,9 @@ static void skl_compute_plane_wm(const struct intel_crtc_state *crtc_state,/* Bspec says: value >= plane ddb allocation -> invalid, hence the +1 here */ result->min_ddb_alloc =max (min_ddb_alloc, res_blocks) +1 ; result->plane_en = true; + +if (INTEL_GEN (dev_priv) <12 ) + result->can_sagv = latency >= dev_priv->sagv_block_time_us; } static void
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/3 drm/i915: Store plane relative data rate in crtc_state
From: Ville Syrjälä <[email protected]>
Store the relative data rate for planes in the crtc state so that we don't have to use intel_atomic_crtc_state_for_each_plane_state() to compute it even for the planes that are no part of the current state.
Should probably just nuke this stuff entirely an use the normal plane data rate instead. The two are slightly different since this relative data rate doesn't factor in the actual pixel clock, so it's a bit odd thing to even call a "data rate". And since the watermarks are computed based on the actual data rate anyway I don't really see what the point of this relative data rate is. But that's for the future...
--- .../drm/i915/display/intel_display_types.h | 4 + drivers/gpu/drm/i915/intel_pm.c | 83 ++++++++++--------- 2 files changed, 50 insertions(+), 37 deletions(-)
drivers/gpu/drm/i915/display/intel_display_types.h +4 -0
@@ -1031,6 +1031,10 @@ struct intel_crtc_state {u32 data_rate[I915_MAX_PLANES ]; +/* FIXME unify with data_rate[] */ +u64 plane_data_rate[I915_MAX_PLANES ]; +u64 uv_plane_data_rate[I915_MAX_PLANES ]; +/* Gamma mode programmed on the pipe */ u32 gamma_mode;
drivers/gpu/drm/i915/intel_pm.c +46 -37
148 lines not on this page · raw message
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/3 drm/i915: Remove skl_adjusted_plane_pixel_rate()
In reply to Manasi NavareFrom: Ville Syrjälä <[email protected]>
Replace skl_adjusted_plane_pixel_rate() with the generic intel_plane_pixel_rate(). The two should produce identical results.
--- drivers/gpu/drm/i915/intel_pm.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +2 -25
@@ -33,6 +33,7 @@#include <drm/drm_plane_helper.h> #include "display/intel_atomic.h" +#include "display/intel_atomic_plane.h" #include "display/intel_bw.h" #include "display/intel_display_types.h" #include "display/intel_fbc.h"
@@ -5102,30 +5103,6 @@ intel_get_linetime_us(const struct intel_crtc_state *crtc_state)return linetime_us; } -static u32 -skl_adjusted_plane_pixel_rate (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); -u64 adjusted_pixel_rate; -uint_fixed_16_16_t downscale_amount; - -/* Shouldn't reach here on disabled planes... */ -if (drm_WARN_ON (&dev_priv->drm, - !intel_wm_plane_visible (crtc_state, plane_state))) -return 0 ; - -/* -* Adjusted plane pixel rate is just the pipe's adjusted pixel rate -* with additional adjustments for plane-specific scaling. -*/ - adjusted_pixel_rate = crtc_state->pixel_rate; - downscale_amount =skl_plane_downscale_amount (crtc_state, plane_state); - -return mul_round_up_u32_fixed16 (adjusted_pixel_rate, - downscale_amount); -} - static int skl_compute_wm_params(const struct intel_crtc_state *crtc_state, int width, const struct drm_format_info *format,
@@ -5238,7 +5215,7 @@ skl_compute_plane_wm_params(const struct intel_crtc_state *crtc_state,return skl_compute_wm_params (crtc_state, width, fb->format, fb->modifier, plane_state->hw.rotation, -skl_adjusted_plane_pixel_rate (crtc_state, plane_state), +intel_plane_pixel_rate (crtc_state, plane_state), wp, color_plane); }
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [CI,v2,1/3] drm/i915: Precompute can_sagv for each wm level
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: series starting with [CI,v2,1/3] drm/i915: Precompute can_sagv for each wm level
URL : https://patchwork.freedesktop.org/series/83874/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. - +drivers/gpu/drm/i915/gt/intel_reset.c:1312:5: warning: context imbalance in 'intel_gt_reset_trylock' - different lock contexts for basic block +drivers/gpu/drm/i915/gt/selftest_reset.c:100:20: expected void *in +drivers/gpu/drm/i915/gt/selftest_reset.c:100:20: got void [noderef] __iomem *[assigned] s +drivers/gpu/drm/i915/gt/selftest_reset.c:100:20: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/i915/gt/selftest_reset.c:101:46: expected void const *src +drivers/gpu/drm/i915/gt/selftest_reset.c:101:46: got void [noderef] __iomem *[assigned] s +drivers/gpu/drm/i915/gt/selftest_reset.c:101:46: warning: incorrect type in argument 2 (different address spaces) +drivers/gpu/drm/i915/gt/selftest_reset.c:136:20: expected void *in +drivers/gpu/drm/i915/gt/selftest_reset.c:136:20: got void [noderef] __iomem *[assigned] s +drivers/gpu/drm/i915/gt/selftest_reset.c:136:20: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/i915/gt/selftest_reset.c:137:46: expected void const *src +drivers/gpu/drm/i915/gt/selftest_reset.c:137:46: got void [noderef] __iomem *[assigned] s +drivers/gpu/drm/i915/gt/selftest_reset.c:137:46: warning: incorrect type in argument 2 (different address spaces) +drivers/gpu/drm/i915/gt/selftest_reset.c:98:34: expected unsigned int [usertype] *s +drivers/gpu/drm/i915/gt/selftest_reset.c:98:34: got void [noderef] __iomem *[assigned] s +drivers/gpu/drm/i915/gt/selftest_reset.c:98:34: warning: incorrect type in argument 1 (different address spaces) +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write8' - different lock contexts for basic block
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [CI,v2,1/3] drm/i915: Precompute can_sagv for each wm level
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: series starting with [CI,v2,1/3] drm/i915: Precompute can_sagv for each wm level
URL : https://patchwork.freedesktop.org/series/83874/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9334 -> Patchwork_18911
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18911/index.html
New tests
---------
New tests have been introduced between CI_DRM_9334 and Patchwork_18911:
### New CI tests (1) ###
* boot:
- Statuses : 5 pass(s)
- Exec time: [0.0] s
Changes
-------
No changes found
Participating hosts (5 -> 5)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9334 -> Patchwork_18911
CI-20190529: 20190529
CI_DRM_9334: 0dac74f48884712184124a106fca2fd8aa3ec4f1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5850: 9748a4a0f93d108955d374a866e60cb962da9b5d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18911: e8020331e37c1dc93c153c5870df669716a63d5a @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
e8020331e37c drm/i915: Remove skl_adjusted_plane_pixel_rate() 0247253652f5 drm/i915: Store plane relative data rate in crtc_state 9f45cefbd3a5 drm/i915: Precompute can_sagv for each wm level
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18911/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx