diff options
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_plane.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_plane.c | 9 | 
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 0a0207c350a5..5e5f90810aca 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -17,11 +17,14 @@  #include <drm/drm_atomic.h>  #include <drm/drm_atomic_helper.h> +#include <drm/drm_atomic_uapi.h>  #include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_gem_framebuffer_helper.h>  #include <drm/drm_plane_helper.h> -#include <drm/drm_atomic_uapi.h>  #include "uapi/drm/vc4_drm.h" +  #include "vc4_drv.h"  #include "vc4_regs.h" @@ -1123,7 +1126,6 @@ static int vc4_prepare_fb(struct drm_plane *plane,  			  struct drm_plane_state *state)  {  	struct vc4_bo *bo; -	struct dma_fence *fence;  	int ret;  	if (!state->fb) @@ -1131,8 +1133,7 @@ static int vc4_prepare_fb(struct drm_plane *plane,  	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;  |