[PATCH] drm/radeon: disable vce init on cayman

[Deucher, Alexander]

> -----Original Message-----
> From: Christian König [mailto:deathsimple at vodafone.de]
> Sent: Wednesday, July 08, 2015 2:17 PM
> To: Alex Deucher; dri-devel at lists.freedesktop.org
> Cc: Deucher, Alexander
> Subject: Re: [PATCH] drm/radeon: disable vce init on cayman
> 
> On 08.07.2015 19:44, 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.
> >
> > Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> 
> If I remember correctly that was the reason we have the "if (r !=
> -ENOENT)" and "if (ring->ring_size)" checks in the code. E.g. if VCE
> isn't supported ring->ring_size is zero and vce_v1_0_init return -ENOENT.

The problem is vce_v1_0_init() doesn't return -ENOENT.  So vce_v1_0_start() tries to run on cayman and fails leading to problems.

> 
> So when we make the check implicit I think we should at least remove the
> -ENOENT check.

I'll do that.

Alex

> 
> Regards,
> Christian.
> 
> > ---
> >   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 6a8afe2..2b2e177 100644
> > --- a/drivers/gpu/drm/radeon/ni.c
> > +++ b/drivers/gpu/drm/radeon/ni.c
> > @@ -2185,18 +2185,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);
> > +		else if (r != -ENOENT)
> > +			DRM_ERROR("radeon: failed initializing VCE (%d).\n",
> r);
> > +	}
> >
> >   	r = radeon_ib_pool_init(rdev);
> >   	if (r) {
> > @@ -2419,7 +2421,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);