Merge branch 'drm/3.11/fixes' of git://linuxtv.org/pinchartl/fbdev into drm-fixes

Fixes builds
* 'drm/3.11/fixes' of git://linuxtv.org/pinchartl/fbdev:
  drm/rcar-du: Use the GEM PRIME helpers
  drm/shmobile: Use the GEM PRIME helpers

2 files changed, 14 insertions, 4 deletions

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index ff82877de876..dc0fe09b2ba1 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -249,8 +249,13 @@ static struct drm_driver rcar_du_driver = {
         .gem_vm_ops             = &drm_gem_cma_vm_ops,
         .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle     = drm_gem_prime_fd_to_handle,
-        .gem_prime_import       = drm_gem_cma_dmabuf_import,
-        .gem_prime_export       = drm_gem_cma_dmabuf_export,
+        .gem_prime_import       = drm_gem_prime_import,
+        .gem_prime_export       = drm_gem_prime_export,
+        .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
+        .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
+        .gem_prime_vmap         = drm_gem_cma_prime_vmap,
+        .gem_prime_vunmap       = drm_gem_cma_prime_vunmap,
+        .gem_prime_mmap         = drm_gem_cma_prime_mmap,
         .dumb_create            = rcar_du_dumb_create,
         .dumb_map_offset        = drm_gem_cma_dumb_map_offset,
         .dumb_destroy           = drm_gem_cma_dumb_destroy,
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
index edc10181f551..5f83f9a3ef59 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
@@ -276,8 +276,13 @@ static struct drm_driver shmob_drm_driver = {
         .gem_vm_ops             = &drm_gem_cma_vm_ops,
         .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle     = drm_gem_prime_fd_to_handle,
-        .gem_prime_import       = drm_gem_cma_dmabuf_import,
-        .gem_prime_export       = drm_gem_cma_dmabuf_export,
+        .gem_prime_import       = drm_gem_prime_import,
+        .gem_prime_export       = drm_gem_prime_export,
+        .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
+        .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
+        .gem_prime_vmap         = drm_gem_cma_prime_vmap,
+        .gem_prime_vunmap       = drm_gem_cma_prime_vunmap,
+        .gem_prime_mmap         = drm_gem_cma_prime_mmap,
         .dumb_create            = drm_gem_cma_dumb_create,
         .dumb_map_offset        = drm_gem_cma_dumb_map_offset,
         .dumb_destroy           = drm_gem_cma_dumb_destroy,