mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
412c8f7de0
radeon must load only after amdkfd's loading has been completed. If that is not enforced, then radeon's call into amdkfd's functions will cause a kernel BUG. When radeon and amdkfd are built as kernel modules, that rule is enforced by the kernel's modules loading mechanism. When radeon and amdkfd are built inside the kernel image, that rule is enforced by ordering in the drm Makefile (amdkfd before radeon). 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 radeon loading by propagating -EPROBE_DEFER to the kernel's drivers loading infrastructure. That will put radeon into the pending drivers list (see description in dd.c). Once amdkfd is loaded, a call to kgd2kfd_init() will return successfully and radeon will be able to load. Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
47 lines
1.8 KiB
C
47 lines
1.8 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.
|
|
*/
|
|
|
|
/*
|
|
* radeon_kfd.h defines the private interface between the
|
|
* AMD kernel graphics drivers and the AMD KFD.
|
|
*/
|
|
|
|
#ifndef RADEON_KFD_H_INCLUDED
|
|
#define RADEON_KFD_H_INCLUDED
|
|
|
|
#include <linux/types.h>
|
|
#include "kgd_kfd_interface.h"
|
|
|
|
struct radeon_device;
|
|
|
|
int radeon_kfd_init(void);
|
|
void radeon_kfd_fini(void);
|
|
|
|
void radeon_kfd_suspend(struct radeon_device *rdev);
|
|
int radeon_kfd_resume(struct radeon_device *rdev);
|
|
void radeon_kfd_interrupt(struct radeon_device *rdev,
|
|
const void *ih_ring_entry);
|
|
void radeon_kfd_device_probe(struct radeon_device *rdev);
|
|
void radeon_kfd_device_init(struct radeon_device *rdev);
|
|
void radeon_kfd_device_fini(struct radeon_device *rdev);
|
|
|
|
#endif /* RADEON_KFD_H_INCLUDED */
|