1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c
index 1ae9dc8d260d..35c4dabb0c0c 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c
@@ -53,6 +53,14 @@ struct mdp5_hw_pipe *mdp5_pipe_assign(struct drm_atomic_state *s,
                 if (caps & ~cur->caps)
                         continue;
 
+                /*
+                 * don't assign a cursor pipe to a plane that isn't going to
+                 * be used as a cursor
+                 */
+                if (cur->caps & MDP_PIPE_CAP_CURSOR &&
+                                plane->type != DRM_PLANE_TYPE_CURSOR)
+                        continue;
+
                 /* possible candidate, take the one with the
                  * fewest unneeded caps bits set:
                  */