drm/pl111: Use drm_gem_fb_create() and drm_gem_fb_prepare_fb()
authorNoralf Trønnes <noralf@tronnes.org>
Sun, 13 Aug 2017 13:31:56 +0000 (15:31 +0200)
committerNoralf Trønnes <noralf@tronnes.org>
Wed, 16 Aug 2017 19:35:38 +0000 (21:35 +0200)
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: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/1502631125-13557-14-git-send-email-noralf@tronnes.org
drivers/gpu/drm/pl111/pl111_display.c
drivers/gpu/drm/pl111/pl111_drv.c

index f0139fa58d5593b770b7bcc4a886530e6d40d569..b58c988d9da0118b4a117f4e1bd852d9b40dfe84 100644 (file)
@@ -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 = {
index 0ea3ca823034f08496413b81dd2fe7e193136c75..581c452cede1df08822a8e0f5932062c3c52c6cc 100644 (file)
@@ -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,
 };