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

Commit b6eb01a9 authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

drm/pl111: Use drm_gem_fb_create() and drm_gem_fb_prepare_fb() 



drm_fb_cma_create() and drm_fb_cma_prepare_fb() are just wrappers now,
use drm_gem_fb_create() and drm_gem_fb_prepare_fb() directly.

Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/1502631125-13557-14-git-send-email-noralf@tronnes.org
parent 5628648d

drivers/gpu/drm/pl111/pl111_display.c

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <drm/drmP.h>

#include <drm/drm_panel.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_fb_cma_helper.h>



#include "pl111_drm.h"
@@ -274,7 +275,7 @@ void pl111_disable_vblank(struct drm_device *drm, unsigned int crtc) 
static int pl111_display_prepare_fb(struct drm_simple_display_pipe *pipe,

				    struct drm_plane_state *plane_state)

{

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

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

}



static const struct drm_simple_display_pipe_funcs pl111_display_funcs = {

drivers/gpu/drm/pl111/pl111_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_fb_cma_helper.h>



#include "pl111_drm.h"
@@ -73,7 +74,7 @@ 
#define DRIVER_DESC      "DRM module for PL111"



static const struct drm_mode_config_funcs mode_config_funcs = {

	.fb_create = drm_fb_cma_create,

	.fb_create = drm_gem_fb_create,

	.atomic_check = drm_atomic_helper_check,

	.atomic_commit = drm_atomic_helper_commit,

};