drm/i915/skl: Correct other-pipe watermark update condition check
Subsystems (2)
PATCH 1/1 drm/i915/skl: Correct other-pipe watermark update condition check
If ddb allocation for planes in current CRTC is changed, that doesn't lead to ddb allocation change for other CRTCs, because our DDB allocation is not dynamic according to plane parameters, ddb is allocated according to number of CRTC enabled, & divided equally among CTRC's.
In current condition check during Watermark calculation, if number of plane/ddb allocation changes for current CRTC, Watermark for other pipes are recalculated. But there is no change in DDB allocation of other pipe so watermark is also not changed, This leads to warning messages. WARN_ON(!wm_changed)
This patch corrects this and check if DDB allocation for pipes is changed, then only recalculate watermarks.
--- drivers/gpu/drm/i915/intel_pm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +5 -7
@@ -3127,14 +3127,12 @@ static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb,struct drm_device *dev = intel_crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;const struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb; -enum pipe pipe = intel_crtc->pipe; - -if (memcmp (new_ddb->plane[pipe], cur_ddb->plane[pipe], -sizeof (new_ddb->plane[pipe]))) -return true; -if (memcmp (&new_ddb->cursor[pipe], &cur_ddb->cursor[pipe], -sizeof (new_ddb->cursor[pipe]))) +/* +* If ddb allocation of pipes chenged, it may require recalculation of +* watermarks +*/ +if (memcmp (new_ddb->pipe, cur_ddb->pipe,sizeof (new_ddb->pipe)))return true;return false;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 32 lines · Mahesh
If ddb allocation for planes in current CRTC is changed, that doesn't lead to ddb allocation change for other CRTCs, because our DDB allocation is not dynamic according to plane parameters, ddb is allocated according to number of CRTC enabled, & divided equally among CTRC's.
In current condition check during Watermark calculation, if number of plane/ddb allocation changes for current CRTC, Watermark for other pipes are recalculated. But there is no change in DDB allocation of other pipe so watermark is also not changed, This leads to warning messages.
WARN_ON(!wm_changed)This patch corrects this and check if DDB allocation for pipes is changed, then only recalculate watermarks.
Signed-off-by Kumar, Mahesh <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-4@@ -3127,14 +3127,12 @@ static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb,struct drm_device *dev = intel_crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;const struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb; -enum pipe pipe = intel_crtc->pipe; - -if (memcmp (new_ddb->plane[pipe], cur_ddb->plane[pipe], -sizeof (new_ddb->plane[pipe])))
drivers/gpu/drm/i915/intel_pm.c static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb, · line 3136
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +5
-3-return true; -if (memcmp (&new_ddb->cursor[pipe], &cur_ddb->cursor[pipe], -sizeof (new_ddb->cursor[pipe]))) +/* +* If ddb allocation of pipes chenged, it may require recalculation of +* watermarks +*/ +if (memcmp (new_ddb->pipe, cur_ddb->pipe,sizeof (new_ddb->pipe)))return true;
Hmm. Yeah we start from the previously calculated values for all pioes, and just rewrite the entry for the current pipe, so doing the memset() over the whole array is fine.
This function looks to have been this way from the start, and supposedly I even reviewed it. Oh well, can't catch everything I guess.
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0return false;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 31 lines · Mahesh
If ddb allocation for planes in current CRTC is changed, that doesn't lead to ddb allocation change for other CRTCs, because our DDB allocation is not dynamic according to plane parameters, ddb is allocated according to number of CRTC enabled, & divided equally among CTRC's.
In current condition check during Watermark calculation, if number of plane/ddb allocation changes for current CRTC, Watermark for other pipes are recalculated. But there is no change in DDB allocation of other pipe so watermark is also not changed, This leads to warning messages.
WARN_ON(!wm_changed)This patch corrects this and check if DDB allocation for pipes is changed, then only recalculate watermarks.
Signed-off-by Kumar, Mahesh <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-4@@ -3127,14 +3127,12 @@ static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb,struct drm_device *dev = intel_crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;const struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb; -enum pipe pipe = intel_crtc->pipe; - -if (memcmp (new_ddb->plane[pipe], cur_ddb->plane[pipe], -sizeof (new_ddb->plane[pipe])))
drivers/gpu/drm/i915/intel_pm.c static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb, · line 3136
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +5
-3-return true; -if (memcmp (&new_ddb->cursor[pipe], &cur_ddb->cursor[pipe], -sizeof (new_ddb->cursor[pipe]))) +/* +* If ddb allocation of pipes chenged, it may require recalculation of +* watermarks +*/ +if (memcmp (new_ddb->pipe, cur_ddb->pipe,sizeof (new_ddb->pipe)))return true;
I still have the cursor code here, this patch needs to be rebased. -Daniel
Quoted 9 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0return false;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 34 lines · Daniel Vetter
Quoted 33 lines · Mahesh
If ddb allocation for planes in current CRTC is changed, that doesn't lead to ddb allocation change for other CRTCs, because our DDB allocation is not dynamic according to plane parameters, ddb is allocated according to number of CRTC enabled, & divided equally among CTRC's.
In current condition check during Watermark calculation, if number of plane/ddb allocation changes for current CRTC, Watermark for other pipes are recalculated. But there is no change in DDB allocation of other pipe so watermark is also not changed, This leads to warning messages.
WARN_ON(!wm_changed)This patch corrects this and check if DDB allocation for pipes is changed, then only recalculate watermarks.
Signed-off-by Kumar, Mahesh <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-5@@ -3127,14 +3127,12 @@ static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb,struct drm_device *dev = intel_crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;const struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb; -enum pipe pipe = intel_crtc->pipe; - -if (memcmp (new_ddb->plane[pipe], cur_ddb->plane[pipe], -sizeof (new_ddb->plane[pipe]))) -return true;
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb, · line 3136
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +5
-2-if (memcmp (&new_ddb->cursor[pipe], &cur_ddb->cursor[pipe], -sizeof (new_ddb->cursor[pipe]))) +/* +* If ddb allocation of pipes chenged, it may require recalculation of +* watermarks +*/ +if (memcmp (new_ddb->pipe, cur_ddb->pipe,sizeof (new_ddb->pipe)))return true;I still have the cursor code here, this patch needs to be rebased.
I suppose you mean you have the other cursor code there, cause this one has it too, just looking a bit different.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 46 lines · Ville Syrjälä
Quoted 34 lines · Daniel Vetter
Quoted 33 lines · Mahesh
If ddb allocation for planes in current CRTC is changed, that doesn't lead to ddb allocation change for other CRTCs, because our DDB allocation is not dynamic according to plane parameters, ddb is allocated according to number of CRTC enabled, & divided equally among CTRC's.
In current condition check during Watermark calculation, if number of plane/ddb allocation changes for current CRTC, Watermark for other pipes are recalculated. But there is no change in DDB allocation of other pipe so watermark is also not changed, This leads to warning messages.
WARN_ON(!wm_changed)This patch corrects this and check if DDB allocation for pipes is changed, then only recalculate watermarks.
Signed-off-by Kumar, Mahesh <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-5@@ -3127,14 +3127,12 @@ static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb,struct drm_device *dev = intel_crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;const struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb; -enum pipe pipe = intel_crtc->pipe; - -if (memcmp (new_ddb->plane[pipe], cur_ddb->plane[pipe], -sizeof (new_ddb->plane[pipe]))) -return true;Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb, · line 3136
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +5
-2-if (memcmp (&new_ddb->cursor[pipe], &cur_ddb->cursor[pipe], -sizeof (new_ddb->cursor[pipe]))) +/* +* If ddb allocation of pipes chenged, it may require recalculation of +* watermarks +*/ +if (memcmp (new_ddb->pipe, cur_ddb->pipe,sizeof (new_ddb->pipe)))return true;I still have the cursor code here, this patch needs to be rebased.
Quoted 2 lines
I suppose you mean you have the other cursor code there, cause this one has it too, just looking a bit different.
Hm yeah right, just shows how little I understand from the wm code details ;-)
Anyway, please rebase since I can't make this one fit without too much risk of me fumbling things.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/skl: Correct other-pipe watermark update condition check (v2)
From: "Kumar, Mahesh" <[email protected]>
If ddb allocation for planes in current CRTC is changed, that doesn't lead to ddb allocation change for other CRTCs, because our DDB allocation is not dynamic according to plane parameters, ddb is allocated according to number of CRTC enabled, & divided equally among CTRC's.
In current condition check during Watermark calculation, if number of plane/ddb allocation changes for current CRTC, Watermark for other pipes are recalculated. But there is no change in DDB allocation of other pipe so watermark is also not changed, This leads to warning messages. WARN_ON(!wm_changed)
This patch corrects this and check if DDB allocation for pipes is changed, then only recalculate watermarks.
v2 (by Matt): Rebased to latest -nightly and fixed a typo
Reviewed-by(v1): Ville Syrjälä <[email protected]>
---
I don't think this solves all the !wm_changed warnings (I still see one during fbdev restore following various igt tests), but it seems like a move in the right direction so I figured I'd go ahead and rebase Mahesh' patch so it can get merged.
drivers/gpu/drm/i915/intel_pm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +5 -7
@@ -3064,14 +3064,12 @@ static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb,struct drm_device *dev = intel_crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;const struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb; -enum pipe pipe = intel_crtc->pipe; - -if (memcmp (new_ddb->plane[pipe], cur_ddb->plane[pipe], -sizeof (new_ddb->plane[pipe]))) -return true; -if (memcmp (&new_ddb->plane[pipe][PLANE_CURSOR ], &cur_ddb->plane[pipe][PLANE_CURSOR ], -sizeof (new_ddb->plane[pipe][PLANE_CURSOR ]))) +/* +* If ddb allocation of pipes changed, it may require recalculation of +* watermarks +*/ +if (memcmp (new_ddb->pipe, cur_ddb->pipe,sizeof (new_ddb->pipe)))return true;return false;
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/skl: Correct other-pipe watermark update condition check (v2)
Yes, it doesn't solve all warnings.
Other than fbdev restore, there is one warning which I faced during DPMS/Hot-plug, which is due to calculation of watermarks twice. Once for first CRTC "Pipe-A" (during which it consider/calculates watermark for other pipe "Pipe-B" as well & stores in structure "intel_crtc->wm.active.skl") & Now in same atomic_commit, when it calculate watermark for second CRTC "Pipe-B" , that time watermark for other-pipe (in this case pipe-A) already have calculated values so it gives !wm_changed warning.
Hoping 2-stage watermark programming will take care of this, as in that case, If I'm not misunderstood final results should be stored after calculation for all pipes.
Regards,
-Mahesh
Quoted 44 lines · Matt Roper
From: "Kumar, Mahesh" <[email protected]>
If ddb allocation for planes in current CRTC is changed, that doesn't lead to ddb allocation change for other CRTCs, because our DDB allocation is not dynamic according to plane parameters, ddb is allocated according to number of CRTC enabled, & divided equally among CTRC's.
In current condition check during Watermark calculation, if number of plane/ddb allocation changes for current CRTC, Watermark for other pipes are recalculated. But there is no change in DDB allocation of other pipe so watermark is also not changed, This leads to warning messages.
WARN_ON(!wm_changed)This patch corrects this and check if DDB allocation for pipes is changed, then only recalculate watermarks.
v2 (by Matt): Rebased to latest -nightly and fixed a typo
Signed-off-by Kumar, Mahesh <[email protected]>Reviewed-by(v1): Ville Syrjälä <[email protected]>
Signed-off-by Matt Roper <[email protected]>---
I don't think this solves all the !wm_changed warnings (I still see one during fbdev restore following various igt tests), but it seems like a move in the right direction so I figured I'd go ahead and rebase Mahesh' patch so it can get merged.drivers/gpu/drm/i915/intel_pm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-5@@ -3064,14 +3064,12 @@ static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb,struct drm_device *dev = intel_crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;const struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb; -enum pipe pipe = intel_crtc->pipe; - -if (memcmp (new_ddb->plane[pipe], cur_ddb->plane[pipe], -sizeof (new_ddb->plane[pipe]))) -return true;
drivers/gpu/drm/i915/intel_pm.c static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb, · line 3075
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +5
-2-if (memcmp (&new_ddb->plane[pipe][PLANE_CURSOR ], &cur_ddb->plane[pipe][PLANE_CURSOR ], -sizeof (new_ddb->plane[pipe][PLANE_CURSOR ]))) +/* +* If ddb allocation of pipes changed, it may require recalculation of +* watermarks +*/ +if (memcmp (new_ddb->pipe, cur_ddb->pipe,sizeof (new_ddb->pipe)))return true;return false;
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH] drm/i915/skl: Correct other-pipe watermark update condition check (v2)
In reply to Matt RoperQuoted 18 lines · Matt Roper
From: "Kumar, Mahesh" <[email protected]>
If ddb allocation for planes in current CRTC is changed, that doesn't lead to ddb allocation change for other CRTCs, because our DDB allocation is not dynamic according to plane parameters, ddb is allocated according to number of CRTC enabled, & divided equally among CTRC's.
In current condition check during Watermark calculation, if number of plane/ddb allocation changes for current CRTC, Watermark for other pipes are recalculated. But there is no change in DDB allocation of other pipe so watermark is also not changed, This leads to warning messages.
WARN_ON(!wm_changed)This patch corrects this and check if DDB allocation for pipes is changed, then only recalculate watermarks.
v2 (by Matt): Rebased to latest -nightly and fixed a typo
Quoted 8 lines
Signed-off-by Kumar, Mahesh <[email protected]>Reviewed-by(v1): Ville Syrjälä <[email protected]>
Signed-off-by Matt Roper <[email protected]>---
I don't think this solves all the !wm_changed warnings (I still see one during fbdev restore following various igt tests), but it seems like a move in the right direction so I figured I'd go ahead and rebase Mahesh' patch so it can get merged.
Merged to cut down on the noise (hopefully ...).
-Daniel
Quoted 35 lines
drivers/gpu/drm/i915/intel_pm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_pm.c +5
-7@@ -3064,14 +3064,12 @@ static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb,struct drm_device *dev = intel_crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;const struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb; -enum pipe pipe = intel_crtc->pipe; - -if (memcmp (new_ddb->plane[pipe], cur_ddb->plane[pipe], -sizeof (new_ddb->plane[pipe]))) -return true; -if (memcmp (&new_ddb->plane[pipe][PLANE_CURSOR ], &cur_ddb->plane[pipe][PLANE_CURSOR ], -sizeof (new_ddb->plane[pipe][PLANE_CURSOR ]))) +/* +* If ddb allocation of pipes changed, it may require recalculation of +* watermarks +*/ +if (memcmp (new_ddb->pipe, cur_ddb->pipe,sizeof (new_ddb->pipe)))return true;return false;Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: drm/i915/skl: Correct other-pipe watermark update condition check (v2)
In reply to Matt RoperHey! I figured I should let you guys know while this fixes all of the issues with normal display connectors, you still get WARN_ON(!wm_changed) warnings if you try using DisplayPort MST, even with this patch.
Cheers,
Lyude
Quoted 54 lines · Matt Roper
From: "Kumar, Mahesh" <[email protected]>
If ddb allocation for planes in current CRTC is changed, that doesn't lead to ddb allocation change for other CRTCs, because our DDB allocation is not dynamic according to plane parameters, ddb is allocated according to number of CRTC enabled, & divided equally among CTRC's.
In current condition check during Watermark calculation, if number of plane/ddb allocation changes for current CRTC, Watermark for other pipes are recalculated. But there is no change in DDB allocation of other pipe so watermark is also not changed, This leads to warning messages.
WARN_ON(!wm_changed)This patch corrects this and check if DDB allocation for pipes is changed, then only recalculate watermarks.
v2 (by Matt): Rebased to latest -nightly and fixed a typo
Signed-off-by Kumar, Mahesh <[email protected]>Reviewed-by(v1): Ville Syrjälä <[email protected]>
Signed-off-by Matt Roper <[email protected]>---
I don't think this solves all the !wm_changed warnings (I still see one during fbdev restore following various igt tests), but it seems like a move in the right direction so I figured I'd go ahead and rebase Mahesh' patch so it can get merged.drivers/gpu/drm/i915/intel_pm.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-5@@ -3064,14 +3064,12 @@ static bool skl_ddb_allocation_changed(const struct skl_ddb_allocation *new_ddb, struct drm_device *dev = intel_crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; const struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb; -enum pipe pipe = intel_crtc->pipe; - -if (memcmp (new_ddb->plane[pipe], cur_ddb->plane[pipe], - sizeof(new_ddb->plane[pipe]))) -return true;drivers/gpu/drm/i915/intel_pm.c +0
-1- if (memcmp(&new_ddb->plane[pipe][PLANE_CURSOR], &cur_ddb-Quoted 1 line
plane[pipe][PLANE_CURSOR],
drivers/gpu/drm/i915/intel_pm.c +2
-1- sizeof(new_ddb->plane[pipe][PLANE_CURSOR]))) +/* +* If ddb allocation of pipes changed, it may require recalculation of
drivers/gpu/drm/i915/intel_pm.c +3
-0+* watermarks +*/ +if (memcmp (new_ddb->pipe, cur_ddb->pipe,sizeof (new_ddb->pipe)))
Quoted 3 lines
return true;
return false;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx