Skip to contentSkip to conversation

drm/amdgpu: Wrong order for config and counter_id parameters

PATCH Applied [email protected] 2 participants 2 messages Jan 26, 2022 – Jan 27, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: Wrong order for config and counter_id parameters

From: huangqu <[email protected]>

Wrong order for config and counter_id parameters was passed, when calling df_v3_6_pmc_set_deferred and df_v3_6_pmc_is_deferred functions.

---
 drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/df_v3_6.c +3 -3
index 43c5e3ec9..f4dfca013 100644
@@ -458,7 +458,7 @@ static int df_v3_6_pmc_add_cntr(struct amdgpu_device *adev,
 
 #define DEFERRED_ARM_MASK	(1 << 31)
 static int df_v3_6_pmc_set_deferred(struct amdgpu_device *adev,
-				    int counter_idx, uint64_t config,
+				    uint64_t config, int counter_idx,
 				    bool is_deferred)
 {
 
@@ -476,8 +476,8 @@ static int df_v3_6_pmc_set_deferred(struct amdgpu_device *adev,
 }
 
 static bool df_v3_6_pmc_is_deferred(struct amdgpu_device *adev,
-				    int counter_idx,
-				    uint64_t config)
+				    uint64_t config,
+				    int counter_idx)
 {
 	return	(df_v3_6_pmc_has_counter(adev, config, counter_idx) &&
 			(adev->df_perfmon_config_assign_mask[counter_idx]

--
2.31.1

Applied
#1 lore raw

Applied. Thanks!

Alex

Quoted 37 lines · On Wed, Jan 26, 2022 at 4:48 AM <[email protected]> wrote:

From: huangqu <[email protected]>

Wrong order for config and counter_id parameters was passed, when calling df_v3_6_pmc_set_deferred and df_v3_6_pmc_is_deferred functions.

---
 drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/df_v3_6.c +3 -4
index 43c5e3ec9..f4dfca013 100644
@@ -458,7 +458,7 @@ static int df_v3_6_pmc_add_cntr(struct amdgpu_device *adev,
 
 #define DEFERRED_ARM_MASK      (1 << 31)
 static int df_v3_6_pmc_set_deferred(struct amdgpu_device *adev,
-                                   int counter_idx, uint64_t config,
+                                   uint64_t config, int counter_idx,
                                    bool is_deferred)
 {
 
@@ -476,8 +476,8 @@ static int df_v3_6_pmc_set_deferred(struct amdgpu_device *adev,
 }
 
 static bool df_v3_6_pmc_is_deferred(struct amdgpu_device *adev,
-                                   int counter_idx,
-                                   uint64_t config)
+                                   uint64_t config,
+                                   int counter_idx)
 {
        return  (df_v3_6_pmc_has_counter(adev, config, counter_idx) &&
                        (adev->df_perfmon_config_assign_mask[counter_idx]
--

2.31.1