Merge tag 'fbdev-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_object.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 62cabfb5dff84890eba1d4bd393bce355209b102..8da64245b31b924e85561cad158e80b159f639c6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -95,7 +95,6 @@ static void amdgpu_ttm_bo_destroy(struct ttm_buffer_object *tbo)
        bo = container_of(tbo, struct amdgpu_bo, tbo);
 
        amdgpu_update_memory_usage(bo->adev, &bo->tbo.mem, NULL);
-       amdgpu_mn_unregister(bo);
 
        mutex_lock(&bo->adev->gem.mutex);
        list_del_init(&bo->list);
@@ -272,11 +271,9 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,
        bo->flags = flags;
        amdgpu_fill_placement_to_bo(bo, placement);
        /* Kernel allocation are uninterruptible */
-       down_read(&adev->pm.mclk_lock);
        r = ttm_bo_init(&adev->mman.bdev, &bo->tbo, size, type,
                        &bo->placement, page_align, !kernel, NULL,
                        acc_size, sg, NULL, &amdgpu_ttm_bo_destroy);
-       up_read(&adev->pm.mclk_lock);
        if (unlikely(r != 0)) {
                return r;
        }