drm/amdkfd: Remove redundand kfd2kgd interface lookup
Subsystems (3)
Felix Kuehling
maintainerPATCH 1/1 drm/amdkfd: Remove redundand kfd2kgd interface lookup
kfd_pasid.c isn't using the kfd2kgd interface any more. Remove redundant code trying to look up a device for finding that interface.
--- drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 31 +++++++------------------- 1 file changed, 8 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_pasid.c +8 -23
@@ -25,7 +25,7 @@#include "amdgpu_ids.h" static unsigned int pasid_bits =16 ; -static const struct kfd2kgd_calls *kfd2kgd; +static bool pasids_allocated;/* = false */ bool kfd_set_pasid_limit (unsigned int new_limit) {
@@ -33,7 +33,7 @@ bool kfd_set_pasid_limit(unsigned int new_limit)return false;if (new_limit < (1U << pasid_bits)) { -if (kfd2kgd) +if (pasids_allocated)/* We've already allocated user PASIDs, too late to * change the limit */
@@ -53,32 +53,17 @@ unsigned int kfd_get_pasid_limit(void)unsigned int kfd_pasid_alloc (void ) { -int r; +int r =amdgpu_pasid_alloc (pasid_bits); -/* Find the first best KFD device for calling KGD */ -if (!kfd2kgd) { -struct kfd_dev *dev =NULL ; -unsigned int i =0 ; - -while ((kfd_topology_enum_kfd_devices (i, &dev)) ==0 ) { -if (dev && dev->kfd2kgd) { - kfd2kgd = dev->kfd2kgd; -break ; - } - i++; - } - -if (!kfd2kgd) -return false; +if (r >0 ) { + pasids_allocated = true; +return r; } - r =amdgpu_pasid_alloc (pasid_bits); - -return r >0 ? r :0 ; +return 0 ; }void kfd_pasid_free (unsigned int pasid) { -if (kfd2kgd) -amdgpu_pasid_free (pasid); +amdgpu_pasid_free (pasid); }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
Quoted 79 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Felix Kuehling
Sent: Tuesday, June 30, 2020 10:34 PM
To: [email protected]
Subject: [PATCH 1/1] drm/amdkfd: Remove redundand kfd2kgd interface lookup
kfd_pasid.cisn't using the kfd2kgd interface any more. Remove redundant code trying to look up a device for finding that interface.Signed-off-by Felix Kuehling <[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 31 +++++++------------------- 1 file changed, 8 insertions(+), 23 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_pasid.c +1
-1@@ -25,7 +25,7 @@#include "amdgpu_ids.h" static unsigned int pasid_bits =16 ; -static const struct kfd2kgd_calls *kfd2kgd; +static bool pasids_allocated;/* = false */ bool kfd_set_pasid_limit(unsigned int new_limit) { @@ -33,7 +33,7 @@ boolkfd_set_pasid_limit (unsigned int new_limit)drivers/gpu/drm/amd/amdkfd/kfd_pasid.c +7
-23return false;if (new_limit < (1U << pasid_bits)) { -if (kfd2kgd) +if (pasids_allocated)/* We've already allocated user PASIDs, too late to * change the limit */ @@ -53,32 +53,17 @@ unsigned int kfd_get_pasid_limit(void)unsigned int kfd_pasid_alloc (void ) { -int r; +int r =amdgpu_pasid_alloc (pasid_bits); -/* Find the first best KFD device for calling KGD */ -if (!kfd2kgd) { -struct kfd_dev *dev =NULL ; -unsigned int i =0 ; - -while ((kfd_topology_enum_kfd_devices (i, &dev)) ==0 ) { -if (dev && dev->kfd2kgd) { - kfd2kgd = dev->kfd2kgd; -break ; - } - i++; - } - -if (!kfd2kgd) -return false; +if (r >0 ) { + pasids_allocated = true; +return r; } - r =amdgpu_pasid_alloc (pasid_bits); - -return r >0 ? r :0 ; +return 0 ; }void kfd_pasid_free (unsigned int pasid) { -if (kfd2kgd) -amdgpu_pasid_free (pasid); +amdgpu_pasid_free (pasid); } --2.17.1
Quoted 9 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.fr
eedesktop.org%2Fmailman%2Flistinfo%2Famd- gfx&data=02%7C01%7Ckent.russell%40amd.com%7C6064ff0aff58480be0 ae08d81d673758%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C63 7291676460049430&sdata=pELFzqkP3isRtcEgtYkaaTuvGB4Xtf%2BrOp615 PARX4g%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx