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

Commit bb4cec02 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/lockless-gem-bo-freeing-2016-06-01' of... 

Merge tag 'topic/lockless-gem-bo-freeing-2016-06-01' of git://anongit.freedesktop.org/drm-intel into drm-next

lockless gem bo freeing patches (and the oddball related patch) for all
the drivers who's maintainers are asleep at the helm - includes you ;-)

I based this on top of drm-fixes to include Chris' fix for the cma issue.

* tag 'topic/lockless-gem-bo-freeing-2016-06-01' of git://anongit.freedesktop.org/drm-intel: (21 commits)
  drm/arcpgu: Use lockless gem BO free callback
  drm/sun4i: Use lockless gem BO free callback
  drm/omapdrm: Nuke dummy fb->dirty callback
  drm/msm: Nuke dummy fb->dirty callback
  drm/rockchip: Use cma gem vm ops
  drm/sti: Use lockless gem BO free callback
  drm: sti: remove useless call to dev->struct_mutex
  drm/virtio: Use lockless gem BO free callback
  drm/tilcdc: Use lockless gem BO free callback
  drm/shmob: Use lockless gem BO free callback
  drm/rockchip: Use lockless gem BO free callback
  drm/rcar-du: Use lockless gem BO free callback
  drm/qxl: Use lockless gem BO free callback
  drm/nouveau: Use lockless gem BO free callback
  drm/mga200g: Use lockless gem BO free callback
  drm/fls-dcu: Use lockless gem BO free callback
  drm/cirrus: Use lockless gem BO free callback
  drm/bochs: Use lockless gem BO free callback
  drm/atmel: Use lockless gem BO free callback
  drm/ast: Use lockless gem BO free callback
  ...
parents fa625c19 e1512ee0

drivers/gpu/drm/arc/arcpgu_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static struct drm_driver arcpgu_drm_driver = { 
	.get_vblank_counter = drm_vblank_no_hw_counter,

	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_free_object = drm_gem_cma_free_object,

	.gem_free_object_unlocked = drm_gem_cma_free_object,

	.gem_vm_ops = &drm_gem_cma_vm_ops,

	.gem_prime_export = drm_gem_prime_export,

	.gem_prime_import = drm_gem_prime_import,

drivers/gpu/drm/armada/armada_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static struct drm_driver armada_drm_driver = { 
	.debugfs_init		= armada_drm_debugfs_init,

	.debugfs_cleanup	= armada_drm_debugfs_cleanup,

#endif

	.gem_free_object	= armada_gem_free_object,

	.gem_free_object_unlocked = armada_gem_free_object,

	.prime_handle_to_fd	= drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle	= drm_gem_prime_fd_to_handle,

	.gem_prime_export	= armada_gem_prime_export,

drivers/gpu/drm/ast/ast_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static struct drm_driver driver = { 
	.minor = DRIVER_MINOR,

	.patchlevel = DRIVER_PATCHLEVEL,



	.gem_free_object = ast_gem_free_object,

	.gem_free_object_unlocked = ast_gem_free_object,

	.dumb_create = ast_dumb_create,

	.dumb_map_offset = ast_dumb_mmap_offset,

	.dumb_destroy = drm_gem_dumb_destroy,

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ static struct drm_driver atmel_hlcdc_dc_driver = { 
	.get_vblank_counter = drm_vblank_no_hw_counter,

	.enable_vblank = atmel_hlcdc_dc_enable_vblank,

	.disable_vblank = atmel_hlcdc_dc_disable_vblank,

	.gem_free_object = drm_gem_cma_free_object,

	.gem_free_object_unlocked = drm_gem_cma_free_object,

	.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,

drivers/gpu/drm/bochs/bochs_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static struct drm_driver bochs_driver = { 
	.date			= "20130925",

	.major			= 1,

	.minor			= 0,

	.gem_free_object        = bochs_gem_free_object,

	.gem_free_object_unlocked = bochs_gem_free_object,

	.dumb_create            = bochs_dumb_create,

	.dumb_map_offset        = bochs_dumb_mmap_offset,

	.dumb_destroy           = drm_gem_dumb_destroy,