Pushed, thanks! Marek
On Fri, Oct 19, 2018 at 3:56 PM Jiang, Sonny <sonny.ji...@amd.com> wrote: > Signed-off-by: Sonny Jiang <sonny.ji...@amd.com> > Tested-by: Michel Dänzer <michel.daen...@amd.com> > --- > src/gallium/drivers/radeonsi/si_pipe.c | 6 ++++-- > src/gallium/drivers/radeonsi/si_state.c | 5 +++-- > 2 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/src/gallium/drivers/radeonsi/si_pipe.c > b/src/gallium/drivers/radeonsi/si_pipe.c > index 46cf37567f..e285b056db 100644 > --- a/src/gallium/drivers/radeonsi/si_pipe.c > +++ b/src/gallium/drivers/radeonsi/si_pipe.c > @@ -993,8 +993,10 @@ struct pipe_screen *radeonsi_screen_create(struct > radeon_winsys *ws, > } > > /* The mere presense of CLEAR_STATE in the IB causes random GPU > hangs > - * on SI. */ > - sscreen->has_clear_state = sscreen->info.chip_class >= CIK; > + * on SI. Some CLEAR_STATE cause asic hang on radeon kernel, etc. > + * SPI_VS_OUT_CONFIG. So only enable CI CLEAR_STATE on amdgpu > kernel.*/ > + sscreen->has_clear_state = sscreen->info.chip_class >= CIK && > + sscreen->info.drm_major == 3; > > sscreen->has_distributed_tess = > sscreen->info.chip_class >= VI && > diff --git a/src/gallium/drivers/radeonsi/si_state.c > b/src/gallium/drivers/radeonsi/si_state.c > index 176ec74914..2977474130 100644 > --- a/src/gallium/drivers/radeonsi/si_state.c > +++ b/src/gallium/drivers/radeonsi/si_state.c > @@ -4899,8 +4899,9 @@ static void si_init_config(struct si_context *sctx) > bool has_clear_state = sscreen->has_clear_state; > struct si_pm4_state *pm4 = CALLOC_STRUCT(si_pm4_state); > > - /* Only SI can disable CLEAR_STATE for now. */ > - assert(has_clear_state || sscreen->info.chip_class == SI); > + /* SI, radeon kernel disabled CLEAR_STATE. */ > + assert(has_clear_state || sscreen->info.chip_class == SI || > + sscreen->info.drm_major != 3); > > if (!pm4) > return; > -- > 2.17.1 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
