diff options
| author | Rob Clark <robdclark@gmail.com> | 2016-10-31 19:38:15 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2016-11-27 11:23:12 -0500 |
| commit | a210069557f5a5353edeacd4a643e02e865a748e (patch) | |
| tree | 203161a745feca00da6d06793fe3675cce2ec0d9 /drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | |
| parent | cee265886d1e7a7ea65c0181665e2be0167a454e (diff) | |
| download | op-kernel-dev-a210069557f5a5353edeacd4a643e02e865a748e.zip op-kernel-dev-a210069557f5a5353edeacd4a643e02e865a748e.tar.gz | |
drm/msm/mdp5: nuke mdp5_plane_complete_flip()
We can do this all from mdp5_plane_complete_commit(), so simplify things
a bit and drop mdp5_plane_complete_flip().
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c')
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c index ba4ebfa..0e6336e 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c @@ -852,20 +852,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane, return ret; } -void mdp5_plane_complete_flip(struct drm_plane *plane) -{ - struct mdp5_kms *mdp5_kms = get_kms(plane); - struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane); - enum mdp5_pipe pipe = mdp5_plane->pipe; - - DBG("%s: complete flip", mdp5_plane->name); - - if (mdp5_kms->smp) - mdp5_smp_commit(mdp5_kms->smp, pipe); - - to_mdp5_plane_state(plane->state)->pending = false; -} - enum mdp5_pipe mdp5_plane_pipe(struct drm_plane *plane) { struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane); @@ -887,10 +873,17 @@ void mdp5_plane_complete_commit(struct drm_plane *plane, struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane); enum mdp5_pipe pipe = mdp5_plane->pipe; - if (!plane_enabled(plane->state) && mdp5_kms->smp) { - DBG("%s: free SMP", mdp5_plane->name); - mdp5_smp_release(mdp5_kms->smp, pipe); + if (mdp5_kms->smp) { + if (plane_enabled(plane->state)) { + DBG("%s: complete flip", mdp5_plane->name); + mdp5_smp_commit(mdp5_kms->smp, pipe); + } else { + DBG("%s: free SMP", mdp5_plane->name); + mdp5_smp_release(mdp5_kms->smp, pipe); + } } + + to_mdp5_plane_state(plane->state)->pending = false; } /* initialize plane */ |
