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.

1 files changed, 38 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 2895d9d86f29..7ed5302b511a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2064,6 +2064,44 @@ void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev,
         }
 }
 
+static uint32_t amdgpu_vm_get_block_size(uint64_t vm_size)
+{
+        /* Total bits covered by PD + PTs */
+        unsigned bits = ilog2(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 (vm_size <= 8)
+                return (bits - 9);
+        else
+                return ((bits + 3) / 2);
+}
+
+/**
+ * amdgpu_vm_adjust_size - adjust vm size and block size
+ *
+ * @adev: amdgpu_device pointer
+ * @vm_size: the default vm size if it's set auto
+ */
+void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint64_t vm_size)
+{
+        /* adjust vm size firstly */
+        if (amdgpu_vm_size == -1)
+                adev->vm_manager.vm_size = vm_size;
+        else
+                adev->vm_manager.vm_size = amdgpu_vm_size;
+
+        /* block size depends on vm size */
+        if (amdgpu_vm_block_size == -1)
+                adev->vm_manager.block_size =
+                        amdgpu_vm_get_block_size(adev->vm_manager.vm_size);
+        else
+                adev->vm_manager.block_size = amdgpu_vm_block_size;
+
+        DRM_INFO("vm size is %llu GB, block size is %u-bit\n",
+                adev->vm_manager.vm_size, adev->vm_manager.block_size);
+}
+
 /**
  * amdgpu_vm_init - initialize a vm instance
  *