diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_kfd.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_kfd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kfd.c b/drivers/gpu/drm/radeon/radeon_kfd.c index 061eaa9c19c7..4cdcaf8361e1 100644 --- a/drivers/gpu/drm/radeon/radeon_kfd.c +++ b/drivers/gpu/drm/radeon/radeon_kfd.c | |||
| @@ -103,15 +103,14 @@ static const struct kgd2kfd_calls *kgd2kfd; | |||
| 103 | bool radeon_kfd_init(void) | 103 | bool radeon_kfd_init(void) |
| 104 | { | 104 | { |
| 105 | #if defined(CONFIG_HSA_AMD_MODULE) | 105 | #if defined(CONFIG_HSA_AMD_MODULE) |
| 106 | bool (*kgd2kfd_init_p)(unsigned, const struct kfd2kgd_calls*, | 106 | bool (*kgd2kfd_init_p)(unsigned, const struct kgd2kfd_calls**); |
| 107 | const struct kgd2kfd_calls**); | ||
| 108 | 107 | ||
| 109 | kgd2kfd_init_p = symbol_request(kgd2kfd_init); | 108 | kgd2kfd_init_p = symbol_request(kgd2kfd_init); |
| 110 | 109 | ||
| 111 | if (kgd2kfd_init_p == NULL) | 110 | if (kgd2kfd_init_p == NULL) |
| 112 | return false; | 111 | return false; |
| 113 | 112 | ||
| 114 | if (!kgd2kfd_init_p(KFD_INTERFACE_VERSION, &kfd2kgd, &kgd2kfd)) { | 113 | if (!kgd2kfd_init_p(KFD_INTERFACE_VERSION, &kgd2kfd)) { |
| 115 | symbol_put(kgd2kfd_init); | 114 | symbol_put(kgd2kfd_init); |
| 116 | kgd2kfd = NULL; | 115 | kgd2kfd = NULL; |
| 117 | 116 | ||
| @@ -120,7 +119,7 @@ bool radeon_kfd_init(void) | |||
| 120 | 119 | ||
| 121 | return true; | 120 | return true; |
| 122 | #elif defined(CONFIG_HSA_AMD) | 121 | #elif defined(CONFIG_HSA_AMD) |
| 123 | if (!kgd2kfd_init(KFD_INTERFACE_VERSION, &kfd2kgd, &kgd2kfd)) { | 122 | if (!kgd2kfd_init(KFD_INTERFACE_VERSION, &kgd2kfd)) { |
| 124 | kgd2kfd = NULL; | 123 | kgd2kfd = NULL; |
| 125 | 124 | ||
| 126 | return false; | 125 | return false; |
| @@ -143,7 +142,8 @@ void radeon_kfd_fini(void) | |||
| 143 | void radeon_kfd_device_probe(struct radeon_device *rdev) | 142 | void radeon_kfd_device_probe(struct radeon_device *rdev) |
| 144 | { | 143 | { |
| 145 | if (kgd2kfd) | 144 | if (kgd2kfd) |
| 146 | rdev->kfd = kgd2kfd->probe((struct kgd_dev *)rdev, rdev->pdev); | 145 | rdev->kfd = kgd2kfd->probe((struct kgd_dev *)rdev, |
| 146 | rdev->pdev, &kfd2kgd); | ||
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | void radeon_kfd_device_init(struct radeon_device *rdev) | 149 | void radeon_kfd_device_init(struct radeon_device *rdev) |
