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

Commit 1420f63b authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Just some bug fixes and vega10 updates for 4.12.

* 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: fix fence memory leak in wait_all_fence V2
  drm/amdgpu: fix "fix 64bit division"
  drm/amd/powerplay: add fan controller table v11 support.
  drm/amd/powerplay: port newest process pptable code for vega10.
  drm/amdgpu: set vm size and block size by individual gmc by default (v3)
  drm/amdgpu: Avoid overflows/divide-by-zero in latency_watermark calculations.
  drm/amdgpu: Make display watermark calculations more accurate
  drm/radeon: fix typo in bandwidth calculation
  drm/radeon: Refuse to migrate a prime BO to VRAM. (v2)
  drm/radeon: Maintain prime import/export refcount for BOs
  drm/amdgpu: Refuse to pin or change acceptable domains of prime BOs to VRAM. (v2)
  drm/amdgpu: Fail fb creation from imported dma-bufs. (v2)
  drm/radeon: Fail fb creation from imported dma-bufs.
parents 2b2fc72a 32df87df

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+1 −0
Original line number Diff line number Diff line
@@ -1242,6 +1242,7 @@ static int amdgpu_cs_wait_all_fences(struct amdgpu_device *adev, 
			continue;



		r = dma_fence_wait_timeout(fence, true, timeout);

		dma_fence_put(fence);

		if (r < 0)

			return r;

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+13 −18
Original line number Diff line number Diff line
@@ -1040,35 +1040,31 @@ static bool amdgpu_check_pot_argument(int arg) 
	return (arg & (arg - 1)) == 0;

}



static void amdgpu_get_block_size(struct amdgpu_device *adev)

static void amdgpu_check_block_size(struct amdgpu_device *adev)

{

	/* 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 (amdgpu_vm_block_size == -1) {



		/* Total bits covered by PD + PTs */

		unsigned bits = ilog2(amdgpu_vm_size) + 18;



		/* Make sure the PD is 4K in size up to 8GB address space.

		   Above that split equal between PD and PTs */

		if (amdgpu_vm_size <= 8)

			amdgpu_vm_block_size = bits - 9;

		else

			amdgpu_vm_block_size = (bits + 3) / 2;

	if (amdgpu_vm_block_size == -1)

		return;



	} else if (amdgpu_vm_block_size < 9) {

	if (amdgpu_vm_block_size < 9) {

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

			 amdgpu_vm_block_size);

		amdgpu_vm_block_size = 9;

		goto def_value;

	}



	if (amdgpu_vm_block_size > 24 ||

	    (amdgpu_vm_size * 1024) < (1ull << amdgpu_vm_block_size)) {

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

			 amdgpu_vm_block_size);

		amdgpu_vm_block_size = 9;

		goto def_value;

	}



	return;



def_value:

	amdgpu_vm_block_size = -1;

}



static void amdgpu_check_vm_size(struct amdgpu_device *adev)
@@ -1097,8 +1093,7 @@ static void amdgpu_check_vm_size(struct amdgpu_device *adev) 
	return;



def_value:

	amdgpu_vm_size = 8;

	dev_info(adev->dev, "set default VM size %dGB\n", amdgpu_vm_size);

	amdgpu_vm_size = -1;

}



/**
@@ -1132,7 +1127,7 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev) 


	amdgpu_check_vm_size(adev);



	amdgpu_get_block_size(adev);

	amdgpu_check_block_size(adev);



	if (amdgpu_vram_page_split != -1 && (amdgpu_vram_page_split < 16 ||

	    !amdgpu_check_pot_argument(amdgpu_vram_page_split))) {

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+6 −0
Original line number Diff line number Diff line
@@ -614,6 +614,12 @@ amdgpu_user_framebuffer_create(struct drm_device *dev, 
		return ERR_PTR(-ENOENT);

	}



	/* Handle is imported dma-buf, so cannot be migrated to VRAM for scanout */

	if (obj->import_attach) {

		DRM_DEBUG_KMS("Cannot create framebuffer from imported dma_buf\n");

		return ERR_PTR(-EINVAL);

	}



	amdgpu_fb = kzalloc(sizeof(*amdgpu_fb), GFP_KERNEL);

	if (amdgpu_fb == NULL) {

		drm_gem_object_unreference_unlocked(obj);

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int amdgpu_runtime_pm = -1; 
unsigned amdgpu_ip_block_mask = 0xffffffff;

int amdgpu_bapm = -1;

int amdgpu_deep_color = 0;

int amdgpu_vm_size = 64;

int amdgpu_vm_size = -1;

int amdgpu_vm_block_size = -1;

int amdgpu_vm_fault_stop = 0;

int amdgpu_vm_debug = 0;

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+5 −0
Original line number Diff line number Diff line
@@ -729,6 +729,11 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, 
		break;

	}

	case AMDGPU_GEM_OP_SET_PLACEMENT:

		if (robj->prime_shared_count && (args->value & AMDGPU_GEM_DOMAIN_VRAM)) {

			r = -EINVAL;

			amdgpu_bo_unreserve(robj);

			break;

		}

		if (amdgpu_ttm_tt_get_usermm(robj->tbo.ttm)) {

			r = -EPERM;

			amdgpu_bo_unreserve(robj);