Commit ccc3b2b3 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Move simple_display_pipe prepare_fb helper into gem fb helpers 



There's nothing tinydrm specific to this, and there's a few more
copies of the same in various other drivers.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: David Airlie <airlied@linux.ie>
Cc: David Lechner <david@lechnology.com>
Cc: "Noralf Trønnes" <noralf@tronnes.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Daniel Stone <daniels@collabora.com>
Cc: Haneen Mohammed <hamohammed.sa@gmail.com>
Cc: Ben Widawsky <ben@bwidawsk.net>
Cc: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarOleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Acked-by: default avatarDavid Lechner <david@lechnology.com>
Reviewed-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180405154449.23038-3-daniel.vetter@ffwll.ch
parent 3fbe86be

drivers/gpu/drm/drm_gem_framebuffer_helper.c

+19 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <drm/drm_gem.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_modeset_helper.h>

#include <drm/drm_simple_kms_helper.h>



/**

 * DOC: overview
@@ -265,6 +266,24 @@ int drm_gem_fb_prepare_fb(struct drm_plane *plane, 
}

EXPORT_SYMBOL_GPL(drm_gem_fb_prepare_fb);



/**

 * drm_gem_fb_simple_display_pipe_prepare_fb - prepare_fb helper for

 *     &drm_simple_display_pipe

 * @pipe: Simple display pipe

 * @plane_state: Plane state

 *

 * This function uses drm_gem_fb_prepare_fb() to check if the plane FB has a

 * &dma_buf attached, extracts the exclusive fence and attaches it to plane

 * state for the atomic helper to wait on. Drivers can use this as their

 * &drm_simple_display_pipe_funcs.prepare_fb callback.

 */

int drm_gem_fb_simple_display_pipe_prepare_fb(struct drm_simple_display_pipe *pipe,

					      struct drm_plane_state *plane_state)

{

	return drm_gem_fb_prepare_fb(&pipe->plane, plane_state);

}

EXPORT_SYMBOL(drm_gem_fb_simple_display_pipe_prepare_fb);



/**

 * drm_gem_fbdev_fb_create - Create a GEM backed &drm_framebuffer for fbdev

 *                           emulation

drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c

+0 −17
Original line number Diff line number Diff line
@@ -138,23 +138,6 @@ void tinydrm_display_pipe_update(struct drm_simple_display_pipe *pipe, 
}

EXPORT_SYMBOL(tinydrm_display_pipe_update);



/**

 * tinydrm_display_pipe_prepare_fb - Display pipe prepare_fb helper

 * @pipe: Simple display pipe

 * @plane_state: Plane state

 *

 * This function uses drm_gem_fb_prepare_fb() to check 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. Drivers can use this as their

 * &drm_simple_display_pipe_funcs->prepare_fb callback.

 */

int tinydrm_display_pipe_prepare_fb(struct drm_simple_display_pipe *pipe,

				    struct drm_plane_state *plane_state)

{

	return drm_gem_fb_prepare_fb(&pipe->plane, plane_state);

}

EXPORT_SYMBOL(tinydrm_display_pipe_prepare_fb);



static int tinydrm_rotate_mode(struct drm_display_mode *mode,

			       unsigned int rotation)

{

drivers/gpu/drm/tinydrm/ili9225.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static const struct drm_simple_display_pipe_funcs ili9225_pipe_funcs = { 
	.enable		= ili9225_pipe_enable,

	.disable	= ili9225_pipe_disable,

	.update		= tinydrm_display_pipe_update,

	.prepare_fb	= tinydrm_display_pipe_prepare_fb,

	.prepare_fb	= drm_gem_fb_simple_display_pipe_prepare_fb,

};



static const struct drm_display_mode ili9225_mode = {

drivers/gpu/drm/tinydrm/mi0283qt.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <drm/drm_fb_helper.h>

#include <drm/drm_modeset_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/tinydrm/mipi-dbi.h>

#include <drm/tinydrm/tinydrm-helpers.h>

#include <video/mipi_display.h>
@@ -134,7 +135,7 @@ static const struct drm_simple_display_pipe_funcs mi0283qt_pipe_funcs = { 
	.enable = mi0283qt_enable,

	.disable = mipi_dbi_pipe_disable,

	.update = tinydrm_display_pipe_update,

	.prepare_fb = tinydrm_display_pipe_prepare_fb,

	.prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb,

};



static const struct drm_display_mode mi0283qt_mode = {

drivers/gpu/drm/tinydrm/repaper.c

+1 −1
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ static const struct drm_simple_display_pipe_funcs repaper_pipe_funcs = { 
	.enable = repaper_pipe_enable,

	.disable = repaper_pipe_disable,

	.update = tinydrm_display_pipe_update,

	.prepare_fb = tinydrm_display_pipe_prepare_fb,

	.prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb,

};



static const uint32_t repaper_formats[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE