From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?windows-1252?Q?Christian_K=F6nig?= Subject: Re: [PATCH] drm/radeon: soft reset uvd on RV770 uvd init Date: Wed, 27 Aug 2014 10:10:44 +0200 Message-ID: <53FD9284.7020603@vodafone.de> References: <1409108650-2130-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------020607050001080304090009" Return-path: Received: from pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id AF04E6E1C0 for ; Wed, 27 Aug 2014 01:11:24 -0700 (PDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by pegasos-out.vodafone.de (Rohrpostix2 Daemon) with ESMTP id C69DA7690F9 for ; Wed, 27 Aug 2014 10:11:19 +0200 (CEST) Received: from pegasos-out.vodafone.de ([127.0.0.1]) by localhost (rohrpostix2.prod.vfnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3GI5lYiEL96Q for ; Wed, 27 Aug 2014 10:10:58 +0200 (CEST) In-Reply-To: <1409108650-2130-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 List-Id: dri-devel@lists.freedesktop.org This is a multi-part message in MIME format. --------------020607050001080304090009 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Am 27.08.2014 um 05:04 schrieb Alex Deucher: > Fixes avoids and error message on boot which is harmless, > but confusing to users. > > Signed-off-by: Alex Deucher The attached patch fixes the underlying issue for me on RS780. Does it also work on RV770? If yes than it's probably the better approach. Christian. > --- > drivers/gpu/drm/radeon/uvd_v1_0.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c b/drivers/gpu/drm/radeon/uvd_v1_0.c > index e251624..82e4fa6 100644 > --- a/drivers/gpu/drm/radeon/uvd_v1_0.c > +++ b/drivers/gpu/drm/radeon/uvd_v1_0.c > @@ -325,6 +325,13 @@ int uvd_v1_0_start(struct radeon_device *rdev) > > WREG32_P(UVD_RB_ARB_CTRL, 0, ~(1 << 3)); > > + if (rdev->family == CHIP_RV770) { > + WREG32_P(UVD_SOFT_RESET, VCPU_SOFT_RESET, ~VCPU_SOFT_RESET); > + mdelay(10); > + WREG32_P(UVD_SOFT_RESET, 0, ~VCPU_SOFT_RESET); > + mdelay(10); > + } > + > for (i = 0; i < 10; ++i) { > uint32_t status; > for (j = 0; j < 100; ++j) { --------------020607050001080304090009 Content-Type: text/x-diff; name="0001-drm-radeon-enable-RB_ARB-before-resetting-the-VCPU.patch" Content-Disposition: attachment; filename*0="0001-drm-radeon-enable-RB_ARB-before-resetting-the-VCPU.patc"; filename*1="h" Content-Transfer-Encoding: quoted-printable >>From 499b07135129211d633820cb57bc39cf14bda86b Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Christian=3D20K=3DC3=3DB6nig?=3D Date: Wed, 27 Aug 2014 09:59:45 +0200 Subject: [PATCH] drm/radeon: enable RB_ARB before resetting the VCPU MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit This fixes "UVD not responding, trying to reset the VCPU" messages on earlier ASICs. Signed-off-by: Christian K=C3=B6nig --- drivers/gpu/drm/radeon/uvd_v1_0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c b/drivers/gpu/drm/radeon/u= vd_v1_0.c index e251624..339817a 100644 --- a/drivers/gpu/drm/radeon/uvd_v1_0.c +++ b/drivers/gpu/drm/radeon/uvd_v1_0.c @@ -319,12 +319,12 @@ int uvd_v1_0_start(struct radeon_device *rdev) /* enable UMC */ WREG32_P(UVD_LMI_CTRL2, 0, ~(1 << 8)); =20 + WREG32_P(UVD_RB_ARB_CTRL, 0, ~(1 << 3)); + /* boot up the VCPU */ WREG32(UVD_SOFT_RESET, 0); mdelay(10); =20 - WREG32_P(UVD_RB_ARB_CTRL, 0, ~(1 << 3)); - for (i =3D 0; i < 10; ++i) { uint32_t status; for (j =3D 0; j < 100; ++j) { --=20 1.9.1 --------------020607050001080304090009 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel --------------020607050001080304090009--