Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 355c8228 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: disable vce init on cayman (v2) 



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

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0f117704

drivers/gpu/drm/radeon/ni.c

+14 −11
Original line number Original line Diff line number Diff line
@@ -2162,6 +2162,7 @@ static int cayman_startup(struct radeon_device *rdev) 
			DRM_ERROR("radeon: failed initializing UVD (%d).\n", r);

			DRM_ERROR("radeon: failed initializing UVD (%d).\n", r);

	}

	}





	if (rdev->family == CHIP_ARUBA) {

		ring = &rdev->ring[TN_RING_TYPE_VCE1_INDEX];

		ring = &rdev->ring[TN_RING_TYPE_VCE1_INDEX];

		if (ring->ring_size)

		if (ring->ring_size)

			r = radeon_ring_init(rdev, ring, ring->ring_size, 0, 0x0);

			r = radeon_ring_init(rdev, ring, ring->ring_size, 0, 0x0);
@@ -2172,8 +2173,9 @@ static int cayman_startup(struct radeon_device *rdev) 




		if (!r)

		if (!r)

			r = vce_v1_0_init(rdev);

			r = vce_v1_0_init(rdev);

	else if (r != -ENOENT)

		if (r)

			DRM_ERROR("radeon: failed initializing VCE (%d).\n", r);

			DRM_ERROR("radeon: failed initializing VCE (%d).\n", r);

	}





	r = radeon_ib_pool_init(rdev);

	r = radeon_ib_pool_init(rdev);

	if (r) {

	if (r) {
@@ -2396,6 +2398,7 @@ void cayman_fini(struct radeon_device *rdev) 
	radeon_irq_kms_fini(rdev);

	radeon_irq_kms_fini(rdev);

	uvd_v1_0_fini(rdev);

	uvd_v1_0_fini(rdev);

	radeon_uvd_fini(rdev);

	radeon_uvd_fini(rdev);

	if (rdev->family == CHIP_ARUBA)

		radeon_vce_fini(rdev);

		radeon_vce_fini(rdev);

	cayman_pcie_gart_fini(rdev);

	cayman_pcie_gart_fini(rdev);

	r600_vram_scratch_fini(rdev);

	r600_vram_scratch_fini(rdev);