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: disable vce init on cayman (v2)
Date: Wed, 08 Jul 2015 21:30:18 +0200 [thread overview]
Message-ID: <559D7A4A.4030407@vodafone.de> (raw)
In-Reply-To: <1436383723-16457-1-git-send-email-alexander.deucher@amd.com>
On 08.07.2015 21:28, Alex Deucher wrote:
> Cayman does not have vce. There were a few places in the
> shared cayman/TV code where we were trying to do vce stuff.
>
> v2: remove -ENOENT check
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/radeon/ni.c | 25 ++++++++++++++-----------
> 1 file changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
> index 8e5aeeb..158872e 100644
> --- a/drivers/gpu/drm/radeon/ni.c
> +++ b/drivers/gpu/drm/radeon/ni.c
> @@ -2162,18 +2162,20 @@ static int cayman_startup(struct radeon_device *rdev)
> DRM_ERROR("radeon: failed initializing UVD (%d).\n", r);
> }
>
> - ring = &rdev->ring[TN_RING_TYPE_VCE1_INDEX];
> - if (ring->ring_size)
> - r = radeon_ring_init(rdev, ring, ring->ring_size, 0, 0x0);
> + if (rdev->family == CHIP_ARUBA) {
> + ring = &rdev->ring[TN_RING_TYPE_VCE1_INDEX];
> + if (ring->ring_size)
> + r = radeon_ring_init(rdev, ring, ring->ring_size, 0, 0x0);
>
> - ring = &rdev->ring[TN_RING_TYPE_VCE2_INDEX];
> - if (ring->ring_size)
> - r = radeon_ring_init(rdev, ring, ring->ring_size, 0, 0x0);
> + ring = &rdev->ring[TN_RING_TYPE_VCE2_INDEX];
> + if (ring->ring_size)
> + r = radeon_ring_init(rdev, ring, ring->ring_size, 0, 0x0);
>
> - if (!r)
> - r = vce_v1_0_init(rdev);
> - else if (r != -ENOENT)
> - DRM_ERROR("radeon: failed initializing VCE (%d).\n", r);
> + if (!r)
> + r = vce_v1_0_init(rdev);
> + if (r)
> + DRM_ERROR("radeon: failed initializing VCE (%d).\n", r);
> + }
>
> r = radeon_ib_pool_init(rdev);
> if (r) {
> @@ -2396,7 +2398,8 @@ void cayman_fini(struct radeon_device *rdev)
> radeon_irq_kms_fini(rdev);
> uvd_v1_0_fini(rdev);
> radeon_uvd_fini(rdev);
> - radeon_vce_fini(rdev);
> + if (rdev->family == CHIP_ARUBA)
> + radeon_vce_fini(rdev);
> cayman_pcie_gart_fini(rdev);
> r600_vram_scratch_fini(rdev);
> radeon_gem_fini(rdev);
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2015-07-08 19:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-08 19:28 [PATCH] drm/radeon: disable vce init on cayman (v2) Alex Deucher
2015-07-08 19:30 ` 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=559D7A4A.4030407@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox