From: "Christian König" <deathsimple@vodafone.de>
To: Alex Deucher <alexdeucher@gmail.com>, dri-devel@lists.freedesktop.org
Cc: Alex Deucher <alexander.deucher@amd.com>
Subject: Re: [PATCH] drm/radeon: 760G/780V/880V don't have UVD
Date: Tue, 26 Aug 2014 19:36:19 +0200 [thread overview]
Message-ID: <53FCC593.80200@vodafone.de> (raw)
In-Reply-To: <1409073157-13019-1-git-send-email-alexander.deucher@amd.com>
Am 26.08.2014 um 19:12 schrieb Alex Deucher:
> Don't enable UVD on these asics as they don't have
> UVD hardware.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/radeon/r600.c | 57 +++++++++++++++++++++---------------
> drivers/gpu/drm/radeon/radeon_asic.c | 10 ++++++-
> 2 files changed, 42 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index e79d3f8..afbdd08 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2991,15 +2991,16 @@ static int r600_startup(struct radeon_device *rdev)
> return r;
> }
>
> - r = uvd_v1_0_resume(rdev);
> - if (!r) {
> - r = radeon_fence_driver_start_ring(rdev, R600_RING_TYPE_UVD_INDEX);
> - if (r) {
> - dev_err(rdev->dev, "failed initializing UVD fences (%d).\n", r);
> + if (rdev->has_uvd) {
> + r = uvd_v1_0_resume(rdev);
> + if (!r) {
> + r = radeon_fence_driver_start_ring(rdev, R600_RING_TYPE_UVD_INDEX);
> + if (r) {
> + dev_err(rdev->dev, "failed initializing UVD fences (%d).\n", r);
> + }
> }
> - }
> - if (r) {
> - rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_size = 0;
> + if (r)
> + rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_size = 0;
> }
>
> /* Enable IRQ */
> @@ -3030,14 +3031,16 @@ static int r600_startup(struct radeon_device *rdev)
> if (r)
> return r;
>
> - ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX];
> - if (ring->ring_size) {
> - r = radeon_ring_init(rdev, ring, ring->ring_size, 0,
> - RADEON_CP_PACKET2);
> - if (!r)
> - r = uvd_v1_0_init(rdev);
> - if (r)
> - DRM_ERROR("radeon: failed initializing UVD (%d).\n", r);
> + if (rdev->has_uvd) {
> + ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX];
> + if (ring->ring_size) {
> + r = radeon_ring_init(rdev, ring, ring->ring_size, 0,
> + RADEON_CP_PACKET2);
> + if (!r)
> + r = uvd_v1_0_init(rdev);
> + if (r)
> + DRM_ERROR("radeon: failed initializing UVD (%d).\n", r);
> + }
> }
>
> r = radeon_ib_pool_init(rdev);
> @@ -3099,8 +3102,10 @@ int r600_suspend(struct radeon_device *rdev)
> radeon_pm_suspend(rdev);
> r600_audio_fini(rdev);
> r600_cp_stop(rdev);
> - uvd_v1_0_fini(rdev);
> - radeon_uvd_suspend(rdev);
> + if (rdev->has_uvd) {
> + uvd_v1_0_fini(rdev);
> + radeon_uvd_suspend(rdev);
> + }
> r600_irq_suspend(rdev);
> radeon_wb_disable(rdev);
> r600_pcie_gart_disable(rdev);
> @@ -3180,10 +3185,12 @@ int r600_init(struct radeon_device *rdev)
> rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ring_obj = NULL;
> r600_ring_init(rdev, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX], 1024 * 1024);
>
> - r = radeon_uvd_init(rdev);
> - if (!r) {
> - rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_obj = NULL;
> - r600_ring_init(rdev, &rdev->ring[R600_RING_TYPE_UVD_INDEX], 4096);
> + if (rdev->has_uvd) {
> + r = radeon_uvd_init(rdev);
> + if (!r) {
> + rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_obj = NULL;
> + r600_ring_init(rdev, &rdev->ring[R600_RING_TYPE_UVD_INDEX], 4096);
> + }
> }
>
> rdev->ih.ring_obj = NULL;
> @@ -3215,8 +3222,10 @@ void r600_fini(struct radeon_device *rdev)
> r600_audio_fini(rdev);
> r600_cp_fini(rdev);
> r600_irq_fini(rdev);
> - uvd_v1_0_fini(rdev);
> - radeon_uvd_fini(rdev);
> + if (rdev->has_uvd) {
> + uvd_v1_0_fini(rdev);
> + radeon_uvd_fini(rdev);
> + }
> radeon_wb_fini(rdev);
> radeon_ib_pool_fini(rdev);
> radeon_irq_kms_fini(rdev);
> diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
> index 9e6699a..d91f965 100644
> --- a/drivers/gpu/drm/radeon/radeon_asic.c
> +++ b/drivers/gpu/drm/radeon/radeon_asic.c
> @@ -2313,7 +2313,15 @@ int radeon_asic_init(struct radeon_device *rdev)
> case CHIP_RS780:
> case CHIP_RS880:
> rdev->asic = &rs780_asic;
> - rdev->has_uvd = true;
> + /* 760G/780V/880V don't have UVD */
> + if ((rdev->pdev->device == 0x9616)||
> + (rdev->pdev->device == 0x9611)||
> + (rdev->pdev->device == 0x9613)||
> + (rdev->pdev->device == 0x9711)||
> + (rdev->pdev->device == 0x9713))
> + rdev->has_uvd = false;
> + else
> + rdev->has_uvd = true;
> break;
> case CHIP_RV770:
> case CHIP_RV730:
prev parent reply other threads:[~2014-08-26 17:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-26 17:12 [PATCH] drm/radeon: 760G/780V/880V don't have UVD Alex Deucher
2014-08-26 17:36 ` Christian König [this message]
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=53FCC593.80200@vodafone.de \
--to=deathsimple@vodafone.de \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.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 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.