| Message ID | ebc6aef3f5cd7b9b9bb25ceff9e86e742390cfca.1521121707.git.digetx@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] drm/tegra: plane: Keep 'dependent' blending state of unaffected planes | expand |
On Thu, Mar 15, 2018 at 05:24:31PM +0300, Dmitry Osipenko wrote: > This way new state takes into account the current state of unaffected > (by the atomic commit) planes. > > Signed-off-by: Dmitry Osipenko <digetx@gmail.com> > --- > > v2: Dropped unrelated 'cleanup' changes and fixed > s/state->dependent[i]/state->dependent[index]/ typo. > > drivers/gpu/drm/tegra/plane.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) I've amended the commit in drm/tegra/fixes to match this v2. Thanks, Thierry
diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c index fc37dcf8c458..0784422cc5a2 100644 --- a/drivers/gpu/drm/tegra/plane.c +++ b/drivers/gpu/drm/tegra/plane.c @@ -315,9 +315,6 @@ void tegra_plane_check_dependent(struct tegra_plane *tegra, unsigned int zpos[2]; unsigned int i; - for (i = 0; i < 3; i++) - state->dependent[i] = false; - for (i = 0; i < 2; i++) zpos[i] = 0; @@ -331,6 +328,8 @@ void tegra_plane_check_dependent(struct tegra_plane *tegra, index = tegra_plane_get_overlap_index(tegra, p); + state->dependent[index] = false; + /* * If any of the other planes is on top of this plane and uses * a format with an alpha component, mark this plane as being
This way new state takes into account the current state of unaffected (by the atomic commit) planes. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- v2: Dropped unrelated 'cleanup' changes and fixed s/state->dependent[i]/state->dependent[index]/ typo. drivers/gpu/drm/tegra/plane.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)