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

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

Merge branch 'drm-next-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-next 

Some final bits for 4.1.  Some fixes for userptrs and allow a new
packet for VCE to enable some new features in mesa.

* 'drm-next-4.1' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: allow creating overlapping userptrs
  drm/radeon: add userptr config option
  drm/radeon: add video usability info support for VCE
parents 665ae581 49ecb10e

drivers/gpu/drm/radeon/Kconfig

+8 −0
Original line number Diff line number Diff line 
config DRM_RADEON_USERPTR

	bool "Always enable userptr support"

	depends on DRM_RADEON

	select MMU_NOTIFIER

	help

	  This option selects CONFIG_MMU_NOTIFIER if it isn't already

	  selected to enabled full userptr support.



config DRM_RADEON_UMS

	bool "Enable userspace modesetting on radeon (DEPRECATED)"

	depends on DRM_RADEON

drivers/gpu/drm/radeon/radeon.h

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ struct radeon_bo { 
	pid_t				pid;



	struct radeon_mn		*mn;

	struct interval_tree_node	mn_it;

	struct list_head		mn_list;

};

#define gem_to_radeon_bo(gobj) container_of((gobj), struct radeon_bo, gem_base)

drivers/gpu/drm/radeon/radeon_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -89,9 +89,10 @@ 
 *   2.40.0 - Add RADEON_GEM_GTT_WC/UC, flush HDP cache before submitting

 *            CS to GPU on >= r600

 *   2.41.0 - evergreen/cayman: Add SET_BASE/DRAW_INDIRECT command parsing support

 *   2.42.0 - Add VCE/VUI (Video Usability Information) support

 */

#define KMS_DRIVER_MAJOR	2

#define KMS_DRIVER_MINOR	41

#define KMS_DRIVER_MINOR	42

#define KMS_DRIVER_PATCHLEVEL	0

int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);

int radeon_driver_unload_kms(struct drm_device *dev);

drivers/gpu/drm/radeon/radeon_mn.c

+75 −27
Original line number Diff line number Diff line
@@ -53,6 +53,11 @@ struct radeon_mn { 
	struct rb_root		objects;

};



struct radeon_mn_node {

	struct interval_tree_node	it;

	struct list_head		bos;

};



