Merge tag 'drm-misc-fixes-2017-11-13' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / msm / mdp / mdp5 / mdp5_pipe.c

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c
index 2bfac371268532e501066e252feba41a7af193ea..ff52c49095f906f7f8baa7b44a09292c3509bd1e 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c
@@ -17,19 +17,20 @@
 
 #include "mdp5_kms.h"
 
-struct mdp5_hw_pipe *mdp5_pipe_assign(struct drm_atomic_state *s,
-               struct drm_plane *plane, uint32_t caps, uint32_t blkcfg)
+int mdp5_pipe_assign(struct drm_atomic_state *s, struct drm_plane *plane,
+                    uint32_t caps, uint32_t blkcfg,
+                    struct mdp5_hw_pipe **hwpipe,
+                    struct mdp5_hw_pipe **r_hwpipe)
 {
        struct msm_drm_private *priv = s->dev->dev_private;
        struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(priv->kms));
        struct mdp5_state *state;
        struct mdp5_hw_pipe_state *old_state, *new_state;
-       struct mdp5_hw_pipe *hwpipe = NULL;
-       int i;
+       int i, j;
 
        state = mdp5_get_state(s);
        if (IS_ERR(state))
-               return ERR_CAST(state);
+               return PTR_ERR(state);
 
        /* grab old_state after mdp5_get_state(), since now we hold lock: */
        old_state = &mdp5_kms->state->hwpipe;
@@ -64,31 +65,67 @@ struct mdp5_hw_pipe *mdp5_pipe_assign(struct drm_atomic_state *s,
                /* possible candidate, take the one with the
                 * fewest unneeded caps bits set:
                 */
-               if (!hwpipe || (hweight_long(cur->caps & ~caps) <
-                               hweight_long(hwpipe->caps & ~caps)))
-                       hwpipe = cur;
+               if (!(*hwpipe) || (hweight_long(cur->caps & ~caps) <
+                                  hweight_long((*hwpipe)->caps & ~caps))) {
+                       bool r_found = false;
+
+                       if (r_hwpipe) {
+                               for (j = i + 1; j < mdp5_kms->num_hwpipes;
+                                    j++) {
+                                       struct mdp5_hw_pipe *r_cur =
+                                                       mdp5_kms->hwpipes[j];
+
+                                       /* reject different types of hwpipes */
+                                       if (r_cur->caps != cur->caps)
+                                               continue;
+
+                                       /* respect priority, eg. VIG0 > VIG1 */
+                                       if (cur->pipe > r_cur->pipe)
+                                               continue;
+
+                                       *r_hwpipe = r_cur;
+                                       r_found = true;
+                                       break;
+                               }
+                       }
+
+                       if (!r_hwpipe || r_found)
+                               *hwpipe = cur;
+               }
        }
 
-       if (!hwpipe)
-               return ERR_PTR(-ENOMEM);
+       if (!(*hwpipe))
+               return -ENOMEM;
+
+       if (r_hwpipe && !(*r_hwpipe))
+               return -ENOMEM;
 
        if (mdp5_kms->smp) {
                int ret;
 
-               DBG("%s: alloc SMP blocks", hwpipe->name);
+               /* We don't support SMP and 2 hwpipes/plane together */
+               WARN_ON(r_hwpipe);
+
+               DBG("%s: alloc SMP blocks", (*hwpipe)->name);
                ret = mdp5_smp_assign(mdp5_kms->smp, &state->smp,
-                               hwpipe->pipe, blkcfg);
+                               (*hwpipe)->pipe, blkcfg);
                if (ret)
-                       return ERR_PTR(-ENOMEM);
+                       return -ENOMEM;
 
-               hwpipe->blkcfg = blkcfg;
+               (*hwpipe)->blkcfg = blkcfg;
        }
 
        DBG("%s: assign to plane %s for caps %x",
-                       hwpipe->name, plane->name, caps);
-       new_state->hwpipe_to_plane[hwpipe->idx] = plane;
+                       (*hwpipe)->name, plane->name, caps);
+       new_state->hwpipe_to_plane[(*hwpipe)->idx] = plane;
 
-       return hwpipe;
+       if (r_hwpipe) {
+               DBG("%s: assign to right of plane %s for caps %x",
+                   (*r_hwpipe)->name, plane->name, caps);
+               new_state->hwpipe_to_plane[(*r_hwpipe)->idx] = plane;
+       }
+
+       return 0;
 }
 
 void mdp5_pipe_release(struct drm_atomic_state *s, struct mdp5_hw_pipe *hwpipe)