On Mon, Aug 29, 2016 at 9:21 PM, jimqu <Jim.Qu at amd.com> wrote: > SDMA could be fail in the thaw() and restore() processes, do software reset > if each SDMA engine is busy. > > Change-Id: Iaff231330c256fbd297f2a98edb2d956bd0d78f8 > Signed-off-by: JimQu <Jim.Qu at amd.com> Reviewed-by: Alex Deucher <alexander.deucher at amd.com> > --- > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > index e71cd12..5d025d0 100644 > --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > @@ -52,6 +52,7 @@ static void cik_sdma_set_ring_funcs(struct amdgpu_device *adev); > static void cik_sdma_set_irq_funcs(struct amdgpu_device *adev); > static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev); > static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev); > +static int cik_sdma_soft_reset(void *handle); > > MODULE_FIRMWARE("radeon/bonaire_sdma.bin"); > MODULE_FIRMWARE("radeon/bonaire_sdma1.bin"); > @@ -998,6 +999,8 @@ static int cik_sdma_resume(void *handle) > { > struct amdgpu_device *adev = (struct amdgpu_device *)handle; > > + cik_sdma_soft_reset(handle); > + > return cik_sdma_hw_init(adev); > } > > -- > 1.9.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx