[PATCH v2 3/4] drm/msm: use drm_atomic_set_fence_for_plane() to set the fence

[Gustavo Padovan]

From: Gustavo Padovan <gustavo.pado...@collabora.co.uk>

drm_atomic_set_fence_for_plane() is smart and won't overwrite
plane_state->fence if the user already set an explicit fence there.

Cc: Rob Clark <robdclark at gmail.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 drivers/gpu/drm/msm/msm_atomic.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index db193f8..4e21e1d 100644
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -217,8 +217,9 @@ int msm_atomic_commit(struct drm_device *dev,
                if ((plane->state->fb != plane_state->fb) && plane_state->fb) {
                        struct drm_gem_object *obj = 
msm_framebuffer_bo(plane_state->fb, 0);
                        struct msm_gem_object *msm_obj = to_msm_bo(obj);
+                       struct dma_fence *fence = 
reservation_object_get_excl_rcu(msm_obj->resv);

-                       plane_state->fence = 
reservation_object_get_excl_rcu(msm_obj->resv);
+                       drm_atomic_set_fence_for_plane(plane_state, fence);
                }
        }

-- 
2.5.5