diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/si.c | 6 | 
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 3240a3d64f3..ae8b48205a6 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -2215,6 +2215,12 @@ static int si_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask)  {  	struct evergreen_mc_save save; +	if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE)) +		reset_mask &= ~(RADEON_RESET_GFX | RADEON_RESET_COMPUTE); + +	if (RREG32(DMA_STATUS_REG) & DMA_IDLE) +		reset_mask &= ~RADEON_RESET_DMA; +  	if (reset_mask == 0)  		return 0;  |