* [PATCH v1] powerplay:hwmgr - modify the return value
@ 2020-09-17 3:46 Xiaoliang Pang
2020-09-17 4:26 ` Quan, Evan
2020-09-17 8:28 ` Christian König
0 siblings, 2 replies; 4+ messages in thread
From: Xiaoliang Pang @ 2020-09-17 3:46 UTC (permalink / raw)
To: evan.quan, alexander.deucher, christian.koenig, airlied, daniel,
kenneth.feng, zhengbin13, pelle, yttao
Cc: nirmoy.das, JinHuiEric.Huang, amd-gfx, dri-devel, linux-kernel,
tianjia.zhang, dawning.pang
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 <JinHuiEric.Huang@amd.com>
Cc: Evan Quan <evan.quan@amd.com>
Signed-off-by: Xiaoliang Pang <dawning.pang@gmail.com>
---
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(-)
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
index c378a000c934..7eada3098ffc 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
@@ -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;
}
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
index a678a67f1c0d..04da52cea824 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [PATCH v1] powerplay:hwmgr - modify the return value
2020-09-17 3:46 [PATCH v1] powerplay:hwmgr - modify the return value Xiaoliang Pang
@ 2020-09-17 4:26 ` Quan, Evan
2020-09-17 8:28 ` Christian König
1 sibling, 0 replies; 4+ messages in thread
From: Quan, Evan @ 2020-09-17 4:26 UTC (permalink / raw)
To: Xiaoliang Pang, Deucher, Alexander, Koenig, Christian,
airlied@linux.ie, daniel@ffwll.ch, Feng, Kenneth,
zhengbin13@huawei.com, pelle@vangils.xyz, yttao@amd.com
Cc: Das, Nirmoy, Huang, JinHuiEric, amd-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
tianjia.zhang@linux.alibaba.com
[AMD Official Use Only - Internal Distribution Only]
Thanks. Reviewed-by: Evan Quan <evan.quan@amd.com>
-----Original Message-----
From: Xiaoliang Pang <dawning.pang@gmail.com>
Sent: Thursday, September 17, 2020 11:46 AM
To: Quan, Evan <Evan.Quan@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; airlied@linux.ie; daniel@ffwll.ch; Feng, Kenneth <Kenneth.Feng@amd.com>; zhengbin13@huawei.com; pelle@vangils.xyz; yttao@amd.com
Cc: Das, Nirmoy <Nirmoy.Das@amd.com>; Huang, JinHuiEric <JinHuiEric.Huang@amd.com>; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux-kernel@vger.kernel.org; tianjia.zhang@linux.alibaba.com; dawning.pang@gmail.com
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 <JinHuiEric.Huang@amd.com>
Cc: Evan Quan <evan.quan@amd.com>
Signed-off-by: Xiaoliang Pang <dawning.pang@gmail.com>
---
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(-)
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
index c378a000c934..7eada3098ffc 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
@@ -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;
}
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
index a678a67f1c0d..04da52cea824 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v1] powerplay:hwmgr - modify the return value
2020-09-17 3:46 [PATCH v1] powerplay:hwmgr - modify the return value Xiaoliang Pang
2020-09-17 4:26 ` Quan, Evan
@ 2020-09-17 8:28 ` Christian König
2020-09-17 15:35 ` Alex Deucher
1 sibling, 1 reply; 4+ messages in thread
From: Christian König @ 2020-09-17 8:28 UTC (permalink / raw)
To: Xiaoliang Pang, evan.quan, alexander.deucher, airlied, daniel,
kenneth.feng, zhengbin13, pelle, yttao
Cc: nirmoy.das, JinHuiEric.Huang, amd-gfx, dri-devel, linux-kernel,
tianjia.zhang
Am 17.09.20 um 05:46 schrieb Xiaoliang Pang:
> 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.
>
> 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 <JinHuiEric.Huang@amd.com>
> Cc: Evan Quan <evan.quan@amd.com>
> Signed-off-by: Xiaoliang Pang <dawning.pang@gmail.com>
> ---
> 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(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> index c378a000c934..7eada3098ffc 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> @@ -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;
> }
>
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
> index a678a67f1c0d..04da52cea824 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
> @@ -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;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v1] powerplay:hwmgr - modify the return value
2020-09-17 8:28 ` Christian König
@ 2020-09-17 15:35 ` Alex Deucher
0 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2020-09-17 15:35 UTC (permalink / raw)
To: Christian König
Cc: Xiaoliang Pang, Quan, Evan, Deucher, Alexander, Dave Airlie,
Daniel Vetter, Kenneth Feng, zhengbin, pelle, Yintian Tao,
Tianjia Zhang, LKML, Maling list - DRI developers, Nirmoy Das,
amd-gfx list, Eric Huang
On Thu, Sep 17, 2020 at 4:28 AM Christian König
<christian.koenig@amd.com> wrote:
>
> Am 17.09.20 um 05:46 schrieb Xiaoliang Pang:
> > 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
>
> Christian.
>
> >
> > 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 <JinHuiEric.Huang@amd.com>
> > Cc: Evan Quan <evan.quan@amd.com>
> > Signed-off-by: Xiaoliang Pang <dawning.pang@gmail.com>
> > ---
> > 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(-)
> >
> > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> > index c378a000c934..7eada3098ffc 100644
> > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> > @@ -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;
> > }
> >
> > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
> > index a678a67f1c0d..04da52cea824 100644
> > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
> > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
> > @@ -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
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-17 15:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-17 3:46 [PATCH v1] powerplay:hwmgr - modify the return value Xiaoliang Pang
2020-09-17 4:26 ` Quan, Evan
2020-09-17 8:28 ` Christian König
2020-09-17 15:35 ` Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox