Skip to contentSkip to conversation

powerplay:hwmgr - modify the return value

PATCH In review Xiaoliang Pang 4 participants 4 messages Sep 17, 2020

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

PATCH 1/1 powerplay:hwmgr - modify the return value

modify the return value is -EINVAL

Fixes f83a9991648bb("drm/amd/powerplay: add Vega10 powerplay support (v5)")
Fixes 2cac05dee6e30("drm/amd/powerplay: add the hw manager for vega12 (v4)")
Cc Eric Huang <[email protected]>
Cc Evan Quan <[email protected]>
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 2 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1 -1
index c378a000c934..7eada3098ffc 100644
@@ -4659,7 +4659,7 @@ static int vega10_display_configuration_changed_task(struct pp_hwmgr *hwmgr)
 	if ((data->water_marks_bitmap & WaterMarksExist) &&
 			!(data->water_marks_bitmap & WaterMarksLoaded)) {
 		result = smum_smc_table_manager(hwmgr, (uint8_t *)wm_table, WMTABLE, false);
-		PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return EINVAL);
+		PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return -EINVAL);
 		data->water_marks_bitmap |= WaterMarksLoaded;
 	}
 
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +1 -1
index a678a67f1c0d..04da52cea824 100644
@@ -2390,7 +2390,7 @@ static int vega12_display_configuration_changed_task(struct pp_hwmgr *hwmgr)
 			!(data->water_marks_bitmap & WaterMarksLoaded)) {
 		result = smum_smc_table_manager(hwmgr,
 						(uint8_t *)wm_table, TABLE_WATERMARKS, false);
-		PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return EINVAL);
+		PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return -EINVAL);
 		data->water_marks_bitmap |= WaterMarksLoaded;
 	}
 
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#1 lore raw

[AMD Official Use Only - Internal Distribution Only]

Thanks. Reviewed-by: Evan Quan <[email protected]>

-----Original Message-----
From: Xiaoliang Pang <[email protected]>
Sent: Thursday, September 17, 2020 11:46 AM
To: Quan, Evan <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; [email protected]; [email protected]; Feng, Kenneth <[email protected]>; [email protected]; [email protected]; [email protected]
Cc: Das, Nirmoy <[email protected]>; Huang, JinHuiEric <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: [PATCH v1] powerplay:hwmgr - modify the return value

modify the return value is -EINVAL

Fixes f83a9991648bb("drm/amd/powerplay: add Vega10 powerplay support (v5)")
Fixes 2cac05dee6e30("drm/amd/powerplay: add the hw manager for vega12 (v4)")
Cc Eric Huang <[email protected]>
Cc Evan Quan <[email protected]>
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 2 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1 -1
index c378a000c934..7eada3098ffc 100644
@@ -4659,7 +4659,7 @@ static int vega10_display_configuration_changed_task(struct pp_hwmgr *hwmgr)
 if ((data->water_marks_bitmap & WaterMarksExist) &&
 !(data->water_marks_bitmap & WaterMarksLoaded)) {
 result = smum_smc_table_manager(hwmgr, (uint8_t *)wm_table, WMTABLE, false);
-PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return EINVAL);
+PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return -EINVAL);
 data->water_marks_bitmap |= WaterMarksLoaded;
 }
 
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +1 -1
index a678a67f1c0d..04da52cea824 100644
@@ -2390,7 +2390,7 @@ static int vega12_display_configuration_changed_task(struct pp_hwmgr *hwmgr)
 !(data->water_marks_bitmap & WaterMarksLoaded)) {
 result = smum_smc_table_manager(hwmgr,
 (uint8_t *)wm_table, TABLE_WATERMARKS, false);
-PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return EINVAL);
+PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return -EINVAL);
 data->water_marks_bitmap |= WaterMarksLoaded;
 }
 

--
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

maintainer
#2 lore raw
In reply to Xiaoliang Pang

Am 17.09.20 um 05:46 schrieb Xiaoliang Pang:

Quoted 1 line

