* [PATCH 1/2] drm/i915: Start WM computation from scratch on ILK-BDW
@ 2016-01-14 12:53 ville.syrjala
2016-01-14 12:53 ` [PATCH 2/2] drm/i915: Use the active wm config for merging " ville.syrjala
2016-01-14 14:20 ` ✗ failure: Fi.CI.BAT Patchwork
0 siblings, 2 replies; 9+ messages in thread
From: ville.syrjala @ 2016-01-14 12:53 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
ilk_compute_pipe_wm() assumes as zeroed pipe_wm structure when it
starts. We used to pass such a zeroed struct in, but this got broken
when the pipe_wm structure got embedded in the crtc state.
To fix it without too much fuzz, we need to resort to a memset().
Fixes: 4e0963c7663b ("drm/i915: Calculate pipe watermarks into CRTC state (v3)")
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 9df9e9a22f3c..e9f4e6e7b736 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2317,6 +2317,7 @@ static int ilk_compute_pipe_wm(struct intel_crtc *intel_crtc,
return PTR_ERR(cstate);
pipe_wm = &cstate->wm.optimal.ilk;
+ memset(pipe_wm, 0, sizeof(*pipe_wm));
for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {
ps = drm_atomic_get_plane_state(state,
--
2.4.10
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] drm/i915: Use the active wm config for merging on ILK-BDW
2016-01-14 12:53 [PATCH 1/2] drm/i915: Start WM computation from scratch on ILK-BDW ville.syrjala
@ 2016-01-14 12:53 ` ville.syrjala
2016-01-15 2:37 ` Matt Roper
2016-01-14 14:20 ` ✗ failure: Fi.CI.BAT Patchwork
1 sibling, 1 reply; 9+ messages in thread
From: ville.syrjala @ 2016-01-14 12:53 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
ilk_program_watermarks() is supposed to merge the active watermarks from
all pipes. Thus we need to use the active config too instead of some
precomputed stuff.
Fixes: aa363136866c ("drm/i915: Calculate watermark configuration during atomic check (v2)")
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index e9f4e6e7b736..f44a961183d7 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3680,23 +3680,43 @@ static void skl_update_wm(struct drm_crtc *crtc)
dev_priv->wm.skl_hw = *results;
}
+static void ilk_compute_wm_config(struct drm_device *dev,
+ struct intel_wm_config *config)
+{
+ struct intel_crtc *crtc;
+
+ /* Compute the currently _active_ config */
+ for_each_intel_crtc(dev, crtc) {
+ const struct intel_pipe_wm *wm = &crtc->wm.active.ilk;
+
+ if (!wm->pipe_enabled)
+ continue;
+
+ config->sprites_enabled |= wm->sprites_enabled;
+ config->sprites_scaled |= wm->sprites_scaled;
+ config->num_pipes_active++;
+ }
+}
+
static void ilk_program_watermarks(struct drm_i915_private *dev_priv)
{
struct drm_device *dev = dev_priv->dev;
struct intel_pipe_wm lp_wm_1_2 = {}, lp_wm_5_6 = {}, *best_lp_wm;
struct ilk_wm_maximums max;
- struct intel_wm_config *config = &dev_priv->wm.config;
+ struct intel_wm_config config = {};
struct ilk_wm_values results = {};
enum intel_ddb_partitioning partitioning;
- ilk_compute_wm_maximums(dev, 1, config, INTEL_DDB_PART_1_2, &max);
- ilk_wm_merge(dev, config, &max, &lp_wm_1_2);
+ ilk_compute_wm_config(dev, &config);
+
+ ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_1_2, &max);
+ ilk_wm_merge(dev, &config, &max, &lp_wm_1_2);
/* 5/6 split only in single pipe config on IVB+ */
if (INTEL_INFO(dev)->gen >= 7 &&
- config->num_pipes_active == 1 && config->sprites_enabled) {
- ilk_compute_wm_maximums(dev, 1, config, INTEL_DDB_PART_5_6, &max);
- ilk_wm_merge(dev, config, &max, &lp_wm_5_6);
+ config.num_pipes_active == 1 && config.sprites_enabled) {
+ ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_5_6, &max);
+ ilk_wm_merge(dev, &config, &max, &lp_wm_5_6);
best_lp_wm = ilk_find_best_result(dev, &lp_wm_1_2, &lp_wm_5_6);
} else {
--
2.4.10
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread
* ✗ failure: Fi.CI.BAT
2016-01-14 12:53 [PATCH 1/2] drm/i915: Start WM computation from scratch on ILK-BDW ville.syrjala
2016-01-14 12:53 ` [PATCH 2/2] drm/i915: Use the active wm config for merging " ville.syrjala
@ 2016-01-14 14:20 ` Patchwork
2016-01-14 14:29 ` Ville Syrjälä
1 sibling, 1 reply; 9+ messages in thread
From: Patchwork @ 2016-01-14 14:20 UTC (permalink / raw)
To: ville.syrjala; +Cc: intel-gfx
== Summary ==
Built on 8fb2feecca499d11e104264071ac55e273e23af5 drm-intel-nightly: 2016y-01m-14d-13h-06m-44s UTC integration manifest
Test gem_basic:
Subgroup create-close:
pass -> DMESG-WARN (skl-i7k-2)
Test gem_cpu_reloc:
Subgroup basic:
pass -> DMESG-FAIL (skl-i7k-2)
Test gem_ctx_param_basic:
Subgroup basic:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup invalid-param-set:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup non-root-set-no-zeromap:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup root-set-no-zeromap-disabled:
pass -> DMESG-WARN (skl-i7k-2)
Test gem_mmap:
Subgroup basic:
pass -> DMESG-WARN (skl-i7k-2)
Test gem_mmap_gtt:
Subgroup basic-read:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup basic-write:
pass -> DMESG-WARN (skl-i7k-2)
Test gem_storedw_loop:
Subgroup basic-render:
dmesg-warn -> PASS (skl-i5k-2) UNSTABLE
dmesg-warn -> PASS (bdw-nuci7)
dmesg-warn -> PASS (skl-i7k-2) UNSTABLE
Test kms_addfb_basic:
Subgroup addfb25-modifier-no-flag:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup addfb25-x-tiled-mismatch:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup addfb25-yf-tiled:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup bad-pitch-1024:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup bad-pitch-63:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup bad-pitch-999:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup clobberred-modifier:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup too-high:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup too-wide:
pass -> DMESG-WARN (skl-i7k-2)
Subgroup unused-offsets:
pass -> DMESG-WARN (skl-i7k-2)
Test kms_flip:
Subgroup basic-plain-flip:
pass -> DMESG-FAIL (skl-i7k-2)
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a-frame-sequence:
pass -> DMESG-FAIL (skl-i7k-2)
Subgroup read-crc-pipe-b-frame-sequence:
pass -> DMESG-FAIL (skl-i7k-2)
Test prime_self_import:
Subgroup basic-with_two_bos:
pass -> DMESG-WARN (skl-i7k-2)
bdw-nuci7 total:138 pass:129 dwarn:0 dfail:0 fail:0 skip:9
bdw-ultra total:138 pass:131 dwarn:1 dfail:0 fail:0 skip:6
bsw-nuc-2 total:141 pass:115 dwarn:2 dfail:0 fail:0 skip:24
hsw-brixbox total:141 pass:134 dwarn:0 dfail:0 fail:0 skip:7
hsw-gt2 total:141 pass:137 dwarn:0 dfail:0 fail:0 skip:4
ilk-hp8440p total:141 pass:101 dwarn:3 dfail:0 fail:0 skip:37
ivb-t430s total:135 pass:122 dwarn:3 dfail:4 fail:0 skip:6
skl-i5k-2 total:141 pass:132 dwarn:1 dfail:0 fail:0 skip:8
skl-i7k-2 total:141 pass:108 dwarn:20 dfail:4 fail:0 skip:8
snb-dellxps total:141 pass:122 dwarn:5 dfail:0 fail:0 skip:14
snb-x220t total:141 pass:122 dwarn:5 dfail:0 fail:1 skip:13
Results at /archive/results/CI_IGT_test/Patchwork_1187/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: ✗ failure: Fi.CI.BAT
2016-01-14 14:20 ` ✗ failure: Fi.CI.BAT Patchwork
@ 2016-01-14 14:29 ` Ville Syrjälä
2016-01-19 13:58 ` Daniel Vetter
0 siblings, 1 reply; 9+ messages in thread
From: Ville Syrjälä @ 2016-01-14 14:29 UTC (permalink / raw)
To: Patchwork; +Cc: intel-gfx
On Thu, Jan 14, 2016 at 02:20:40PM -0000, Patchwork wrote:
> == Summary ==
>
> Built on 8fb2feecca499d11e104264071ac55e273e23af5 drm-intel-nightly: 2016y-01m-14d-13h-06m-44s UTC integration manifest
>
> Test gem_basic:
> Subgroup create-close:
> pass -> DMESG-WARN (skl-i7k-2)
> Test gem_cpu_reloc:
> Subgroup basic:
> pass -> DMESG-FAIL (skl-i7k-2)
> Test gem_ctx_param_basic:
> Subgroup basic:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup invalid-param-set:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup non-root-set-no-zeromap:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup root-set-no-zeromap-disabled:
> pass -> DMESG-WARN (skl-i7k-2)
> Test gem_mmap:
> Subgroup basic:
> pass -> DMESG-WARN (skl-i7k-2)
> Test gem_mmap_gtt:
> Subgroup basic-read:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup basic-write:
> pass -> DMESG-WARN (skl-i7k-2)
> Test gem_storedw_loop:
> Subgroup basic-render:
> dmesg-warn -> PASS (skl-i5k-2) UNSTABLE
> dmesg-warn -> PASS (bdw-nuci7)
> dmesg-warn -> PASS (skl-i7k-2) UNSTABLE
> Test kms_addfb_basic:
> Subgroup addfb25-modifier-no-flag:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup addfb25-x-tiled-mismatch:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup addfb25-yf-tiled:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup bad-pitch-1024:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup bad-pitch-63:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup bad-pitch-999:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup clobberred-modifier:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup too-high:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup too-wide:
> pass -> DMESG-WARN (skl-i7k-2)
> Subgroup unused-offsets:
> pass -> DMESG-WARN (skl-i7k-2)
> Test kms_flip:
> Subgroup basic-plain-flip:
> pass -> DMESG-FAIL (skl-i7k-2)
> Test kms_pipe_crc_basic:
> Subgroup nonblocking-crc-pipe-a-frame-sequence:
> pass -> DMESG-FAIL (skl-i7k-2)
> Subgroup read-crc-pipe-b-frame-sequence:
> pass -> DMESG-FAIL (skl-i7k-2)
> Test prime_self_import:
> Subgroup basic-with_two_bos:
> pass -> DMESG-WARN (skl-i7k-2)
Looks like the GPU died or something on that skl. Can't imagine it being related
to watermark patches.
Unfortunately these didn't cure the recent underrun regressions from
the ilk-ivb machines. So seems like there's something more busted
somewhere.
>
> bdw-nuci7 total:138 pass:129 dwarn:0 dfail:0 fail:0 skip:9
> bdw-ultra total:138 pass:131 dwarn:1 dfail:0 fail:0 skip:6
> bsw-nuc-2 total:141 pass:115 dwarn:2 dfail:0 fail:0 skip:24
> hsw-brixbox total:141 pass:134 dwarn:0 dfail:0 fail:0 skip:7
> hsw-gt2 total:141 pass:137 dwarn:0 dfail:0 fail:0 skip:4
> ilk-hp8440p total:141 pass:101 dwarn:3 dfail:0 fail:0 skip:37
> ivb-t430s total:135 pass:122 dwarn:3 dfail:4 fail:0 skip:6
> skl-i5k-2 total:141 pass:132 dwarn:1 dfail:0 fail:0 skip:8
> skl-i7k-2 total:141 pass:108 dwarn:20 dfail:4 fail:0 skip:8
> snb-dellxps total:141 pass:122 dwarn:5 dfail:0 fail:0 skip:14
> snb-x220t total:141 pass:122 dwarn:5 dfail:0 fail:1 skip:13
>
> Results at /archive/results/CI_IGT_test/Patchwork_1187/
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] drm/i915: Use the active wm config for merging on ILK-BDW
2016-01-14 12:53 ` [PATCH 2/2] drm/i915: Use the active wm config for merging " ville.syrjala
@ 2016-01-15 2:37 ` Matt Roper
2016-01-15 19:03 ` Ville Syrjälä
0 siblings, 1 reply; 9+ messages in thread
From: Matt Roper @ 2016-01-15 2:37 UTC (permalink / raw)
To: ville.syrjala; +Cc: intel-gfx
On Thu, Jan 14, 2016 at 02:53:35PM +0200, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> ilk_program_watermarks() is supposed to merge the active watermarks from
> all pipes. Thus we need to use the active config too instead of some
> precomputed stuff.
So to clarify, the bug you're fixing here would be if we have racing
commits that operate on disjoint sets of CRTC's; in that case the second
one that actually gets into wm_mutex will fail to see the config changes
made by the first commit, right?
Seems like we could go ahead and remove dev_priv->wm.config (and
calc_watermark_data() that builds it) since it's not actually doing us
any good. Although it's probably fine to hold that off to a subsequent
patch.
Both of your patches are
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
CI results do report SKL failures, but those are clearly bogus since SKL
doesn't even run any of the functions that you're changing in these two
patches; as you noted, it looks more like the machine had some kind of
bizarre hardware failure that was unrelated to the patchset. The other
results look clean. Given that, I've gone ahead and pushed your patches
to dinq. Thanks!
Matt
>
> Fixes: aa363136866c ("drm/i915: Calculate watermark configuration during atomic check (v2)")
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 32 ++++++++++++++++++++++++++------
> 1 file changed, 26 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index e9f4e6e7b736..f44a961183d7 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3680,23 +3680,43 @@ static void skl_update_wm(struct drm_crtc *crtc)
> dev_priv->wm.skl_hw = *results;
> }
>
> +static void ilk_compute_wm_config(struct drm_device *dev,
> + struct intel_wm_config *config)
> +{
> + struct intel_crtc *crtc;
> +
> + /* Compute the currently _active_ config */
> + for_each_intel_crtc(dev, crtc) {
> + const struct intel_pipe_wm *wm = &crtc->wm.active.ilk;
> +
> + if (!wm->pipe_enabled)
> + continue;
> +
> + config->sprites_enabled |= wm->sprites_enabled;
> + config->sprites_scaled |= wm->sprites_scaled;
> + config->num_pipes_active++;
> + }
> +}
> +
> static void ilk_program_watermarks(struct drm_i915_private *dev_priv)
> {
> struct drm_device *dev = dev_priv->dev;
> struct intel_pipe_wm lp_wm_1_2 = {}, lp_wm_5_6 = {}, *best_lp_wm;
> struct ilk_wm_maximums max;
> - struct intel_wm_config *config = &dev_priv->wm.config;
> + struct intel_wm_config config = {};
> struct ilk_wm_values results = {};
> enum intel_ddb_partitioning partitioning;
>
> - ilk_compute_wm_maximums(dev, 1, config, INTEL_DDB_PART_1_2, &max);
> - ilk_wm_merge(dev, config, &max, &lp_wm_1_2);
> + ilk_compute_wm_config(dev, &config);
> +
> + ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_1_2, &max);
> + ilk_wm_merge(dev, &config, &max, &lp_wm_1_2);
>
> /* 5/6 split only in single pipe config on IVB+ */
> if (INTEL_INFO(dev)->gen >= 7 &&
> - config->num_pipes_active == 1 && config->sprites_enabled) {
> - ilk_compute_wm_maximums(dev, 1, config, INTEL_DDB_PART_5_6, &max);
> - ilk_wm_merge(dev, config, &max, &lp_wm_5_6);
> + config.num_pipes_active == 1 && config.sprites_enabled) {
> + ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_5_6, &max);
> + ilk_wm_merge(dev, &config, &max, &lp_wm_5_6);
>
> best_lp_wm = ilk_find_best_result(dev, &lp_wm_1_2, &lp_wm_5_6);
> } else {
> --
> 2.4.10
>
--
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] drm/i915: Use the active wm config for merging on ILK-BDW
2016-01-15 2:37 ` Matt Roper
@ 2016-01-15 19:03 ` Ville Syrjälä
0 siblings, 0 replies; 9+ messages in thread
From: Ville Syrjälä @ 2016-01-15 19:03 UTC (permalink / raw)
To: Matt Roper; +Cc: intel-gfx
On Thu, Jan 14, 2016 at 06:37:32PM -0800, Matt Roper wrote:
> On Thu, Jan 14, 2016 at 02:53:35PM +0200, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > ilk_program_watermarks() is supposed to merge the active watermarks from
> > all pipes. Thus we need to use the active config too instead of some
> > precomputed stuff.
>
> So to clarify, the bug you're fixing here would be if we have racing
> commits that operate on disjoint sets of CRTC's; in that case the second
> one that actually gets into wm_mutex will fail to see the config changes
> made by the first commit, right?
That, or I suppose cases where the intermediate and optimal watermarks
have a different idea about the sprite enabled/scaled flags. I assume
what it was doing is picking those flags always based on the optimal wms
even when programming the intermedidate wms.
>
> Seems like we could go ahead and remove dev_priv->wm.config (and
> calc_watermark_data() that builds it) since it's not actually doing us
> any good. Although it's probably fine to hold that off to a subsequent
> patch.
IIRC I was a reference to that stuff in the SKL code too, so I didn't bother
trying to kill it without knowing what it was doing. And I was too lazy to
take a deeper look at the code right now.
>
> Both of your patches are
>
> Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
>
> CI results do report SKL failures, but those are clearly bogus since SKL
> doesn't even run any of the functions that you're changing in these two
> patches; as you noted, it looks more like the machine had some kind of
> bizarre hardware failure that was unrelated to the patchset. The other
> results look clean. Given that, I've gone ahead and pushed your patches
> to dinq. Thanks!
Cheers.
>
>
> Matt
>
>
> >
> > Fixes: aa363136866c ("drm/i915: Calculate watermark configuration during atomic check (v2)")
> > Cc: Matt Roper <matthew.d.roper@intel.com>
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_pm.c | 32 ++++++++++++++++++++++++++------
> > 1 file changed, 26 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index e9f4e6e7b736..f44a961183d7 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -3680,23 +3680,43 @@ static void skl_update_wm(struct drm_crtc *crtc)
> > dev_priv->wm.skl_hw = *results;
> > }
> >
> > +static void ilk_compute_wm_config(struct drm_device *dev,
> > + struct intel_wm_config *config)
> > +{
> > + struct intel_crtc *crtc;
> > +
> > + /* Compute the currently _active_ config */
> > + for_each_intel_crtc(dev, crtc) {
> > + const struct intel_pipe_wm *wm = &crtc->wm.active.ilk;
> > +
> > + if (!wm->pipe_enabled)
> > + continue;
> > +
> > + config->sprites_enabled |= wm->sprites_enabled;
> > + config->sprites_scaled |= wm->sprites_scaled;
> > + config->num_pipes_active++;
> > + }
> > +}
> > +
> > static void ilk_program_watermarks(struct drm_i915_private *dev_priv)
> > {
> > struct drm_device *dev = dev_priv->dev;
> > struct intel_pipe_wm lp_wm_1_2 = {}, lp_wm_5_6 = {}, *best_lp_wm;
> > struct ilk_wm_maximums max;
> > - struct intel_wm_config *config = &dev_priv->wm.config;
> > + struct intel_wm_config config = {};
> > struct ilk_wm_values results = {};
> > enum intel_ddb_partitioning partitioning;
> >
> > - ilk_compute_wm_maximums(dev, 1, config, INTEL_DDB_PART_1_2, &max);
> > - ilk_wm_merge(dev, config, &max, &lp_wm_1_2);
> > + ilk_compute_wm_config(dev, &config);
> > +
> > + ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_1_2, &max);
> > + ilk_wm_merge(dev, &config, &max, &lp_wm_1_2);
> >
> > /* 5/6 split only in single pipe config on IVB+ */
> > if (INTEL_INFO(dev)->gen >= 7 &&
> > - config->num_pipes_active == 1 && config->sprites_enabled) {
> > - ilk_compute_wm_maximums(dev, 1, config, INTEL_DDB_PART_5_6, &max);
> > - ilk_wm_merge(dev, config, &max, &lp_wm_5_6);
> > + config.num_pipes_active == 1 && config.sprites_enabled) {
> > + ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_5_6, &max);
> > + ilk_wm_merge(dev, &config, &max, &lp_wm_5_6);
> >
> > best_lp_wm = ilk_find_best_result(dev, &lp_wm_1_2, &lp_wm_5_6);
> > } else {
> > --
> > 2.4.10
> >
>
> --
> Matt Roper
> Graphics Software Engineer
> IoTG Platform Enabling & Development
> Intel Corporation
> (916) 356-2795
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: ✗ failure: Fi.CI.BAT
2016-01-14 14:29 ` Ville Syrjälä
@ 2016-01-19 13:58 ` Daniel Vetter
2016-01-19 14:09 ` Ville Syrjälä
0 siblings, 1 reply; 9+ messages in thread
From: Daniel Vetter @ 2016-01-19 13:58 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
On Thu, Jan 14, 2016 at 04:29:14PM +0200, Ville Syrjälä wrote:
> On Thu, Jan 14, 2016 at 02:20:40PM -0000, Patchwork wrote:
> > == Summary ==
> >
> > Built on 8fb2feecca499d11e104264071ac55e273e23af5 drm-intel-nightly: 2016y-01m-14d-13h-06m-44s UTC integration manifest
> >
> > Test gem_basic:
> > Subgroup create-close:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Test gem_cpu_reloc:
> > Subgroup basic:
> > pass -> DMESG-FAIL (skl-i7k-2)
> > Test gem_ctx_param_basic:
> > Subgroup basic:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup invalid-param-set:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup non-root-set-no-zeromap:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup root-set-no-zeromap-disabled:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Test gem_mmap:
> > Subgroup basic:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Test gem_mmap_gtt:
> > Subgroup basic-read:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup basic-write:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Test gem_storedw_loop:
> > Subgroup basic-render:
> > dmesg-warn -> PASS (skl-i5k-2) UNSTABLE
> > dmesg-warn -> PASS (bdw-nuci7)
> > dmesg-warn -> PASS (skl-i7k-2) UNSTABLE
> > Test kms_addfb_basic:
> > Subgroup addfb25-modifier-no-flag:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup addfb25-x-tiled-mismatch:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup addfb25-yf-tiled:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup bad-pitch-1024:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup bad-pitch-63:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup bad-pitch-999:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup clobberred-modifier:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup too-high:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup too-wide:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Subgroup unused-offsets:
> > pass -> DMESG-WARN (skl-i7k-2)
> > Test kms_flip:
> > Subgroup basic-plain-flip:
> > pass -> DMESG-FAIL (skl-i7k-2)
> > Test kms_pipe_crc_basic:
> > Subgroup nonblocking-crc-pipe-a-frame-sequence:
> > pass -> DMESG-FAIL (skl-i7k-2)
> > Subgroup read-crc-pipe-b-frame-sequence:
> > pass -> DMESG-FAIL (skl-i7k-2)
> > Test prime_self_import:
> > Subgroup basic-with_two_bos:
> > pass -> DMESG-WARN (skl-i7k-2)
>
> Looks like the GPU died or something on that skl. Can't imagine it being related
> to watermark patches.
Mika created a bugzilla for this since this isn't the first time this
happened. We have 2 instances of a failure with matching syptoms in normal
-nightly CI runs already:
https://bugs.freedesktop.org/show_bug.cgi?id=93768
In the future if you have a case where an entire machine dies it's useful
to look at the machine history. That shows you the results for the last 50
runs on only that machine for any testcase where results changed. That
helps in figuring out whether there's something wrong with that machine,
or whether there might indeed be trouble with your patch set.
Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: ✗ failure: Fi.CI.BAT
2016-01-19 13:58 ` Daniel Vetter
@ 2016-01-19 14:09 ` Ville Syrjälä
2016-01-19 16:43 ` Daniel Vetter
0 siblings, 1 reply; 9+ messages in thread
From: Ville Syrjälä @ 2016-01-19 14:09 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Sarvela, Tomi P, intel-gfx
On Tue, Jan 19, 2016 at 02:58:14PM +0100, Daniel Vetter wrote:
> On Thu, Jan 14, 2016 at 04:29:14PM +0200, Ville Syrjälä wrote:
> > On Thu, Jan 14, 2016 at 02:20:40PM -0000, Patchwork wrote:
> > > == Summary ==
> > >
> > > Built on 8fb2feecca499d11e104264071ac55e273e23af5 drm-intel-nightly: 2016y-01m-14d-13h-06m-44s UTC integration manifest
> > >
> > > Test gem_basic:
> > > Subgroup create-close:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Test gem_cpu_reloc:
> > > Subgroup basic:
> > > pass -> DMESG-FAIL (skl-i7k-2)
> > > Test gem_ctx_param_basic:
> > > Subgroup basic:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup invalid-param-set:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup non-root-set-no-zeromap:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup root-set-no-zeromap-disabled:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Test gem_mmap:
> > > Subgroup basic:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Test gem_mmap_gtt:
> > > Subgroup basic-read:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup basic-write:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Test gem_storedw_loop:
> > > Subgroup basic-render:
> > > dmesg-warn -> PASS (skl-i5k-2) UNSTABLE
> > > dmesg-warn -> PASS (bdw-nuci7)
> > > dmesg-warn -> PASS (skl-i7k-2) UNSTABLE
> > > Test kms_addfb_basic:
> > > Subgroup addfb25-modifier-no-flag:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup addfb25-x-tiled-mismatch:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup addfb25-yf-tiled:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup bad-pitch-1024:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup bad-pitch-63:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup bad-pitch-999:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup clobberred-modifier:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup too-high:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup too-wide:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Subgroup unused-offsets:
> > > pass -> DMESG-WARN (skl-i7k-2)
> > > Test kms_flip:
> > > Subgroup basic-plain-flip:
> > > pass -> DMESG-FAIL (skl-i7k-2)
> > > Test kms_pipe_crc_basic:
> > > Subgroup nonblocking-crc-pipe-a-frame-sequence:
> > > pass -> DMESG-FAIL (skl-i7k-2)
> > > Subgroup read-crc-pipe-b-frame-sequence:
> > > pass -> DMESG-FAIL (skl-i7k-2)
> > > Test prime_self_import:
> > > Subgroup basic-with_two_bos:
> > > pass -> DMESG-WARN (skl-i7k-2)
> >
> > Looks like the GPU died or something on that skl. Can't imagine it being related
> > to watermark patches.
>
> Mika created a bugzilla for this since this isn't the first time this
> happened. We have 2 instances of a failure with matching syptoms in normal
> -nightly CI runs already:
>
> https://bugs.freedesktop.org/show_bug.cgi?id=93768
>
> In the future if you have a case where an entire machine dies it's useful
> to look at the machine history. That shows you the results for the last 50
> runs on only that machine for any testcase where results changed. That
> helps in figuring out whether there's something wrong with that machine,
> or whether there might indeed be trouble with your patch set.
Sadly the link to the machine history is busted for patchwork CI results,
so doing that is somewhat more tedious than it should be. Might be a
good idea to fix all the links once and for all. Cc:ing Tomi...
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: ✗ failure: Fi.CI.BAT
2016-01-19 14:09 ` Ville Syrjälä
@ 2016-01-19 16:43 ` Daniel Vetter
0 siblings, 0 replies; 9+ messages in thread
From: Daniel Vetter @ 2016-01-19 16:43 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: Sarvela, Tomi P, intel-gfx
On Tue, Jan 19, 2016 at 04:09:48PM +0200, Ville Syrjälä wrote:
> On Tue, Jan 19, 2016 at 02:58:14PM +0100, Daniel Vetter wrote:
> > On Thu, Jan 14, 2016 at 04:29:14PM +0200, Ville Syrjälä wrote:
> > > On Thu, Jan 14, 2016 at 02:20:40PM -0000, Patchwork wrote:
> > > > == Summary ==
> > > >
> > > > Built on 8fb2feecca499d11e104264071ac55e273e23af5 drm-intel-nightly: 2016y-01m-14d-13h-06m-44s UTC integration manifest
> > > >
> > > > Test gem_basic:
> > > > Subgroup create-close:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Test gem_cpu_reloc:
> > > > Subgroup basic:
> > > > pass -> DMESG-FAIL (skl-i7k-2)
> > > > Test gem_ctx_param_basic:
> > > > Subgroup basic:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup invalid-param-set:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup non-root-set-no-zeromap:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup root-set-no-zeromap-disabled:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Test gem_mmap:
> > > > Subgroup basic:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Test gem_mmap_gtt:
> > > > Subgroup basic-read:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup basic-write:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Test gem_storedw_loop:
> > > > Subgroup basic-render:
> > > > dmesg-warn -> PASS (skl-i5k-2) UNSTABLE
> > > > dmesg-warn -> PASS (bdw-nuci7)
> > > > dmesg-warn -> PASS (skl-i7k-2) UNSTABLE
> > > > Test kms_addfb_basic:
> > > > Subgroup addfb25-modifier-no-flag:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup addfb25-x-tiled-mismatch:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup addfb25-yf-tiled:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup bad-pitch-1024:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup bad-pitch-63:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup bad-pitch-999:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup clobberred-modifier:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup too-high:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup too-wide:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Subgroup unused-offsets:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > > > Test kms_flip:
> > > > Subgroup basic-plain-flip:
> > > > pass -> DMESG-FAIL (skl-i7k-2)
> > > > Test kms_pipe_crc_basic:
> > > > Subgroup nonblocking-crc-pipe-a-frame-sequence:
> > > > pass -> DMESG-FAIL (skl-i7k-2)
> > > > Subgroup read-crc-pipe-b-frame-sequence:
> > > > pass -> DMESG-FAIL (skl-i7k-2)
> > > > Test prime_self_import:
> > > > Subgroup basic-with_two_bos:
> > > > pass -> DMESG-WARN (skl-i7k-2)
> > >
> > > Looks like the GPU died or something on that skl. Can't imagine it being related
> > > to watermark patches.
> >
> > Mika created a bugzilla for this since this isn't the first time this
> > happened. We have 2 instances of a failure with matching syptoms in normal
> > -nightly CI runs already:
> >
> > https://bugs.freedesktop.org/show_bug.cgi?id=93768
> >
> > In the future if you have a case where an entire machine dies it's useful
> > to look at the machine history. That shows you the results for the last 50
> > runs on only that machine for any testcase where results changed. That
> > helps in figuring out whether there's something wrong with that machine,
> > or whether there might indeed be trouble with your patch set.
>
> Sadly the link to the machine history is busted for patchwork CI results,
> so doing that is somewhat more tedious than it should be. Might be a
> good idea to fix all the links once and for all. Cc:ing Tomi...
Yeah it only works in the master CI overview, both for the long-term view
for machines and for testcases.
I'll paste you the link to the overall howto on the internal wiki page in
private.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-01-19 16:43 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-14 12:53 [PATCH 1/2] drm/i915: Start WM computation from scratch on ILK-BDW ville.syrjala
2016-01-14 12:53 ` [PATCH 2/2] drm/i915: Use the active wm config for merging " ville.syrjala
2016-01-15 2:37 ` Matt Roper
2016-01-15 19:03 ` Ville Syrjälä
2016-01-14 14:20 ` ✗ failure: Fi.CI.BAT Patchwork
2016-01-14 14:29 ` Ville Syrjälä
2016-01-19 13:58 ` Daniel Vetter
2016-01-19 14:09 ` Ville Syrjälä
2016-01-19 16:43 ` Daniel Vetter
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.