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

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

drm/imx: 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: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1502631125-13557-11-git-send-email-noralf@tronnes.org
parent 15910174

drivers/gpu/drm/imx/imx-drm-core.c

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <drm/drm_fb_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 <drm/drm_plane_helper.h>

#include <drm/drm_of.h>
@@ -105,7 +106,7 @@ static int imx_drm_atomic_check(struct drm_device *dev, 
}



static const struct drm_mode_config_funcs imx_drm_mode_config_funcs = {

	.fb_create = drm_fb_cma_create,

	.fb_create = drm_gem_fb_create,

	.output_poll_changed = imx_drm_output_poll_changed,

	.atomic_check = imx_drm_atomic_check,

	.atomic_commit = drm_atomic_helper_commit,

drivers/gpu/drm/imx/ipuv3-plane.c

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

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_plane_helper.h>



#include "video/imx-ipu-v3.h"
@@ -661,7 +662,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, 
}



static const struct drm_plane_helper_funcs ipu_plane_helper_funcs = {

	.prepare_fb = drm_fb_cma_prepare_fb,

	.prepare_fb = drm_gem_fb_prepare_fb,

	.atomic_check = ipu_plane_atomic_check,

	.atomic_disable = ipu_plane_atomic_disable,

	.atomic_update = ipu_plane_atomic_update,