From: Alex Deucher <alexdeucher@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Alex Deucher <alexander.deucher@amd.com>
Subject: [PATCH 2/3] drm/radeon: check the return value of uvd_v1_0_start in uvd_v1_0_init
Date: Thu, 29 Aug 2013 17:24:49 -0400 [thread overview]
Message-ID: <1377811490-4649-2-git-send-email-alexander.deucher@amd.com> (raw)
In-Reply-To: <1377811490-4649-1-git-send-email-alexander.deucher@amd.com>
No need to try the ring tests if starting the UVD block failed.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/radeon/uvd_v1_0.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c b/drivers/gpu/drm/radeon/uvd_v1_0.c
index 76ca669..3426be9 100644
--- a/drivers/gpu/drm/radeon/uvd_v1_0.c
+++ b/drivers/gpu/drm/radeon/uvd_v1_0.c
@@ -85,7 +85,9 @@ int uvd_v1_0_init(struct radeon_device *rdev)
/* raise clocks while booting up the VCPU */
radeon_set_uvd_clocks(rdev, 53300, 40000);
- uvd_v1_0_start(rdev);
+ r = uvd_v1_0_start(rdev);
+ if (r)
+ goto done;
ring->ready = true;
r = radeon_ring_test(rdev, R600_RING_TYPE_UVD_INDEX, ring);
--
1.8.3.1
next prev parent reply other threads:[~2013-08-29 21:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-29 21:24 [PATCH 1/3] drm/radeon: split out radeon_uvd_resume from uvd_v4_2_resume Alex Deucher
2013-08-29 21:24 ` Alex Deucher [this message]
2013-08-29 21:24 ` [PATCH 3/3] drm/radeon/dpm: only need to reprogram uvd if uvd pg is enabled Alex Deucher
2013-08-30 6:49 ` [PATCH 1/3] drm/radeon: split out radeon_uvd_resume from uvd_v4_2_resume Christian König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377811490-4649-2-git-send-email-alexander.deucher@amd.com \
--to=alexdeucher@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox