drm/msm/mdp5: drop attached planes table

Simplify things a bit for atomic, gets rid of some bookkeeping, and
makes the code cleaner.

Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
index 12414472d55affb927aaea3c1511d4772eebc115..b7b32c47fd71d5e4bfad58a937d5b0c4717c487f 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@ -25,7 +25,6 @@
 struct mdp5_crtc {
        struct drm_crtc base;
        char name[8];
-       struct drm_plane *planes[8];
        int id;
        bool enabled;
 
@@ -77,15 +76,14 @@ static void crtc_flush(struct drm_crtc *crtc)
        struct mdp5_crtc *mdp5_crtc = to_mdp5_crtc(crtc);
        struct mdp5_kms *mdp5_kms = get_kms(crtc);
        int id = mdp5_crtc->id;
-       uint32_t i, flush = 0;
+       struct drm_plane *plane;
+       uint32_t flush = 0;
 
-       for (i = 0; i < ARRAY_SIZE(mdp5_crtc->planes); i++) {
-               struct drm_plane *plane = mdp5_crtc->planes[i];
-               if (plane) {
-                       enum mdp5_pipe pipe = mdp5_plane_pipe(plane);
-                       flush |= pipe2flush(pipe);
-               }
+       for_each_plane_on_crtc(crtc, plane) {
+               enum mdp5_pipe pipe = mdp5_plane_pipe(plane);
+               flush |= pipe2flush(pipe);
        }
+
        flush |= mixer2flush(mdp5_crtc->id);
        flush |= MDP5_CTL_FLUSH_CTL;
 
@@ -141,7 +139,8 @@ static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)
        struct mdp5_crtc *mdp5_crtc = to_mdp5_crtc(crtc);
        struct drm_device *dev = crtc->dev;
        struct drm_pending_vblank_event *event;
-       unsigned long flags, i;
+       struct drm_plane *plane;
+       unsigned long flags;
 
        spin_lock_irqsave(&dev->event_lock, flags);
        event = mdp5_crtc->event;
@@ -157,11 +156,8 @@ static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)
        }
        spin_unlock_irqrestore(&dev->event_lock, flags);
 
-       for (i = 0; i < ARRAY_SIZE(mdp5_crtc->planes); i++) {
-               struct drm_plane *plane = mdp5_crtc->planes[i];
-               if (plane)
-                       mdp5_plane_complete_flip(plane);
-       }
+       for_each_plane_on_crtc(crtc, plane)
+               mdp5_plane_complete_flip(plane);
 }
 
 static void pageflip_cb(struct msm_fence_cb *cb)
@@ -502,12 +498,6 @@ static void set_attach(struct drm_crtc *crtc, enum mdp5_pipe pipe_id,
 {
        struct mdp5_crtc *mdp5_crtc = to_mdp5_crtc(crtc);
 
-       BUG_ON(pipe_id >= ARRAY_SIZE(mdp5_crtc->planes));
-
-       if (mdp5_crtc->planes[pipe_id] == plane)
-               return;
-
-       mdp5_crtc->planes[pipe_id] = plane;
        blend_setup(crtc);
        if (mdp5_crtc->enabled && (plane != crtc->primary))
                crtc_flush(crtc);
@@ -554,6 +544,7 @@ struct drm_crtc *mdp5_crtc_init(struct drm_device *dev,
 
        drm_crtc_init_with_planes(dev, crtc, plane, NULL, &mdp5_crtc_funcs);
        drm_crtc_helper_add(crtc, &mdp5_crtc_helper_funcs);
+       plane->crtc = crtc;
 
        mdp5_plane_install_properties(plane, &crtc->base);