modify the return value is -EINVAL

Maybe better write something like "The correct return value should be -EINVAL." With that done feel free to add my acked-by.

Christian.

Quoted 29 lines
Fixes f83a9991648bb("drm/amd/powerplay: add Vega10 powerplay support (v5)")
Fixes 2cac05dee6e30("drm/amd/powerplay: add the hw manager for vega12 (v4)")
Cc Eric Huang <[email protected]>
Cc Evan Quan <[email protected]>
---
  drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 2 +-
  drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1 -1
index c378a000c934..7eada3098ffc 100644
@@ -4659,7 +4659,7 @@ static int vega10_display_configuration_changed_task(struct pp_hwmgr *hwmgr)
  	if ((data->water_marks_bitmap & WaterMarksExist) &&
  			!(data->water_marks_bitmap & WaterMarksLoaded)) {
  		result = smum_smc_table_manager(hwmgr, (uint8_t *)wm_table, WMTABLE, false);
-		PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return EINVAL);
+		PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return -EINVAL);
  		data->water_marks_bitmap |= WaterMarksLoaded;
  	}
 
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +0 -0
index a678a67f1c0d..04da52cea824 100644

drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c static int vega12_display_configuration_changed_task(struct pp_hwmgr *hwmgr) · line 2396

Quoted 8 lines
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +1 -1
@@ -2390,7 +2390,7 @@ static int vega12_display_configuration_changed_task(struct pp_hwmgr *hwmgr)
  			!(data->water_marks_bitmap & WaterMarksLoaded)) {
  		result = smum_smc_table_manager(hwmgr,
  						(uint8_t *)wm_table, TABLE_WATERMARKS, false);
-		PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return EINVAL);
+		PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return -EINVAL);
  		data->water_marks_bitmap |= WaterMarksLoaded;
  	}
 

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw
Quoted 6 lines · Christian König

Am 17.09.20 um 05:46 schrieb Xiaoliang Pang:

Quoted 1 line

modify the return value is -EINVAL

Maybe better write something like "The correct return value should be -EINVAL." With that done feel free to add my acked-by.

Applied with updated commit message.

Thanks!

Alex

Quoted 37 lines

Christian.

Quoted 34 lines
Fixes f83a9991648bb("drm/amd/powerplay: add Vega10 powerplay support (v5)")
Fixes 2cac05dee6e30("drm/amd/powerplay: add the hw manager for vega12 (v4)")
Cc Eric Huang <[email protected]>
Cc Evan Quan <[email protected]>
---
  drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 2 +-
  drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1 -1
index c378a000c934..7eada3098ffc 100644
@@ -4659,7 +4659,7 @@ static int vega10_display_configuration_changed_task(struct pp_hwmgr *hwmgr)
      if ((data->water_marks_bitmap & WaterMarksExist) &&
                      !(data->water_marks_bitmap & WaterMarksLoaded)) {
              result = smum_smc_table_manager(hwmgr, (uint8_t *)wm_table, WMTABLE, false);
-             PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return EINVAL);
+             PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return -EINVAL);
              data->water_marks_bitmap |= WaterMarksLoaded;
      }
 
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +1 -1
index a678a67f1c0d..04da52cea824 100644
@@ -2390,7 +2390,7 @@ static int vega12_display_configuration_changed_task(struct pp_hwmgr *hwmgr)
                      !(data->water_marks_bitmap & WaterMarksLoaded)) {
              result = smum_smc_table_manager(hwmgr,
                                              (uint8_t *)wm_table, TABLE_WATERMARKS, false);
-             PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return EINVAL);
+             PP_ASSERT_WITH_CODE(result, "Failed to update WMTABLE!", return -EINVAL);
Quoted 8 lines

drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c static int vega12_display_configuration_changed_task(struct pp_hwmgr *hwmgr) · line 2396

Quoted 3 lines
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +0 -0
              data->water_marks_bitmap |= WaterMarksLoaded;
      }
 

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx