Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Noralf Trønnes <noralf@tronnes.org>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1502631125-13557-11-git-send-email-noralf@tronnes.org

+4 -2
+2 -1
drivers/gpu/drm/imx/imx-drm-core.c
··· 24 24 #include <drm/drm_fb_helper.h> 25 25 #include <drm/drm_crtc_helper.h> 26 26 #include <drm/drm_gem_cma_helper.h> 27 + #include <drm/drm_gem_framebuffer_helper.h> 27 28 #include <drm/drm_fb_cma_helper.h> 28 29 #include <drm/drm_plane_helper.h> 29 30 #include <drm/drm_of.h> ··· 106 105 } 107 106 108 107 static const struct drm_mode_config_funcs imx_drm_mode_config_funcs = { 109 - .fb_create = drm_fb_cma_create, 108 + .fb_create = drm_gem_fb_create, 110 109 .output_poll_changed = imx_drm_output_poll_changed, 111 110 .atomic_check = imx_drm_atomic_check, 112 111 .atomic_commit = drm_atomic_helper_commit,
+2 -1
drivers/gpu/drm/imx/ipuv3-plane.c
··· 18 18 #include <drm/drm_atomic_helper.h> 19 19 #include <drm/drm_fb_cma_helper.h> 20 20 #include <drm/drm_gem_cma_helper.h> 21 + #include <drm/drm_gem_framebuffer_helper.h> 21 22 #include <drm/drm_plane_helper.h> 22 23 23 24 #include "video/imx-ipu-v3.h" ··· 662 661 } 663 662 664 663 static const struct drm_plane_helper_funcs ipu_plane_helper_funcs = { 665 - .prepare_fb = drm_fb_cma_prepare_fb, 664 + .prepare_fb = drm_gem_fb_prepare_fb, 666 665 .atomic_check = ipu_plane_atomic_check, 667 666 .atomic_disable = ipu_plane_atomic_disable, 668 667 .atomic_update = ipu_plane_atomic_update,