* [PATCH] drm/radeon: soft reset uvd on RV770 uvd init @ 2014-08-27 3:04 Alex Deucher 2014-08-27 8:10 ` Christian König 0 siblings, 1 reply; 3+ messages in thread From: Alex Deucher @ 2014-08-27 3:04 UTC (permalink / raw) To: dri-devel; +Cc: Alex Deucher Fixes avoids and error message on boot which is harmless, but confusing to users. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> --- 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) { -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon: soft reset uvd on RV770 uvd init 2014-08-27 3:04 [PATCH] drm/radeon: soft reset uvd on RV770 uvd init Alex Deucher @ 2014-08-27 8:10 ` Christian König 2014-08-27 15:12 ` Alex Deucher 0 siblings, 1 reply; 3+ messages in thread From: Christian König @ 2014-08-27 8:10 UTC (permalink / raw) To: Alex Deucher, dri-devel; +Cc: Alex Deucher [-- Attachment #1: Type: text/plain, Size: 1055 bytes --] 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 <alexander.deucher@amd.com> 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) { [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-drm-radeon-enable-RB_ARB-before-resetting-the-VCPU.patch --] [-- Type: text/x-diff; name="0001-drm-radeon-enable-RB_ARB-before-resetting-the-VCPU.patch", Size: 1194 bytes --] >From 499b07135129211d633820cb57bc39cf14bda86b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> 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=UTF-8 Content-Transfer-Encoding: 8bit This fixes "UVD not responding, trying to reset the VCPU" messages on earlier ASICs. Signed-off-by: Christian König <christian.koenig@amd.com> --- 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/uvd_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)); + WREG32_P(UVD_RB_ARB_CTRL, 0, ~(1 << 3)); + /* boot up the VCPU */ WREG32(UVD_SOFT_RESET, 0); mdelay(10); - WREG32_P(UVD_RB_ARB_CTRL, 0, ~(1 << 3)); - for (i = 0; i < 10; ++i) { uint32_t status; for (j = 0; j < 100; ++j) { -- 1.9.1 [-- Attachment #3: Type: text/plain, Size: 159 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon: soft reset uvd on RV770 uvd init 2014-08-27 8:10 ` Christian König @ 2014-08-27 15:12 ` Alex Deucher 0 siblings, 0 replies; 3+ messages in thread From: Alex Deucher @ 2014-08-27 15:12 UTC (permalink / raw) To: Christian König; +Cc: Alex Deucher, Maling list - DRI developers On Wed, Aug 27, 2014 at 4:10 AM, Christian König <deathsimple@vodafone.de> wrote: > 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 <alexander.deucher@amd.com> > > > 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. Yup, that fixes it on RV770. I'll add that patch to the 3.18 queue. Thanks! Alex > > 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) { > > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-08-27 15:12 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-08-27 3:04 [PATCH] drm/radeon: soft reset uvd on RV770 uvd init Alex Deucher 2014-08-27 8:10 ` Christian König 2014-08-27 15:12 ` Alex Deucher
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.