From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?windows-1252?Q?Christian_K=F6nig?= Subject: Re: [PATCH 1/3] drm/radeon: don't reset dma on NI/SI init Date: Thu, 18 Sep 2014 19:51:27 +0200 Message-ID: <541B1B9F.1040500@vodafone.de> References: <1411061204-721-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id C75CB6E416 for ; Thu, 18 Sep 2014 10:51:36 -0700 (PDT) In-Reply-To: <1411061204-721-1-git-send-email-alexander.deucher@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Alex Deucher , dri-devel@lists.freedesktop.org Cc: Alex Deucher , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org Am 18.09.2014 um 19:26 schrieb Alex Deucher: > Otherwise we may lose the DMA golden settings which can > lead to hangs, etc. Don't we still want the soft reset at some point, e.g. when the engine hangs? I would rather move that to another function and call it before loading the golden values. Christian. > > bug: > https://www.libreoffice.org/bugzilla/show_bug.cgi?id=83500 > > Signed-off-by: Alex Deucher > Cc: stable@vger.kernel.org > --- > drivers/gpu/drm/radeon/ni_dma.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/ni_dma.c b/drivers/gpu/drm/radeon/ni_dma.c > index 8a3e622..f26f0a9 100644 > --- a/drivers/gpu/drm/radeon/ni_dma.c > +++ b/drivers/gpu/drm/radeon/ni_dma.c > @@ -191,12 +191,6 @@ int cayman_dma_resume(struct radeon_device *rdev) > u32 reg_offset, wb_offset; > int i, r; > > - /* Reset dma */ > - WREG32(SRBM_SOFT_RESET, SOFT_RESET_DMA | SOFT_RESET_DMA1); > - RREG32(SRBM_SOFT_RESET); > - udelay(50); > - WREG32(SRBM_SOFT_RESET, 0); > - > for (i = 0; i < 2; i++) { > if (i == 0) { > ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX];