drm/amdgpu: Fix KFD initialization for multi-GPU systems
Subsystems (3)
PATCH 1/1 drm/amdgpu: Fix KFD initialization for multi-GPU systems
kfd2kgd is device-specific, so it should not be a global variable. Merge amdgpu_amdkfd_load_interface and amdgpu_amdkfd_device_probe so that it's only needed as a local variable in one function.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 37 +++++++++++++++--------------- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 -- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 1 - 3 files changed, 18 insertions(+), 22 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +18 -19
@@ -27,7 +27,6 @@#include "amdgpu_gfx.h" #include <linux/module.h> -const struct kfd2kgd_calls *kfd2kgd;const struct kgd2kfd_calls *kgd2kfd;bool (*kgd2kfd_init_p)(unsigned ,const struct kgd2kfd_calls **);
@@ -61,8 +60,21 @@ int amdgpu_amdkfd_init(void)return ret; } -bool amdgpu_amdkfd_load_interface (struct amdgpu_device *adev) +void amdgpu_amdkfd_fini (void ) +{ +if (kgd2kfd) { + kgd2kfd->exit (); +symbol_put (kgd2kfd_init); + } +} + +void amdgpu_amdkfd_device_probe (struct amdgpu_device *adev) { +const struct kfd2kgd_calls *kfd2kgd; + +if (!kgd2kfd) +return ; +switch (adev->asic_type) {#ifdef CONFIG_DRM_AMDGPU_CIK case CHIP_KAVERI :
@@ -73,25 +85,12 @@ bool amdgpu_amdkfd_load_interface(struct amdgpu_device *adev) kfd2kgd =amdgpu_amdkfd_gfx_8_0_get_functions ();break ;default : -return false; +dev_info (adev->dev,"kfd not supported on this ASIC\n" ); +return ; } -return true; -} - -void amdgpu_amdkfd_fini (void ) -{ -if (kgd2kfd) { - kgd2kfd->exit (); -symbol_put (kgd2kfd_init); - } -} - -void amdgpu_amdkfd_device_probe (struct amdgpu_device *adev) -{ -if (kgd2kfd) - adev->kfd = kgd2kfd->probe ((struct kgd_dev *)adev, - adev->pdev, kfd2kgd); + adev->kfd = kgd2kfd->probe ((struct kgd_dev *)adev, + adev->pdev, kfd2kgd); }void amdgpu_amdkfd_device_init (struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +0 -2
@@ -39,8 +39,6 @@ struct kgd_mem {int amdgpu_amdkfd_init (void );void amdgpu_amdkfd_fini (void ); -bool amdgpu_amdkfd_load_interface (struct amdgpu_device *adev); -void amdgpu_amdkfd_suspend (struct amdgpu_device *adev);int amdgpu_amdkfd_resume (struct amdgpu_device *adev); void amdgpu_amdkfd_interrupt(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0 -1
@@ -157,7 +157,6 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) "Error during ACPI methods call\n"); } -amdgpu_amdkfd_load_interface (adev);amdgpu_amdkfd_device_probe (adev);amdgpu_amdkfd_device_init (adev);
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1501276440-4420-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org
Oded Gabbay
Reviewed-byQuoted 102 lines · Felix Kuehling
kfd2kgd is device-specific, so it should not be a global variable. Merge
amdgpu_amdkfd_load_interfaceandamdgpu_amdkfd_device_probeso that it's only needed as a local variable in one function.Signed-off-by Felix Kuehling <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 37 +++++++++++++++--------------- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 -- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 1 - 3 files changed, 18 insertions(+), 22 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +18
-19@@ -27,7 +27,6 @@#include "amdgpu_gfx.h" #include <linux/module.h> -const struct kfd2kgd_calls *kfd2kgd;const struct kgd2kfd_calls *kgd2kfd;bool (*kgd2kfd_init_p)(unsigned ,const struct kgd2kfd_calls **);@@ -61,8 +60,21 @@ int amdgpu_amdkfd_init(void)return ret; } -bool amdgpu_amdkfd_load_interface (struct amdgpu_device *adev) +void amdgpu_amdkfd_fini (void ) +{ +if (kgd2kfd) { + kgd2kfd->exit (); +symbol_put (kgd2kfd_init); + } +} + +void amdgpu_amdkfd_device_probe (struct amdgpu_device *adev) { +const struct kfd2kgd_calls *kfd2kgd; + +if (!kgd2kfd) +return ; +switch (adev->asic_type) {#ifdef CONFIG_DRM_AMDGPU_CIK case CHIP_KAVERI :@@ -73,25 +85,12 @@ bool amdgpu_amdkfd_load_interface(struct amdgpu_device *adev) kfd2kgd =amdgpu_amdkfd_gfx_8_0_get_functions ();break ;default : -return false; +dev_info (adev->dev,"kfd not supported on this ASIC\n" ); +return ; } -return true; -} - -void amdgpu_amdkfd_fini (void ) -{ -if (kgd2kfd) { - kgd2kfd->exit (); -symbol_put (kgd2kfd_init); - } -} - -void amdgpu_amdkfd_device_probe (struct amdgpu_device *adev) -{ -if (kgd2kfd) - adev->kfd = kgd2kfd->probe ((struct kgd_dev *)adev, - adev->pdev, kfd2kgd); + adev->kfd = kgd2kfd->probe ((struct kgd_dev *)adev, + adev->pdev, kfd2kgd); }void amdgpu_amdkfd_device_init (struct amdgpu_device *adev)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +0
-2@@ -39,8 +39,6 @@ struct kgd_mem {int amdgpu_amdkfd_init (void );void amdgpu_amdkfd_fini (void ); -bool amdgpu_amdkfd_load_interface (struct amdgpu_device *adev); -void amdgpu_amdkfd_suspend (struct amdgpu_device *adev);int amdgpu_amdkfd_resume (struct amdgpu_device *adev); void amdgpu_amdkfd_interrupt(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0
-2@@ -157,7 +157,6 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) "Error during ACPI methods call\n"); } -amdgpu_amdkfd_load_interface (adev);amdgpu_amdkfd_device_probe (adev);amdgpu_amdkfd_device_init (adev); --
Quoted 2 lines
1.9.1
This patch is:
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx