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

Commit 3668f0df authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents fb328d73 ffb40400

drivers/gpu/drm/rcar-du/rcar_du_drv.c

+7 −2
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/shmobile/shmob_drm_drv.c

+7 −2
Original line number Diff line number Diff line
@@ -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,