1 files changed, 12 insertions, 115 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 6279956e92a4..a6f6cb0f2e02 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -336,51 +336,16 @@ static void amdgpu_block_invalid_wreg(struct amdgpu_device *adev,
 
 static int amdgpu_vram_scratch_init(struct amdgpu_device *adev)
 {
-        int r;
-
-        if (adev->vram_scratch.robj == NULL) {
-                r = amdgpu_bo_create(adev, AMDGPU_GPU_PAGE_SIZE,
-                                     PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,
-                                     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
-                                     AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
-                                     NULL, NULL, &adev->vram_scratch.robj);
-                if (r) {
-                        return r;
-                }
-        }
-
-        r = amdgpu_bo_reserve(adev->vram_scratch.robj, false);
-        if (unlikely(r != 0))
-                return r;
-        r = amdgpu_bo_pin(adev->vram_scratch.robj,
-                          AMDGPU_GEM_DOMAIN_VRAM, &adev->vram_scratch.gpu_addr);
-        if (r) {
-                amdgpu_bo_unreserve(adev->vram_scratch.robj);
-                return r;
-        }
-        r = amdgpu_bo_kmap(adev->vram_scratch.robj,
-                                (void **)&adev->vram_scratch.ptr);
-        if (r)
-                amdgpu_bo_unpin(adev->vram_scratch.robj);
-        amdgpu_bo_unreserve(adev->vram_scratch.robj);
-
-        return r;
+        return amdgpu_bo_create_kernel(adev, AMDGPU_GPU_PAGE_SIZE,
+                                       PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,
+                                       &adev->vram_scratch.robj,
+                                       &adev->vram_scratch.gpu_addr,
+                                       (void **)&adev->vram_scratch.ptr);
 }
 
 static void amdgpu_vram_scratch_fini(struct amdgpu_device *adev)
 {
-        int r;
-
-        if (adev->vram_scratch.robj == NULL) {
-                return;
-        }
-        r = amdgpu_bo_reserve(adev->vram_scratch.robj, true);
-        if (likely(r == 0)) {
-                amdgpu_bo_kunmap(adev->vram_scratch.robj);
-                amdgpu_bo_unpin(adev->vram_scratch.robj);
-                amdgpu_bo_unreserve(adev->vram_scratch.robj);
-        }
-        amdgpu_bo_unref(&adev->vram_scratch.robj);
+        amdgpu_bo_free_kernel(&adev->vram_scratch.robj, NULL, NULL);
 }
 
 /**
@@ -539,7 +504,8 @@ static int amdgpu_wb_init(struct amdgpu_device *adev)
         int r;
 
         if (adev->wb.wb_obj == NULL) {
-                r = amdgpu_bo_create_kernel(adev, AMDGPU_MAX_WB * sizeof(uint32_t),
+                /* AMDGPU_MAX_WB * sizeof(uint32_t) * 8 = AMDGPU_MAX_WB 256bit slots */
+                r = amdgpu_bo_create_kernel(adev, AMDGPU_MAX_WB * sizeof(uint32_t) * 8,
                                             PAGE_SIZE, AMDGPU_GEM_DOMAIN_GTT,
                                             &adev->wb.wb_obj, &adev->wb.gpu_addr,
                                             (void **)&adev->wb.wb);
@@ -570,47 +536,10 @@ static int amdgpu_wb_init(struct amdgpu_device *adev)
 int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb)
 {
         unsigned long offset = find_first_zero_bit(adev->wb.used, adev->wb.num_wb);
-        if (offset < adev->wb.num_wb) {
-                __set_bit(offset, adev->wb.used);
-                *wb = offset;
-                return 0;
-        } else {
-                return -EINVAL;
-        }
-}
 
-/**
- * amdgpu_wb_get_64bit - Allocate a wb entry
- *
- * @adev: amdgpu_device pointer
- * @wb: wb index
- *
- * Allocate a wb slot for use by the driver (all asics).
- * Returns 0 on success or -EINVAL on failure.
- */
-int amdgpu_wb_get_64bit(struct amdgpu_device *adev, u32 *wb)
-{
-        unsigned long offset = bitmap_find_next_zero_area_off(adev->wb.used,
-                                adev->wb.num_wb, 0, 2, 7, 0);
-        if ((offset + 1) < adev->wb.num_wb) {
+        if (offset < adev->wb.num_wb) {
                 __set_bit(offset, adev->wb.used);
-                __set_bit(offset + 1, adev->wb.used);
-                *wb = offset;
-                return 0;
-        } else {
-                return -EINVAL;
-        }
-}
-
-int amdgpu_wb_get_256Bit(struct amdgpu_device *adev, u32 *wb)
-{
-        int i = 0;
-        unsigned long offset = bitmap_find_next_zero_area_off(adev->wb.used,
-                                adev->wb.num_wb, 0, 8, 63, 0);
-        if ((offset + 7) < adev->wb.num_wb) {
-                for (i = 0; i < 8; i++)
-                        __set_bit(offset + i, adev->wb.used);
-                *wb = offset;
+                *wb = offset * 8; /* convert to dw offset */
                 return 0;
         } else {
                 return -EINVAL;
@@ -632,39 +561,6 @@ void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb)
 }
 
 /**
- * amdgpu_wb_free_64bit - Free a wb entry
- *
- * @adev: amdgpu_device pointer
- * @wb: wb index
- *
- * Free a wb slot allocated for use by the driver (all asics)
- */
-void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb)
-{
-        if ((wb + 1) < adev->wb.num_wb) {
-                __clear_bit(wb, adev->wb.used);
-                __clear_bit(wb + 1, adev->wb.used);
-        }
-}
-
-/**
- * amdgpu_wb_free_256bit - Free a wb entry
- *
- * @adev: amdgpu_device pointer
- * @wb: wb index
- *
- * Free a wb slot allocated for use by the driver (all asics)
- */
-void amdgpu_wb_free_256bit(struct amdgpu_device *adev, u32 wb)
-{
-        int i = 0;
-
-        if ((wb + 7) < adev->wb.num_wb)
-                for (i = 0; i < 8; i++)
-                        __clear_bit(wb + i, adev->wb.used);
-}
-
-/**
  * amdgpu_vram_location - try to find VRAM location
  * @adev: amdgpu device structure holding all necessary informations
  * @mc: memory controller structure holding memory informations
@@ -1948,7 +1844,8 @@ static int amdgpu_sriov_reinit_late(struct amdgpu_device *adev)
                 AMD_IP_BLOCK_TYPE_DCE,
                 AMD_IP_BLOCK_TYPE_GFX,
                 AMD_IP_BLOCK_TYPE_SDMA,
-                AMD_IP_BLOCK_TYPE_VCE,
+                AMD_IP_BLOCK_TYPE_UVD,
+                AMD_IP_BLOCK_TYPE_VCE
         };
 
         for (i = 0; i < ARRAY_SIZE(ip_order); i++) {