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

Commit 60a44540 authored by Christian König's avatar Christian König
Browse files

drm/radeon: avoid crash if VM command submission isn't available 



Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
CC: stable@vger.kernel.org
parent 4b21ce1b

drivers/gpu/drm/radeon/radeon_cs.c

+11 −4
Original line number Diff line number Diff line
@@ -342,11 +342,18 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) 
			return -EINVAL;



		/* 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)) {

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

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

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

				return -EINVAL;

			}

		} else {

			if (p->rdev->asic->ring[p->ring]->ib_parse == NULL) {

				DRM_ERROR("VM not supported on ring %d!\n",

					  p->ring);

				return -EINVAL;

			}

		}

	}



	return 0;