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

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

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

* 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/TN: only enable bapm on MSI systems
  drm/radeon: fix VM IB handling
  drm/radeon: fix handling of radeon_vm_bo_rmv v3
  drm/radeon: let's use GB for vm_size (v2)
parents 67dd8f35 730a336c

drivers/gpu/drm/radeon/radeon.h

+11 −4
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ struct radeon_bo_va { 


	/* protected by vm mutex */

	struct list_head		vm_list;

	struct list_head		vm_status;



	/* constant after initialization */

	struct radeon_vm		*vm;
@@ -867,6 +868,9 @@ struct radeon_vm { 
	struct list_head		va;

	unsigned			id;



	/* BOs freed, but not yet updated in the PT */

	struct list_head		freed;



	/* contains the page directory */

	struct radeon_bo		*page_directory;

	uint64_t			pd_gpu_addr;
@@ -875,6 +879,8 @@ struct radeon_vm { 
	/* array of page tables, one for each page directory entry */

	struct radeon_vm_pt		*page_tables;



	struct radeon_bo_va		*ib_bo_va;



	struct mutex			mutex;

	/* last fence for cs using this vm */

	struct radeon_fence		*fence;
@@ -2832,9 +2838,10 @@ void radeon_vm_fence(struct radeon_device *rdev, 
uint64_t radeon_vm_map_gart(struct radeon_device *rdev, uint64_t addr);

int radeon_vm_update_page_directory(struct radeon_device *rdev,

				    struct radeon_vm *vm);

int radeon_vm_clear_freed(struct radeon_device *rdev,

			  struct radeon_vm *vm);

int radeon_vm_bo_update(struct radeon_device *rdev,

			struct radeon_vm *vm,

			struct radeon_bo *bo,

			struct radeon_bo_va *bo_va,

			struct ttm_mem_reg *mem);

void radeon_vm_bo_invalidate(struct radeon_device *rdev,

			     struct radeon_bo *bo);
@@ -2847,7 +2854,7 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev, 
			  struct radeon_bo_va *bo_va,

			  uint64_t offset,

			  uint32_t flags);

int radeon_vm_bo_rmv(struct radeon_device *rdev,

void radeon_vm_bo_rmv(struct radeon_device *rdev,

		      struct radeon_bo_va *bo_va);



/* audio */

drivers/gpu/drm/radeon/radeon_cs.c

+18 −2
Original line number Diff line number Diff line
@@ -461,13 +461,23 @@ static int radeon_bo_vm_update_pte(struct radeon_cs_parser *p, 
				   struct radeon_vm *vm)

{

	struct radeon_device *rdev = p->rdev;

	struct radeon_bo_va *bo_va;

	int i, r;



	r = radeon_vm_update_page_directory(rdev, vm);

	if (r)

		return r;



	r = radeon_vm_bo_update(rdev, vm, rdev->ring_tmp_bo.bo,

	r = radeon_vm_clear_freed(rdev, vm);

	if (r)

		return r;



	if (vm->ib_bo_va == NULL) {

		DRM_ERROR("Tmp BO not in VM!\n");

		return -EINVAL;

	}



	r = radeon_vm_bo_update(rdev, vm->ib_bo_va,

				&rdev->ring_tmp_bo.bo->tbo.mem);

	if (r)

		return r;
@@ -480,7 +490,13 @@ static int radeon_bo_vm_update_pte(struct radeon_cs_parser *p, 
			continue;



		bo = p->relocs[i].robj;

		r = radeon_vm_bo_update(rdev, vm, bo, &bo->tbo.mem);

		bo_va = radeon_vm_bo_find(vm, bo);

		if (bo_va == NULL) {

			dev_err(rdev->dev, "bo %p not in vm %p\n", bo, vm);

			return -EINVAL;

		}



		r = radeon_vm_bo_update(rdev, bo_va, &bo->tbo.mem);

		if (r)

			return r;

	}

drivers/gpu/drm/radeon/radeon_device.c

+11 −11
Original line number Diff line number Diff line
@@ -1056,36 +1056,36 @@ static void radeon_check_arguments(struct radeon_device *rdev) 
	if (!radeon_check_pot_argument(radeon_vm_size)) {

		dev_warn(rdev->dev, "VM size (%d) must be a power of 2\n",

			 radeon_vm_size);

		radeon_vm_size = 4096;

		radeon_vm_size = 4;

	}



	if (radeon_vm_size < 4) {

		dev_warn(rdev->dev, "VM size (%d) to small, min is 4MB\n",

	if (radeon_vm_size < 1) {

		dev_warn(rdev->dev, "VM size (%d) to small, min is 1GB\n",

			 radeon_vm_size);

		radeon_vm_size = 4096;

		radeon_vm_size = 4;

	}



       /*

        * Max GPUVM size for Cayman, SI and CI are 40 bits.

        */

	if (radeon_vm_size > 1024*1024) {

		dev_warn(rdev->dev, "VM size (%d) to large, max is 1TB\n",

	if (radeon_vm_size > 1024) {

		dev_warn(rdev->dev, "VM size (%d) too large, max is 1TB\n",

			 radeon_vm_size);

		radeon_vm_size = 4096;

		radeon_vm_size = 4;

	}



	/* defines number of bits in page table versus page directory,

	 * a page is 4KB so we have 12 bits offset, minimum 9 bits in the

	 * page table and the remaining bits are in the page directory */

	if (radeon_vm_block_size < 9) {

		dev_warn(rdev->dev, "VM page table size (%d) to small\n",

		dev_warn(rdev->dev, "VM page table size (%d) too small\n",

			 radeon_vm_block_size);

		radeon_vm_block_size = 9;

	}



	if (radeon_vm_block_size > 24 ||

	    radeon_vm_size < (1ull << radeon_vm_block_size)) {

		dev_warn(rdev->dev, "VM page table size (%d) to large\n",

	    (radeon_vm_size * 1024) < (1ull << radeon_vm_block_size)) {

		dev_warn(rdev->dev, "VM page table size (%d) too large\n",

			 radeon_vm_block_size);

		radeon_vm_block_size = 9;

	}
@@ -1238,7 +1238,7 @@ int radeon_device_init(struct radeon_device *rdev, 
	/* Adjust VM size here.

	 * Max GPUVM size for cayman+ is 40 bits.

	 */

	rdev->vm_manager.max_pfn = radeon_vm_size << 8;

	rdev->vm_manager.max_pfn = radeon_vm_size << 18;



	/* Set asic functions */

	r = radeon_asic_init(rdev);

drivers/gpu/drm/radeon/radeon_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ int radeon_dpm = -1; 
int radeon_aspm = -1;

int radeon_runtime_pm = -1;

int radeon_hard_reset = 0;

int radeon_vm_size = 4096;

int radeon_vm_size = 4;

int radeon_vm_block_size = 9;

int radeon_deep_color = 0;
@@ -243,7 +243,7 @@ module_param_named(runpm, radeon_runtime_pm, int, 0444); 
MODULE_PARM_DESC(hard_reset, "PCI config reset (1 = force enable, 0 = disable (default))");

module_param_named(hard_reset, radeon_hard_reset, int, 0444);



MODULE_PARM_DESC(vm_size, "VM address space size in megabytes (default 4GB)");

MODULE_PARM_DESC(vm_size, "VM address space size in gigabytes (default 4GB)");

module_param_named(vm_size, radeon_vm_size, int, 0444);



MODULE_PARM_DESC(vm_block_size, "VM page table size in bits (default 9)");

drivers/gpu/drm/radeon/radeon_kms.c

+13 −13
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
	/* new gpu have virtual address space support */

	if (rdev->family >= CHIP_CAYMAN) {

		struct radeon_fpriv *fpriv;

		struct radeon_bo_va *bo_va;

		struct radeon_vm *vm;

		int r;



		fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL);
@@ -587,7 +587,8 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
			return -ENOMEM;

		}



		r = radeon_vm_init(rdev, &fpriv->vm);

		vm = &fpriv->vm;

		r = radeon_vm_init(rdev, vm);

		if (r) {

			kfree(fpriv);

			return r;
@@ -596,22 +597,23 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
		if (rdev->accel_working) {

			r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);

			if (r) {

				radeon_vm_fini(rdev, &fpriv->vm);

				radeon_vm_fini(rdev, vm);

				kfree(fpriv);

				return r;

			}



			/* map the ib pool buffer read only into

			 * virtual address space */

			bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,

			vm->ib_bo_va = radeon_vm_bo_add(rdev, vm,

							rdev->ring_tmp_bo.bo);

			r = radeon_vm_bo_set_addr(rdev, bo_va, RADEON_VA_IB_OFFSET,

			r = radeon_vm_bo_set_addr(rdev, vm->ib_bo_va,

						  RADEON_VA_IB_OFFSET,

						  RADEON_VM_PAGE_READABLE |

						  RADEON_VM_PAGE_SNOOPED);



			radeon_bo_unreserve(rdev->ring_tmp_bo.bo);

			if (r) {

				radeon_vm_fini(rdev, &fpriv->vm);

				radeon_vm_fini(rdev, vm);

				kfree(fpriv);

				return r;

			}
@@ -640,21 +642,19 @@ void radeon_driver_postclose_kms(struct drm_device *dev, 
	/* new gpu have virtual address space support */

	if (rdev->family >= CHIP_CAYMAN && file_priv->driver_priv) {

		struct radeon_fpriv *fpriv = file_priv->driver_priv;

		struct radeon_bo_va *bo_va;

		struct radeon_vm *vm = &fpriv->vm;

		int r;



		if (rdev->accel_working) {

			r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);

			if (!r) {

				bo_va = radeon_vm_bo_find(&fpriv->vm,

							  rdev->ring_tmp_bo.bo);

				if (bo_va)

					radeon_vm_bo_rmv(rdev, bo_va);

				if (vm->ib_bo_va)

					radeon_vm_bo_rmv(rdev, vm->ib_bo_va);

				radeon_bo_unreserve(rdev->ring_tmp_bo.bo);

			}

		}



		radeon_vm_fini(rdev, &fpriv->vm);

		radeon_vm_fini(rdev, vm);

		kfree(fpriv);

		file_priv->driver_priv = NULL;

	}