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

Commit 57449040 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: UVD doesn't needs VM on SI v2 



v2: update error message and comment

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a0a53aa8

drivers/gpu/drm/radeon/radeon_cs.c

+6 −6
Original line number Diff line number Diff line
@@ -241,16 +241,16 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) 
			return -EINVAL;

		}



		/* we only support VM on SI+ */

		if ((p->rdev->family >= CHIP_TAHITI) &&

		    ((p->cs_flags & RADEON_CS_USE_VM) == 0)) {

			DRM_ERROR("VM required on SI+!\n");

		if (radeon_cs_get_ring(p, ring, priority))

			return -EINVAL;

		}



		if (radeon_cs_get_ring(p, ring, priority))

		/* we only support VM on some SI+ rings */

		if ((p->rdev->asic->ring[p->ring].cs_parse == NULL) &&

		   ((p->cs_flags & RADEON_CS_USE_VM) == 0)) {

			DRM_ERROR("Ring %d requires VM!\n", p->ring);

			return -EINVAL;

		}

	}



	/* deal with non-vm */

	if ((p->chunk_ib_idx != -1) &&