efb1c6582e
amdgpu must load only after amdkfd's loading has been completed. If that is not enforced, then amdgpu's call into amdkfd's functions will cause a kernel BUG. When amdgpu and amdkfd are built as kernel modules, that rule is enforced by the kernel's modules loading mechanism. When amdgpu and amdkfd are built inside the kernel image, that rule is enforced by ordering in the drm Makefile (amdkfd before amdgpu). Instead of using drm Makefile ordering, we can now use deferred loading as amdkfd now returns -EPROBE_DEFER in kgd2kfd_init() when it is not yet loaded. This patch defers amdgpu loading by propagating -EPROBE_DEFER to the kernel's drivers loading infrastructure. That will put amdgpu into the pending drivers list (see description in dd.c). Once amdkfd is loaded, a call to kgd2kfd_init() will return successfully and amdgpu will be able to load. Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
66 lines
2.4 KiB
C
66 lines
2.4 KiB
C
/*
|
|
* Copyright 2014 Advanced Micro Devices, Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
/* amdgpu_amdkfd.h defines the private interface between amdgpu and amdkfd. */
|
|
|
|
#ifndef AMDGPU_AMDKFD_H_INCLUDED
|
|
#define AMDGPU_AMDKFD_H_INCLUDED
|
|
|
|
#include <linux/types.h>
|
|
#include <kgd_kfd_interface.h>
|
|
|
|
struct amdgpu_device;
|
|
|
|
struct kgd_mem {
|
|
struct amdgpu_bo *bo;
|
|
uint64_t gpu_addr;
|
|
void *cpu_ptr;
|
|
};
|
|
|
|
int amdgpu_amdkfd_init(void);
|
|
void amdgpu_amdkfd_fini(void);
|
|
|
|
bool amdgpu_amdkfd_load_interface(struct amdgpu_device *rdev);
|
|
|
|
void amdgpu_amdkfd_suspend(struct amdgpu_device *rdev);
|
|
int amdgpu_amdkfd_resume(struct amdgpu_device *rdev);
|
|
void amdgpu_amdkfd_interrupt(struct amdgpu_device *rdev,
|
|
const void *ih_ring_entry);
|
|
void amdgpu_amdkfd_device_probe(struct amdgpu_device *rdev);
|
|
void amdgpu_amdkfd_device_init(struct amdgpu_device *rdev);
|
|
void amdgpu_amdkfd_device_fini(struct amdgpu_device *rdev);
|
|
|
|
struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions(void);
|
|
struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions(void);
|
|
|
|
/* Shared API */
|
|
int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,
|
|
void **mem_obj, uint64_t *gpu_addr,
|
|
void **cpu_ptr);
|
|
void free_gtt_mem(struct kgd_dev *kgd, void *mem_obj);
|
|
uint64_t get_vmem_size(struct kgd_dev *kgd);
|
|
uint64_t get_gpu_clock_counter(struct kgd_dev *kgd);
|
|
|
|
uint32_t get_max_engine_clock_in_mhz(struct kgd_dev *kgd);
|
|
|
|
#endif /* AMDGPU_AMDKFD_H_INCLUDED */
|