* [PATCH 01/21] drm/amdgpu:fix typo @ 2017-02-04 10:21 Monk Liu [not found] ` <1486203702-1116-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> 0 siblings, 1 reply; 13+ messages in thread From: Monk Liu @ 2017-02-04 10:21 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Monk Liu Change-Id: I68729b1d32d5e300b8f03a923d2065d51dbe6f7a Signed-off-by: Monk Liu <Monk.Liu@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 463a432..6106cd6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2447,7 +2447,7 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) if (fence) { r = fence_wait(fence, false); if (r) { - WARN(r, "recovery from shadow isn't comleted\n"); + WARN(r, "recovery from shadow isn't completed\n"); break; } } @@ -2459,7 +2459,7 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) if (fence) { r = fence_wait(fence, false); if (r) - WARN(r, "recovery from shadow isn't comleted\n"); + WARN(r, "recovery from shadow isn't completed\n"); } fence_put(fence); } -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <1486203702-1116-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org>]
* [PATCH 02/21] drm/amdgpu:fix golden init for sriov [not found] ` <1486203702-1116-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> @ 2017-02-04 10:21 ` Monk Liu [not found] ` <1486203702-1116-2-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> 2017-02-04 10:21 ` [PATCH 03/21] drm/amdgpu:fix scheduler hw reset&recovery Monk Liu ` (2 subsequent siblings) 3 siblings, 1 reply; 13+ messages in thread From: Monk Liu @ 2017-02-04 10:21 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Monk Liu although only vi supports SRIOV now,but we shouldn't make code has such assumption. Change-Id: Ie73c185dc2e7f64756253045b32cabe70d618d19 Signed-off-by: Monk Liu <Monk.Liu@amd.com> --- drivers/gpu/drm/amd/amdgpu/vi.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index 89b0dfe..7810030 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -274,12 +274,6 @@ static void vi_init_golden_registers(struct amdgpu_device *adev) /* Some of the registers might be dependent on GRBM_GFX_INDEX */ mutex_lock(&adev->grbm_idx_mutex); - if (amdgpu_sriov_vf(adev)) { - xgpu_vi_init_golden_registers(adev); - mutex_unlock(&adev->grbm_idx_mutex); - return; - } - switch (adev->asic_type) { case CHIP_TOPAZ: amdgpu_program_register_sequence(adev, @@ -292,7 +286,10 @@ static void vi_init_golden_registers(struct amdgpu_device *adev) (const u32)ARRAY_SIZE(fiji_mgcg_cgcg_init)); break; case CHIP_TONGA: - amdgpu_program_register_sequence(adev, + if (amdgpu_sriov_vf(adev)) + xgpu_vi_init_golden_registers(adev); + else + amdgpu_program_register_sequence(adev, tonga_mgcg_cgcg_init, (const u32)ARRAY_SIZE(tonga_mgcg_cgcg_init)); break; -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <1486203702-1116-2-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org>]
* RE: [PATCH 02/21] drm/amdgpu:fix golden init for sriov [not found] ` <1486203702-1116-2-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> @ 2017-02-06 2:35 ` Yu, Xiangliang [not found] ` <CY4PR12MB1701CFCB8B21A55E220404F9EB400-rpdhrqHFk05QaJCA3gGb3wdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 0 siblings, 1 reply; 13+ messages in thread From: Yu, Xiangliang @ 2017-02-06 2:35 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Liu, Monk Does FIJI need the golden init? Thanks! Xiangliang Yu > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf > Of Monk Liu > Sent: Saturday, February 04, 2017 6:22 PM > To: amd-gfx@lists.freedesktop.org > Cc: Liu, Monk <Monk.Liu@amd.com> > Subject: [PATCH 02/21] drm/amdgpu:fix golden init for sriov > > although only vi supports SRIOV now,but we shouldn't make code has such > assumption. > > Change-Id: Ie73c185dc2e7f64756253045b32cabe70d618d19 > Signed-off-by: Monk Liu <Monk.Liu@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/vi.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c > b/drivers/gpu/drm/amd/amdgpu/vi.c index 89b0dfe..7810030 100644 > --- a/drivers/gpu/drm/amd/amdgpu/vi.c > +++ b/drivers/gpu/drm/amd/amdgpu/vi.c > @@ -274,12 +274,6 @@ static void vi_init_golden_registers(struct > amdgpu_device *adev) > /* Some of the registers might be dependent on GRBM_GFX_INDEX > */ > mutex_lock(&adev->grbm_idx_mutex); > > - if (amdgpu_sriov_vf(adev)) { > - xgpu_vi_init_golden_registers(adev); > - mutex_unlock(&adev->grbm_idx_mutex); > - return; > - } > - > switch (adev->asic_type) { > case CHIP_TOPAZ: > amdgpu_program_register_sequence(adev, > @@ -292,7 +286,10 @@ static void vi_init_golden_registers(struct > amdgpu_device *adev) > (const > u32)ARRAY_SIZE(fiji_mgcg_cgcg_init)); > break; > case CHIP_TONGA: > - amdgpu_program_register_sequence(adev, > + if (amdgpu_sriov_vf(adev)) > + xgpu_vi_init_golden_registers(adev); > + else > + amdgpu_program_register_sequence(adev, > tonga_mgcg_cgcg_init, > (const > u32)ARRAY_SIZE(tonga_mgcg_cgcg_init)); > break; > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <CY4PR12MB1701CFCB8B21A55E220404F9EB400-rpdhrqHFk05QaJCA3gGb3wdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>]
* 答复: [PATCH 02/21] drm/amdgpu:fix golden init for sriov [not found] ` <CY4PR12MB1701CFCB8B21A55E220404F9EB400-rpdhrqHFk05QaJCA3gGb3wdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> @ 2017-02-06 2:37 ` Liu, Monk [not found] ` <DM5PR12MB1610CA0FD4ACDDE8F059173884400-2J9CzHegvk++jCVTvoAFKAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 0 siblings, 1 reply; 13+ messages in thread From: Liu, Monk @ 2017-02-06 2:37 UTC (permalink / raw) To: Yu, Xiangliang, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW [-- Attachment #1.1: Type: text/plain, Size: 2536 bytes --] FIJI is not supported in current stack ________________________________ 发件人: Yu, Xiangliang 发送时间: 2017年2月6日 10:35:34 收件人: Liu, Monk; amd-gfx@lists.freedesktop.org 抄送: Liu, Monk 主题: RE: [PATCH 02/21] drm/amdgpu:fix golden init for sriov Does FIJI need the golden init? Thanks! Xiangliang Yu > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf > Of Monk Liu > Sent: Saturday, February 04, 2017 6:22 PM > To: amd-gfx@lists.freedesktop.org > Cc: Liu, Monk <Monk.Liu@amd.com> > Subject: [PATCH 02/21] drm/amdgpu:fix golden init for sriov > > although only vi supports SRIOV now,but we shouldn't make code has such > assumption. > > Change-Id: Ie73c185dc2e7f64756253045b32cabe70d618d19 > Signed-off-by: Monk Liu <Monk.Liu@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/vi.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c > b/drivers/gpu/drm/amd/amdgpu/vi.c index 89b0dfe..7810030 100644 > --- a/drivers/gpu/drm/amd/amdgpu/vi.c > +++ b/drivers/gpu/drm/amd/amdgpu/vi.c > @@ -274,12 +274,6 @@ static void vi_init_golden_registers(struct > amdgpu_device *adev) > /* Some of the registers might be dependent on GRBM_GFX_INDEX > */ > mutex_lock(&adev->grbm_idx_mutex); > > - if (amdgpu_sriov_vf(adev)) { > - xgpu_vi_init_golden_registers(adev); > - mutex_unlock(&adev->grbm_idx_mutex); > - return; > - } > - > switch (adev->asic_type) { > case CHIP_TOPAZ: > amdgpu_program_register_sequence(adev, > @@ -292,7 +286,10 @@ static void vi_init_golden_registers(struct > amdgpu_device *adev) > (const > u32)ARRAY_SIZE(fiji_mgcg_cgcg_init)); > break; > case CHIP_TONGA: > - amdgpu_program_register_sequence(adev, > + if (amdgpu_sriov_vf(adev)) > + xgpu_vi_init_golden_registers(adev); > + else > + amdgpu_program_register_sequence(adev, > tonga_mgcg_cgcg_init, > (const > u32)ARRAY_SIZE(tonga_mgcg_cgcg_init)); > break; > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx [-- Attachment #1.2: Type: text/html, Size: 6033 bytes --] [-- Attachment #2: Type: text/plain, Size: 154 bytes --] _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <DM5PR12MB1610CA0FD4ACDDE8F059173884400-2J9CzHegvk++jCVTvoAFKAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>]
* 答复: [PATCH 02/21] drm/amdgpu:fix golden init for sriov [not found] ` <DM5PR12MB1610CA0FD4ACDDE8F059173884400-2J9CzHegvk++jCVTvoAFKAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> @ 2017-02-06 2:53 ` Liu, Monk 0 siblings, 0 replies; 13+ messages in thread From: Liu, Monk @ 2017-02-06 2:53 UTC (permalink / raw) To: Yu, Xiangliang, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW [-- Attachment #1.1: Type: text/plain, Size: 2932 bytes --] this patch is not needed, xgpu_vi_init_golden_registers(adev) will further process each VI asic accordingly. ________________________________ 发件人: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> 代表 Liu, Monk <Monk.Liu@amd.com> 发送时间: 2017年2月6日 10:37:55 收件人: Yu, Xiangliang; amd-gfx@lists.freedesktop.org 主题: 答复: [PATCH 02/21] drm/amdgpu:fix golden init for sriov FIJI is not supported in current stack ________________________________ 发件人: Yu, Xiangliang 发送时间: 2017年2月6日 10:35:34 收件人: Liu, Monk; amd-gfx@lists.freedesktop.org 抄送: Liu, Monk 主题: RE: [PATCH 02/21] drm/amdgpu:fix golden init for sriov Does FIJI need the golden init? Thanks! Xiangliang Yu > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf > Of Monk Liu > Sent: Saturday, February 04, 2017 6:22 PM > To: amd-gfx@lists.freedesktop.org > Cc: Liu, Monk <Monk.Liu@amd.com> > Subject: [PATCH 02/21] drm/amdgpu:fix golden init for sriov > > although only vi supports SRIOV now,but we shouldn't make code has such > assumption. > > Change-Id: Ie73c185dc2e7f64756253045b32cabe70d618d19 > Signed-off-by: Monk Liu <Monk.Liu@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/vi.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c > b/drivers/gpu/drm/amd/amdgpu/vi.c index 89b0dfe..7810030 100644 > --- a/drivers/gpu/drm/amd/amdgpu/vi.c > +++ b/drivers/gpu/drm/amd/amdgpu/vi.c > @@ -274,12 +274,6 @@ static void vi_init_golden_registers(struct > amdgpu_device *adev) > /* Some of the registers might be dependent on GRBM_GFX_INDEX > */ > mutex_lock(&adev->grbm_idx_mutex); > > - if (amdgpu_sriov_vf(adev)) { > - xgpu_vi_init_golden_registers(adev); > - mutex_unlock(&adev->grbm_idx_mutex); > - return; > - } > - > switch (adev->asic_type) { > case CHIP_TOPAZ: > amdgpu_program_register_sequence(adev, > @@ -292,7 +286,10 @@ static void vi_init_golden_registers(struct > amdgpu_device *adev) > (const > u32)ARRAY_SIZE(fiji_mgcg_cgcg_init)); > break; > case CHIP_TONGA: > - amdgpu_program_register_sequence(adev, > + if (amdgpu_sriov_vf(adev)) > + xgpu_vi_init_golden_registers(adev); > + else > + amdgpu_program_register_sequence(adev, > tonga_mgcg_cgcg_init, > (const > u32)ARRAY_SIZE(tonga_mgcg_cgcg_init)); > break; > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx [-- Attachment #1.2: Type: text/html, Size: 7053 bytes --] [-- Attachment #2: Type: text/plain, Size: 154 bytes --] _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 03/21] drm/amdgpu:fix scheduler hw reset&recovery [not found] ` <1486203702-1116-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> 2017-02-04 10:21 ` [PATCH 02/21] drm/amdgpu:fix golden init for sriov Monk Liu @ 2017-02-04 10:21 ` Monk Liu [not found] ` <1486203702-1116-3-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> 2017-02-04 10:21 ` [PATCH 04/21] drm/amdgpu:fix powerplay logic Monk Liu 2017-02-06 8:14 ` [PATCH 01/21] drm/amdgpu:fix typo Christian König 3 siblings, 1 reply; 13+ messages in thread From: Monk Liu @ 2017-02-04 10:21 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Monk Liu Change-Id: I39e0b77029d22dc3fb37e2f19da699647ae96aad Signed-off-by: Monk Liu <Monk.Liu@amd.com> --- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index ffe1f85..73dd5a7 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c @@ -384,6 +384,13 @@ void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched) struct amd_sched_job *s_job; spin_lock(&sched->job_list_lock); + s_job = list_first_entry_or_null(&sched->ring_mirror_list, + struct amd_sched_job, node); + if (!s_job) { + spin_unlock(&sched->job_list_lock); + return; + } + list_for_each_entry_reverse(s_job, &sched->ring_mirror_list, node) { if (fence_remove_callback(s_job->s_fence->parent, &s_job->s_fence->cb)) { fence_put(s_job->s_fence->parent); @@ -405,6 +412,11 @@ void amd_sched_job_recovery(struct amd_gpu_scheduler *sched) if (s_job && sched->timeout != MAX_SCHEDULE_TIMEOUT) schedule_delayed_work(&s_job->work_tdr, sched->timeout); + if (!s_job) { + spin_unlock(&sched->job_list_lock); + return; + } + list_for_each_entry_safe(s_job, tmp, &sched->ring_mirror_list, node) { struct amd_sched_fence *s_fence = s_job->s_fence; struct fence *fence; -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <1486203702-1116-3-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org>]
* RE: [PATCH 03/21] drm/amdgpu:fix scheduler hw reset&recovery [not found] ` <1486203702-1116-3-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> @ 2017-02-06 3:18 ` Zhou, David(ChunMing) [not found] ` <MWHPR1201MB02068DCB820D27AFD4F9FEB1B4400-3iK1xFAIwjrUF/YbdlDdgWrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org> 0 siblings, 1 reply; 13+ messages in thread From: Zhou, David(ChunMing) @ 2017-02-06 3:18 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Liu, Monk I'm curious what problem this patch fix? Any crash? My impression list_for will check if the list is empty, am I wrong? Regards, David Zhou -----Original Message----- From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Monk Liu Sent: Saturday, February 04, 2017 6:22 PM To: amd-gfx@lists.freedesktop.org Cc: Liu, Monk <Monk.Liu@amd.com> Subject: [PATCH 03/21] drm/amdgpu:fix scheduler hw reset&recovery Change-Id: I39e0b77029d22dc3fb37e2f19da699647ae96aad Signed-off-by: Monk Liu <Monk.Liu@amd.com> --- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index ffe1f85..73dd5a7 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c @@ -384,6 +384,13 @@ void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched) struct amd_sched_job *s_job; spin_lock(&sched->job_list_lock); + s_job = list_first_entry_or_null(&sched->ring_mirror_list, + struct amd_sched_job, node); + if (!s_job) { + spin_unlock(&sched->job_list_lock); + return; + } + list_for_each_entry_reverse(s_job, &sched->ring_mirror_list, node) { if (fence_remove_callback(s_job->s_fence->parent, &s_job->s_fence->cb)) { fence_put(s_job->s_fence->parent); @@ -405,6 +412,11 @@ void amd_sched_job_recovery(struct amd_gpu_scheduler *sched) if (s_job && sched->timeout != MAX_SCHEDULE_TIMEOUT) schedule_delayed_work(&s_job->work_tdr, sched->timeout); + if (!s_job) { + spin_unlock(&sched->job_list_lock); + return; + } + list_for_each_entry_safe(s_job, tmp, &sched->ring_mirror_list, node) { struct amd_sched_fence *s_fence = s_job->s_fence; struct fence *fence; -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <MWHPR1201MB02068DCB820D27AFD4F9FEB1B4400-3iK1xFAIwjrUF/YbdlDdgWrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>]
* Re: [PATCH 03/21] drm/amdgpu:fix scheduler hw reset&recovery [not found] ` <MWHPR1201MB02068DCB820D27AFD4F9FEB1B4400-3iK1xFAIwjrUF/YbdlDdgWrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org> @ 2017-02-06 8:17 ` Christian König [not found] ` <68f2819b-2be2-26ef-cba5-8a605a9822fe-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> 0 siblings, 1 reply; 13+ messages in thread From: Christian König @ 2017-02-06 8:17 UTC (permalink / raw) To: Zhou, David(ChunMing), Liu, Monk, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Am 06.02.2017 um 04:18 schrieb Zhou, David(ChunMing): > I'm curious what problem this patch fix? Any crash? > > My impression list_for will check if the list is empty, am I wrong? Yeah, I agree as well. list_for won't do anything if the list is empty. So this patch doesn't has any effect as far as I can see. Regards, Christian. > > Regards, > David Zhou > > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Monk Liu > Sent: Saturday, February 04, 2017 6:22 PM > To: amd-gfx@lists.freedesktop.org > Cc: Liu, Monk <Monk.Liu@amd.com> > Subject: [PATCH 03/21] drm/amdgpu:fix scheduler hw reset&recovery > > Change-Id: I39e0b77029d22dc3fb37e2f19da699647ae96aad > Signed-off-by: Monk Liu <Monk.Liu@amd.com> > --- > drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c > index ffe1f85..73dd5a7 100644 > --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c > +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c > @@ -384,6 +384,13 @@ void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched) > struct amd_sched_job *s_job; > > spin_lock(&sched->job_list_lock); > + s_job = list_first_entry_or_null(&sched->ring_mirror_list, > + struct amd_sched_job, node); > + if (!s_job) { > + spin_unlock(&sched->job_list_lock); > + return; > + } > + > list_for_each_entry_reverse(s_job, &sched->ring_mirror_list, node) { > if (fence_remove_callback(s_job->s_fence->parent, &s_job->s_fence->cb)) { > fence_put(s_job->s_fence->parent); > @@ -405,6 +412,11 @@ void amd_sched_job_recovery(struct amd_gpu_scheduler *sched) > if (s_job && sched->timeout != MAX_SCHEDULE_TIMEOUT) > schedule_delayed_work(&s_job->work_tdr, sched->timeout); > > + if (!s_job) { > + spin_unlock(&sched->job_list_lock); > + return; > + } > + > list_for_each_entry_safe(s_job, tmp, &sched->ring_mirror_list, node) { > struct amd_sched_fence *s_fence = s_job->s_fence; > struct fence *fence; _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <68f2819b-2be2-26ef-cba5-8a605a9822fe-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>]
* RE: [PATCH 03/21] drm/amdgpu:fix scheduler hw reset&recovery [not found] ` <68f2819b-2be2-26ef-cba5-8a605a9822fe-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> @ 2017-02-06 15:07 ` Liu, Monk 0 siblings, 0 replies; 13+ messages in thread From: Liu, Monk @ 2017-02-06 15:07 UTC (permalink / raw) To: Christian König, Zhou, David(ChunMing), amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Thanks, I'll sort & cleanup my patches and send again. BR Monk -----Original Message----- From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Christian K?nig Sent: Monday, February 06, 2017 4:18 PM To: Zhou, David(ChunMing) <David1.Zhou@amd.com>; Liu, Monk <Monk.Liu@amd.com>; amd-gfx@lists.freedesktop.org Subject: Re: [PATCH 03/21] drm/amdgpu:fix scheduler hw reset&recovery Am 06.02.2017 um 04:18 schrieb Zhou, David(ChunMing): > I'm curious what problem this patch fix? Any crash? > > My impression list_for will check if the list is empty, am I wrong? Yeah, I agree as well. list_for won't do anything if the list is empty. So this patch doesn't has any effect as far as I can see. Regards, Christian. > > Regards, > David Zhou > > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Monk Liu > Sent: Saturday, February 04, 2017 6:22 PM > To: amd-gfx@lists.freedesktop.org > Cc: Liu, Monk <Monk.Liu@amd.com> > Subject: [PATCH 03/21] drm/amdgpu:fix scheduler hw reset&recovery > > Change-Id: I39e0b77029d22dc3fb37e2f19da699647ae96aad > Signed-off-by: Monk Liu <Monk.Liu@amd.com> > --- > drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c > index ffe1f85..73dd5a7 100644 > --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c > +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c > @@ -384,6 +384,13 @@ void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched) > struct amd_sched_job *s_job; > > spin_lock(&sched->job_list_lock); > + s_job = list_first_entry_or_null(&sched->ring_mirror_list, > + struct amd_sched_job, node); > + if (!s_job) { > + spin_unlock(&sched->job_list_lock); > + return; > + } > + > list_for_each_entry_reverse(s_job, &sched->ring_mirror_list, node) { > if (fence_remove_callback(s_job->s_fence->parent, &s_job->s_fence->cb)) { > fence_put(s_job->s_fence->parent); > @@ -405,6 +412,11 @@ void amd_sched_job_recovery(struct amd_gpu_scheduler *sched) > if (s_job && sched->timeout != MAX_SCHEDULE_TIMEOUT) > schedule_delayed_work(&s_job->work_tdr, sched->timeout); > > + if (!s_job) { > + spin_unlock(&sched->job_list_lock); > + return; > + } > + > list_for_each_entry_safe(s_job, tmp, &sched->ring_mirror_list, node) { > struct amd_sched_fence *s_fence = s_job->s_fence; > struct fence *fence; _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 04/21] drm/amdgpu:fix powerplay logic [not found] ` <1486203702-1116-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> 2017-02-04 10:21 ` [PATCH 02/21] drm/amdgpu:fix golden init for sriov Monk Liu 2017-02-04 10:21 ` [PATCH 03/21] drm/amdgpu:fix scheduler hw reset&recovery Monk Liu @ 2017-02-04 10:21 ` Monk Liu [not found] ` <1486203702-1116-4-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> 2017-02-06 8:14 ` [PATCH 01/21] drm/amdgpu:fix typo Christian König 3 siblings, 1 reply; 13+ messages in thread From: Monk Liu @ 2017-02-04 10:21 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Monk Liu 1,like pp_hw_init, we shouldn't report error if PP disabled 2,disable pp_en if sriov Change-Id: I6d259f9609f223998bea236f64676b9c22133e4e Signed-off-by: Monk Liu <Monk.Liu@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 2 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c index 8856ecc..d56d200 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c @@ -43,7 +43,7 @@ static int amdgpu_create_pp_handle(struct amdgpu_device *adev) amd_pp = &(adev->powerplay); pp_init.chip_family = adev->family; pp_init.chip_id = adev->asic_type; - pp_init.pm_en = amdgpu_dpm != 0 ? true : false; + pp_init.pm_en = (amdgpu_dpm != 0 && !amdgpu_sriov_vf(adev)) ? true : false; pp_init.feature_mask = amdgpu_pp_feature_mask; pp_init.device = amdgpu_cgs_create_device(adev); ret = amd_powerplay_create(&pp_init, &(amd_pp->pp_handle)); diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index 429f18b..e9cf207 100644 --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c @@ -286,7 +286,7 @@ static int pp_resume(void *handle) } if (ret1 == PP_DPM_DISABLED) - return ret1; + return 0; eventmgr = pp_handle->eventmgr; -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <1486203702-1116-4-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org>]
* RE: [PATCH 04/21] drm/amdgpu:fix powerplay logic [not found] ` <1486203702-1116-4-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> @ 2017-02-06 12:31 ` Zhu, Rex [not found] ` <MWHPR12MB1694FE04FC1F52557F8B80F8FB400-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 0 siblings, 1 reply; 13+ messages in thread From: Zhu, Rex @ 2017-02-06 12:31 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Liu, Monk Hi Monk, In static int pp_suspend(void *handle) { ret = pp_check(pp_handle); if (ret != 0) return ret; in suspend function, when dpm disabled/srv, also neet to return 0. Best Regards Rex -----Original Message----- From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Monk Liu Sent: Saturday, February 04, 2017 6:22 PM To: amd-gfx@lists.freedesktop.org Cc: Liu, Monk Subject: [PATCH 04/21] drm/amdgpu:fix powerplay logic 1,like pp_hw_init, we shouldn't report error if PP disabled 2,disable pp_en if sriov Change-Id: I6d259f9609f223998bea236f64676b9c22133e4e Signed-off-by: Monk Liu <Monk.Liu@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 2 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c index 8856ecc..d56d200 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c @@ -43,7 +43,7 @@ static int amdgpu_create_pp_handle(struct amdgpu_device *adev) amd_pp = &(adev->powerplay); pp_init.chip_family = adev->family; pp_init.chip_id = adev->asic_type; - pp_init.pm_en = amdgpu_dpm != 0 ? true : false; + pp_init.pm_en = (amdgpu_dpm != 0 && !amdgpu_sriov_vf(adev)) ? true : +false; pp_init.feature_mask = amdgpu_pp_feature_mask; pp_init.device = amdgpu_cgs_create_device(adev); ret = amd_powerplay_create(&pp_init, &(amd_pp->pp_handle)); diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index 429f18b..e9cf207 100644 --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c @@ -286,7 +286,7 @@ static int pp_resume(void *handle) } if (ret1 == PP_DPM_DISABLED) - return ret1; + return 0; eventmgr = pp_handle->eventmgr; -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <MWHPR12MB1694FE04FC1F52557F8B80F8FB400-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>]
* RE: [PATCH 04/21] drm/amdgpu:fix powerplay logic [not found] ` <MWHPR12MB1694FE04FC1F52557F8B80F8FB400-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> @ 2017-02-06 14:18 ` Liu, Monk 0 siblings, 0 replies; 13+ messages in thread From: Liu, Monk @ 2017-02-06 14:18 UTC (permalink / raw) To: Zhu, Rex, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Thanks, I hadn't test S3 feature currently so didn't run into it by far BR Monk -----Original Message----- From: Zhu, Rex Sent: Monday, February 06, 2017 8:32 PM To: Liu, Monk <Monk.Liu@amd.com>; amd-gfx@lists.freedesktop.org Cc: Liu, Monk <Monk.Liu@amd.com> Subject: RE: [PATCH 04/21] drm/amdgpu:fix powerplay logic Hi Monk, In static int pp_suspend(void *handle) { ret = pp_check(pp_handle); if (ret != 0) return ret; in suspend function, when dpm disabled/srv, also neet to return 0. Best Regards Rex -----Original Message----- From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Monk Liu Sent: Saturday, February 04, 2017 6:22 PM To: amd-gfx@lists.freedesktop.org Cc: Liu, Monk Subject: [PATCH 04/21] drm/amdgpu:fix powerplay logic 1,like pp_hw_init, we shouldn't report error if PP disabled 2,disable pp_en if sriov Change-Id: I6d259f9609f223998bea236f64676b9c22133e4e Signed-off-by: Monk Liu <Monk.Liu@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 2 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c index 8856ecc..d56d200 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c @@ -43,7 +43,7 @@ static int amdgpu_create_pp_handle(struct amdgpu_device *adev) amd_pp = &(adev->powerplay); pp_init.chip_family = adev->family; pp_init.chip_id = adev->asic_type; - pp_init.pm_en = amdgpu_dpm != 0 ? true : false; + pp_init.pm_en = (amdgpu_dpm != 0 && !amdgpu_sriov_vf(adev)) ? true : +false; pp_init.feature_mask = amdgpu_pp_feature_mask; pp_init.device = amdgpu_cgs_create_device(adev); ret = amd_powerplay_create(&pp_init, &(amd_pp->pp_handle)); diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index 429f18b..e9cf207 100644 --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c @@ -286,7 +286,7 @@ static int pp_resume(void *handle) } if (ret1 == PP_DPM_DISABLED) - return ret1; + return 0; eventmgr = pp_handle->eventmgr; -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 01/21] drm/amdgpu:fix typo [not found] ` <1486203702-1116-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> ` (2 preceding siblings ...) 2017-02-04 10:21 ` [PATCH 04/21] drm/amdgpu:fix powerplay logic Monk Liu @ 2017-02-06 8:14 ` Christian König 3 siblings, 0 replies; 13+ messages in thread From: Christian König @ 2017-02-06 8:14 UTC (permalink / raw) To: Monk Liu, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Am 04.02.2017 um 11:21 schrieb Monk Liu: > Change-Id: I68729b1d32d5e300b8f03a923d2065d51dbe6f7a > Signed-off-by: Monk Liu <Monk.Liu@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> for this one. > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 463a432..6106cd6 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -2447,7 +2447,7 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) > if (fence) { > r = fence_wait(fence, false); > if (r) { > - WARN(r, "recovery from shadow isn't comleted\n"); > + WARN(r, "recovery from shadow isn't completed\n"); > break; > } > } > @@ -2459,7 +2459,7 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) > if (fence) { > r = fence_wait(fence, false); > if (r) > - WARN(r, "recovery from shadow isn't comleted\n"); > + WARN(r, "recovery from shadow isn't completed\n"); > } > fence_put(fence); > } _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-02-06 15:07 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-02-04 10:21 [PATCH 01/21] drm/amdgpu:fix typo Monk Liu [not found] ` <1486203702-1116-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> 2017-02-04 10:21 ` [PATCH 02/21] drm/amdgpu:fix golden init for sriov Monk Liu [not found] ` <1486203702-1116-2-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> 2017-02-06 2:35 ` Yu, Xiangliang [not found] ` <CY4PR12MB1701CFCB8B21A55E220404F9EB400-rpdhrqHFk05QaJCA3gGb3wdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 2017-02-06 2:37 ` 答复: " Liu, Monk [not found] ` <DM5PR12MB1610CA0FD4ACDDE8F059173884400-2J9CzHegvk++jCVTvoAFKAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 2017-02-06 2:53 ` Liu, Monk 2017-02-04 10:21 ` [PATCH 03/21] drm/amdgpu:fix scheduler hw reset&recovery Monk Liu [not found] ` <1486203702-1116-3-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> 2017-02-06 3:18 ` Zhou, David(ChunMing) [not found] ` <MWHPR1201MB02068DCB820D27AFD4F9FEB1B4400-3iK1xFAIwjrUF/YbdlDdgWrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org> 2017-02-06 8:17 ` Christian König [not found] ` <68f2819b-2be2-26ef-cba5-8a605a9822fe-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> 2017-02-06 15:07 ` Liu, Monk 2017-02-04 10:21 ` [PATCH 04/21] drm/amdgpu:fix powerplay logic Monk Liu [not found] ` <1486203702-1116-4-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> 2017-02-06 12:31 ` Zhu, Rex [not found] ` <MWHPR12MB1694FE04FC1F52557F8B80F8FB400-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 2017-02-06 14:18 ` Liu, Monk 2017-02-06 8:14 ` [PATCH 01/21] drm/amdgpu:fix typo Christian König
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.