/**

 * radeon_mn_destroy - destroy the rmn

 *
@@ -64,14 +69,21 @@ static void radeon_mn_destroy(struct work_struct *work) 
{

	struct radeon_mn *rmn = container_of(work, struct radeon_mn, work);

	struct radeon_device *rdev = rmn->rdev;

	struct radeon_bo *bo, *next;

	struct radeon_mn_node *node, *next_node;

	struct radeon_bo *bo, *next_bo;



	mutex_lock(&rdev->mn_lock);

	mutex_lock(&rmn->lock);

	hash_del(&rmn->node);

	rbtree_postorder_for_each_entry_safe(bo, next, &rmn->objects, mn_it.rb) {

		interval_tree_remove(&bo->mn_it, &rmn->objects);

	rbtree_postorder_for_each_entry_safe(node, next_node, &rmn->objects,

					     it.rb) {



		interval_tree_remove(&node->it, &rmn->objects);

		list_for_each_entry_safe(bo, next_bo, &node->bos, mn_list) {

			bo->mn = NULL;

			list_del_init(&bo->mn_list);

		}

		kfree(node);

	}

	mutex_unlock(&rmn->lock);

	mutex_unlock(&rdev->mn_lock);
@@ -121,20 +133,23 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn, 


	it = interval_tree_iter_first(&rmn->objects, start, end);

	while (it) {

		struct radeon_mn_node *node;

		struct radeon_bo *bo;

		int r;



		bo = container_of(it, struct radeon_bo, mn_it);

		node = container_of(it, struct radeon_mn_node, it);

		it = interval_tree_iter_next(it, start, end);



		list_for_each_entry(bo, &node->bos, mn_list) {



			r = radeon_bo_reserve(bo, true);

			if (r) {

				DRM_ERROR("(%d) failed to reserve user bo\n", r);

				continue;

			}



		r = reservation_object_wait_timeout_rcu(bo->tbo.resv, true,

			false, MAX_SCHEDULE_TIMEOUT);

			r = reservation_object_wait_timeout_rcu(bo->tbo.resv,

				true, false, MAX_SCHEDULE_TIMEOUT);

			if (r)

				DRM_ERROR("(%d) failed to wait for user bo\n", r);
@@ -145,6 +160,7 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn, 


			radeon_bo_unreserve(bo);

		}

	}

	

	mutex_unlock(&rmn->lock);

}
@@ -220,24 +236,44 @@ int radeon_mn_register(struct radeon_bo *bo, unsigned long addr) 
	unsigned long end = addr + radeon_bo_size(bo) - 1;

	struct radeon_device *rdev = bo->rdev;

	struct radeon_mn *rmn;

	struct radeon_mn_node *node = NULL;

	struct list_head bos;

	struct interval_tree_node *it;



	rmn = radeon_mn_get(rdev);

	if (IS_ERR(rmn))

		return PTR_ERR(rmn);



	INIT_LIST_HEAD(&bos);



	mutex_lock(&rmn->lock);



	it = interval_tree_iter_first(&rmn->objects, addr, end);

	if (it) {

	while ((it = interval_tree_iter_first(&rmn->objects, addr, end))) {

		kfree(node);

		node = container_of(it, struct radeon_mn_node, it);

		interval_tree_remove(&node->it, &rmn->objects);

		addr = min(it->start, addr);

		end = max(it->last, end);

		list_splice(&node->bos, &bos);

	}



	if (!node) {

		node = kmalloc(sizeof(struct radeon_mn_node), GFP_KERNEL);

		if (!node) {

			mutex_unlock(&rmn->lock);

		return -EEXIST;

			return -ENOMEM;

		}

	}



	bo->mn = rmn;

	bo->mn_it.start = addr;

	bo->mn_it.last = end;

	interval_tree_insert(&bo->mn_it, &rmn->objects);



	node->it.start = addr;

	node->it.last = end;

	INIT_LIST_HEAD(&node->bos);

	list_splice(&bos, &node->bos);

	list_add(&bo->mn_list, &node->bos);



	interval_tree_insert(&node->it, &rmn->objects);



	mutex_unlock(&rmn->lock);
@@ -255,6 +291,7 @@ void radeon_mn_unregister(struct radeon_bo *bo) 
{

	struct radeon_device *rdev = bo->rdev;

	struct radeon_mn *rmn;

	struct list_head *head;



	mutex_lock(&rdev->mn_lock);

	rmn = bo->mn;
@@ -264,8 +301,19 @@ void radeon_mn_unregister(struct radeon_bo *bo) 
	}



	mutex_lock(&rmn->lock);

	interval_tree_remove(&bo->mn_it, &rmn->objects);

	/* save the next list entry for later */

	head = bo->mn_list.next;



	bo->mn = NULL;

	list_del(&bo->mn_list);



	if (list_empty(head)) {

		struct radeon_mn_node *node;

		node = container_of(head, struct radeon_mn_node, bos);

		interval_tree_remove(&node->it, &rmn->objects);

		kfree(node);

	}



	mutex_unlock(&rmn->lock);

	mutex_unlock(&rdev->mn_lock);

}

drivers/gpu/drm/radeon/radeon_vce.c

+1 −0
Original line number Diff line number Diff line
@@ -571,6 +571,7 @@ int radeon_vce_cs_parse(struct radeon_cs_parser *p) 
		case 0x04000005: // rate control

		case 0x04000007: // motion estimation

		case 0x04000008: // rdo

		case 0x04000009: // vui

			break;



		case 0x03000001: // encode