| Message ID | 1541187342-1412-1-git-send-email-andrey.grodzovsky@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [libdrm] amdgpu/test: Disable deadlock tests for all non gfx8/9 ASICs. | expand |
On Fri, Nov 2, 2018 at 3:36 PM Andrey Grodzovsky <andrey.grodzovsky@amd.com> wrote: > > Since only for those ASICs gpu reset is enabled by deafult. > Also update disable message and fix identation . > > Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> > --- > tests/amdgpu/deadlock_tests.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/tests/amdgpu/deadlock_tests.c b/tests/amdgpu/deadlock_tests.c > index 04600a7..00a17ca 100644 > --- a/tests/amdgpu/deadlock_tests.c > +++ b/tests/amdgpu/deadlock_tests.c > @@ -119,11 +119,13 @@ CU_BOOL suite_deadlock_tests_enable(void) > &minor_version, &device_handle)) > return CU_FALSE; > > - if (device_handle->info.family_id == AMDGPU_FAMILY_SI || > - device_handle->info.family_id == AMDGPU_FAMILY_CZ || > - device_handle->info.family_id == AMDGPU_FAMILY_RV || > - device_handle->info.family_id == AMDGPU_FAMILY_KV) { > - printf("\n\nCurrently hangs the CP on this ASIC, deadlock suite disabled\n"); > + /* > + * Only enable for ASICs supporting GPU reset and for which it's enabled > + * by default (currently GFX8/9 dGPUS Missing ) in your comment. With that fixed: Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > + */ > + if (device_handle->info.family_id != AMDGPU_FAMILY_VI && > + device_handle->info.family_id != AMDGPU_FAMILY_AI) { > + printf("\n\nGPU reset is not enabled for the ASIC, deadlock suite disabled\n"); > enable = CU_FALSE; > } > > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
diff --git a/tests/amdgpu/deadlock_tests.c b/tests/amdgpu/deadlock_tests.c index 04600a7..00a17ca 100644 --- a/tests/amdgpu/deadlock_tests.c +++ b/tests/amdgpu/deadlock_tests.c @@ -119,11 +119,13 @@ CU_BOOL suite_deadlock_tests_enable(void) &minor_version, &device_handle)) return CU_FALSE; - if (device_handle->info.family_id == AMDGPU_FAMILY_SI || - device_handle->info.family_id == AMDGPU_FAMILY_CZ || - device_handle->info.family_id == AMDGPU_FAMILY_RV || - device_handle->info.family_id == AMDGPU_FAMILY_KV) { - printf("\n\nCurrently hangs the CP on this ASIC, deadlock suite disabled\n"); + /* + * Only enable for ASICs supporting GPU reset and for which it's enabled + * by default (currently GFX8/9 dGPUS + */ + if (device_handle->info.family_id != AMDGPU_FAMILY_VI && + device_handle->info.family_id != AMDGPU_FAMILY_AI) { + printf("\n\nGPU reset is not enabled for the ASIC, deadlock suite disabled\n"); enable = CU_FALSE; }
Since only for those ASICs gpu reset is enabled by deafult. Also update disable message and fix identation . Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> --- tests/amdgpu/deadlock_tests.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)