summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihail Atanassov <Mihail.Atanassov@arm.com>2019-10-10 10:30:07 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-10 11:34:18 +0100
commit23f5932abd1c8f3066007d92192debb202b512aa (patch)
tree4b08b274b50e53b7c897bb382946e9114beec09e
parent10066e6c21dd4dc8231c8bdd1ca464b49322bb75 (diff)
drm/komeda: Don't flush inactive pipes
[ Upstream commit b88639b8e3808c948169af390bd7e84e909bde8d ] HW doesn't allow flushing inactive pipes and raises an MERR interrupt if you try to do so. Stop triggering the MERR interrupt in the middle of a commit by calling drm_atomic_helper_commit_planes with the ACTIVE_ONLY flag. Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> Signed-off-by: Mihail Atanassov <mihail.atanassov@arm.com> Link: https://patchwork.freedesktop.org/patch/msgid/20191010102950.56253-1-mihail.atanassov@arm.com Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/gpu/drm/arm/display/komeda/komeda_kms.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
index 69d9e26c60c8..9e110d51dc1f 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
@@ -85,7 +85,8 @@ static void komeda_kms_commit_tail(struct drm_atomic_state *old_state)
drm_atomic_helper_commit_modeset_disables(dev, old_state);
- drm_atomic_helper_commit_planes(dev, old_state, 0);
+ drm_atomic_helper_commit_planes(dev, old_state,
+ DRM_PLANE_COMMIT_ACTIVE_ONLY);
drm_atomic_helper_commit_modeset_enables(dev, old_state);