Skip to contentSkip to conversation

drm/amdkfd: remove unused function get_reserved_sdma_queues_bitmap

PATCH In review Tom Rix 4 participants 4 messages May 25, 2023 – May 26, 2023

Subsystems (3)
lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 drm/amdkfd: remove unused function get_reserved_sdma_queues_bitmap

clang with W=1 reports drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:122:24: error:
unused function 'get_reserved_sdma_queues_bitmap' [-Werror,-Wunused-function]
static inline uint64_t get_reserved_sdma_queues_bitmap(struct device_queue_manager *dqm)

                       ^

This function is not used so remove it.

---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +0 -5
index 493b4b66f180..2fbd0a96424f 100644
@@ -119,11 +119,6 @@ unsigned int get_num_xgmi_sdma_queues(struct device_queue_manager *dqm)
 		dqm->dev->kfd->device_info.num_sdma_queues_per_engine;
 }
 
-static inline uint64_t get_reserved_sdma_queues_bitmap(struct device_queue_manager *dqm)
-{
-	return dqm->dev->kfd->device_info.reserved_sdma_queues_bitmap;
-}
-
 static void init_sdma_bitmaps(struct device_queue_manager *dqm)
 {
 	bitmap_zero(dqm->sdma_bitmap, KFD_MAX_SDMA_QUEUES);
Signature · 1 line
2.27.0
#1 lore raw
Quoted 8 lines · Tom Rix

clang with W=1 reports drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:122:24: error:
unused function 'get_reserved_sdma_queues_bitmap' [-Werror,-Wunused-function]
static inline uint64_t get_reserved_sdma_queues_bitmap(struct device_queue_manager *dqm)

                       ^

This function is not used so remove it.

Caused by commit 09a95a85cf3e ("drm/amdkfd: Update SDMA queue management for GFX9.4.3") it seems.

You can actually go a step farther and remove the reserved_sdma_queues_bitmap member from 'struct kfd_device_info' because it is now only assigned, never read.

$ git grep reserved_sdma_queues_bitmap next-20230525
next:20230525:drivers/gpu/drm/amd/amdkfd/kfd_device.c:        kfd->device_info.reserved_sdma_queues_bitmap = 0xFULL;
next:20230525:drivers/gpu/drm/amd/amdkfd/kfd_device.c:        kfd->device_info.reserved_sdma_queues_bitmap = 0x3ULL;
next:20230525:drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c:static inline uint64_t get_reserved_sdma_queues_bitmap(struct device_queue_manager *dqm)
next:20230525:drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c:    return dqm->dev->kfd->device_info.reserved_sdma_queues_bitmap;
next:20230525:drivers/gpu/drm/amd/amdkfd/kfd_priv.h:    uint64_t reserved_sdma_queues_bitmap;
Quoted 23 lines
---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +0 -5
index 493b4b66f180..2fbd0a96424f 100644
@@ -119,11 +119,6 @@ unsigned int get_num_xgmi_sdma_queues(struct device_queue_manager *dqm)
 		dqm->dev->kfd->device_info.num_sdma_queues_per_engine;
 }
 
-static inline uint64_t get_reserved_sdma_queues_bitmap(struct device_queue_manager *dqm)
-{
-	return dqm->dev->kfd->device_info.reserved_sdma_queues_bitmap;
-}
-
 static void init_sdma_bitmaps(struct device_queue_manager *dqm)
 {
 	bitmap_zero(dqm->sdma_bitmap, KFD_MAX_SDMA_QUEUES);
Signature · 1 line
2.27.0
maintainer
#2 lore raw
In reply to Tom Rix

[+Mukul]

Looks like this problem was introduced by Mukul's patch "drm/amdkfd: Update SDMA queue management for GFX9.4.3". Could this be a merge error between GFX 9.4.3 and GFX11 branches? I think the reserved_sdma_queues_bitmap was introduced after the 9.4.3 branch was created. Mukul, you worked on both, so you're probably in the best position to resolve this.

Regards,
  Felix

Quoted 28 lines · Tom Rix

clang with W=1 reports drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:122:24: error:
unused function 'get_reserved_sdma_queues_bitmap' [-Werror,-Wunused-function]
static inline uint64_t get_reserved_sdma_queues_bitmap(struct device_queue_manager *dqm)

                        ^

This function is not used so remove it.

---
  drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 5 -----
  1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +0 -5
index 493b4b66f180..2fbd0a96424f 100644
@@ -119,11 +119,6 @@ unsigned int get_num_xgmi_sdma_queues(struct device_queue_manager *dqm)
  		dqm->dev->kfd->device_info.num_sdma_queues_per_engine;
  }
 
-static inline uint64_t get_reserved_sdma_queues_bitmap(struct device_queue_manager *dqm)
-{
-	return dqm->dev->kfd->device_info.reserved_sdma_queues_bitmap;
-}
-
  static void init_sdma_bitmaps(struct device_queue_manager *dqm)
  {
  	bitmap_zero(dqm->sdma_bitmap, KFD_MAX_SDMA_QUEUES);
#3 lore raw

[AMD Official Use Only - General]

Quoted 13 lines

-----Original Message-----
From: Kuehling, Felix <[email protected]>
Sent: Thursday, May 25, 2023 5:10 PM
To: Tom Rix <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Joshi, Mukul <[email protected]>
Cc: [email protected]; [email protected]; linux- [email protected]; [email protected]
Subject: Re: [PATCH] drm/amdkfd: remove unused function get_reserved_sdma_queues_bitmap

Quoted 9 lines

[+Mukul]

Looks like this problem was introduced by Mukul's patch "drm/amdkfd:
Update SDMA queue management for GFX9.4.3". Could this be a merge error between GFX 9.4.3 and GFX11 branches? I think the reserved_sdma_queues_bitmap was introduced after the 9.4.3 branch was created. Mukul, you worked on both, so you're probably in the best position to resolve this.

Yes my patch introduced this regression. We need the get_reserved_sdma_queues_bitmap function. I will fix this regression and send out a new patch.

Thanks for noticing/catching this.

Regards,
Mukul

Quoted 40 lines

Regards,
Felix

Quoted 2 lines · Tom Rix

clang with W=1 reports

drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:12 2:24: error:

Quoted 2 lines

unused function 'get_reserved_sdma_queues_bitmap'
[-Werror,-Wunused-function] static inline uint64_t

get_reserved_sdma_queues_bitmap(struct device_queue_manager *dqm)

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c unsigned int get_num_xgmi_sdma_queues(struct

Quoted 14 lines
                        ^

This function is not used so remove it.

---
  drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 5 -----
  1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +0 -0
index 493b4b66f180..2fbd0a96424f 100644
@@ -119,11 +119,6 @@ unsigned int get_num_xgmi_sdma_queues(struct

device_queue_manager *dqm)

Quoted 13 lines
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +0 -4
            dqm->dev->kfd-
 device_info.num_sdma_queues_per_engine;
  }
 
-static inline uint64_t get_reserved_sdma_queues_bitmap(struct
 device_queue_manager *dqm) -{
-   return dqm->dev->kfd-
 device_info.reserved_sdma_queues_bitmap;
-}
-
  static void init_sdma_bitmaps(struct device_queue_manager *dqm)
  {
    bitmap_zero(dqm->sdma_bitmap, KFD_MAX_SDMA_QUEUES);