[PATCH 50/59] drm/vc4: Use drm_gem_fb_prepare_fb

Daniel Vetter daniel.vetter at ffwll.ch
Fri Jun 14 20:36:06 UTC 2019


vc4 has switched to using drm_fb->obj[], so we can just use the helper
unchanged.

Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
Cc: Eric Anholt <eric at anholt.net>
---
 drivers/gpu/drm/vc4/vc4_plane.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 441e06d45c89..f59f8c404d80 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -1132,10 +1132,7 @@ static int vc4_prepare_fb(struct drm_plane *plane,
 	if (!state->fb)
 		return 0;
 
-	bo = to_vc4_bo(&drm_fb_cma_get_gem_obj(state->fb, 0)->base);
-
-	fence = reservation_object_get_excl_rcu(bo->base.base.resv);
-	drm_atomic_set_fence_for_plane(state, fence);
+	drm_gem_fb_prepare_fb(plane, state);
 
 	if (plane->state->fb == state->fb)
 		return 0;
-- 
2.20.1



More information about the dri-devel mailing list