drm/amdgpu: remove amdgpu_ttm_late_init and amdgpu_bo_late_init (64f2c158) · Commits · 戴 / test

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

+0 −17

Original line number	Diff line number	Diff line
		@@ -1074,23 +1074,6 @@ int amdgpu_bo_init(struct amdgpu_device *adev)
		return amdgpu_ttm_init(adev);
		}

		/**
		* amdgpu_bo_late_init - late init
		* @adev: amdgpu device object
		*
		* Calls amdgpu_ttm_late_init() to free resources used earlier during
		* initialization.
		*
		* Returns:
		* 0 for success or a negative error code on failure.
		*/
		int amdgpu_bo_late_init(struct amdgpu_device *adev)
		{
		amdgpu_ttm_late_init(adev);

		return 0;
		}

		/**
		* amdgpu_bo_fini - tear down memory manager
		* @adev: amdgpu device object

+0 −1

Original line number	Diff line number	Diff line
		@@ -269,7 +269,6 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
		void amdgpu_bo_unpin(struct amdgpu_bo *bo);
		int amdgpu_bo_evict_vram(struct amdgpu_device *adev);
		int amdgpu_bo_init(struct amdgpu_device *adev);
		int amdgpu_bo_late_init(struct amdgpu_device *adev);
		void amdgpu_bo_fini(struct amdgpu_device *adev);
		int amdgpu_bo_fbdev_mmap(struct amdgpu_bo *bo,
		struct vm_area_struct *vma);

+0 −7

Original line number	Diff line number	Diff line
		@@ -2021,13 +2021,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
		return 0;
		}

		/*
		* amdgpu_ttm_late_init - Handle any late initialization for amdgpu_ttm
		*/
		void amdgpu_ttm_late_init(struct amdgpu_device *adev)
		{
		}

		/*
		* amdgpu_ttm_fini - De-initialize the TTM memory pools
		*/

+0 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +131,6 @@ int amdgpu_vram_mgr_query_page_status(struct ttm_resource_manager *man,
		uint64_t start);

		int amdgpu_ttm_init(struct amdgpu_device *adev);
		void amdgpu_ttm_late_init(struct amdgpu_device *adev);
		void amdgpu_ttm_fini(struct amdgpu_device *adev);
		void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev,
		bool enable);

+0 −2

Original line number	Diff line number	Diff line
		@@ -717,8 +717,6 @@ static int gmc_v10_0_late_init(void *handle)
		struct amdgpu_device adev = (struct amdgpu_device )handle;
		int r;

		amdgpu_bo_late_init(adev);

		r = amdgpu_gmc_allocate_vm_inv_eng(adev);
		if (r)
		return r;