Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdf014c6 authored by Marek Vasut's avatar Marek Vasut Committed by Marissa Wall
Browse files

BACKPORT: drm/fb_cma_helper: Add drm_fb_cma_prepare_fb() helper 



Add new drm_fb_cma_prepare_fb() helper function extracted from the
imx-drm driver. This function checks if the plane has DMABUF attached
to it, extracts the exclusive fence from it and attaches it to the
plane state for the atomic helper to wait on it.

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161114100732.3446-1-marex@denx.de


(cherry picked from commit 14d7f96f90fb65c2ca0e0ac7df237e06ff001c29)
Signed-off-by: default avatarMarissa Wall <marissaw@google.com>

Change-Id: I3b7adb3c3217eed72e45c53c5c749f6218611df0
parent 0ed87071

drivers/gpu/drm/drm_fb_cma_helper.c

+35 −0
Original line number Diff line number Diff line
@@ -18,13 +18,16 @@ 
 */



#include <drm/drmP.h>

#include <drm/drm_atomic.h>

#include <drm/drm_crtc.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_fb_cma_helper.h>

#include <linux/dma-buf.h>

#include <linux/dma-mapping.h>

#include <linux/module.h>

#include <linux/reservation.h>



#define DEFAULT_FBDEFIO_DELAY_MS 50
@@ -265,6 +268,38 @@ struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb, 
}

EXPORT_SYMBOL_GPL(drm_fb_cma_get_gem_obj);



/**

 * drm_fb_cma_prepare_fb() - Prepare CMA framebuffer

 * @plane: Which plane

 * @state: Plane state attach fence to

 *

 * This should be put into prepare_fb hook of struct &drm_plane_helper_funcs .

 *

 * This function checks if the plane FB has an dma-buf attached, extracts

 * the exclusive fence and attaches it to plane state for the atomic helper

 * to wait on.

 *

 * There is no need for cleanup_fb for CMA based framebuffer drivers.

 */

int drm_fb_cma_prepare_fb(struct drm_plane *plane,

			  struct drm_plane_state *state)

{

	struct dma_buf *dma_buf;

	struct fence *fence;



	if ((plane->state->fb == state->fb) || !state->fb)

		return 0;



	dma_buf = drm_fb_cma_get_gem_obj(state->fb, 0)->base.dma_buf;

	if (dma_buf) {

		fence = reservation_object_get_excl_rcu(dma_buf->resv);

		drm_atomic_set_fence_for_plane(state, fence);

	}



	return 0;

}

EXPORT_SYMBOL_GPL(drm_fb_cma_prepare_fb);



#ifdef CONFIG_DEBUG_FS

static void drm_fb_cma_describe(struct drm_framebuffer *fb, struct seq_file *m)

{

include/drm/drm_fb_cma_helper.h

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev, 
struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,

	unsigned int plane);



int drm_fb_cma_prepare_fb(struct drm_plane *plane,

			  struct drm_plane_state *state);



#ifdef CONFIG_DEBUG_FS

struct seq_file;