From: Christian König Date: Mon, 11 May 2015 20:01:48 +0000 (+0200) Subject: drm/radeon: allow some more VCE firmware versions X-Git-Tag: firefly_0821_release~176^2~1470^2~48^2~14 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c11d75c87a60c6f6493a55acc029ff644b1bc1a8;p=firefly-linux-kernel-4.4.55.git drm/radeon: allow some more VCE firmware versions They seem to work fine with the kernel interface. Signed-off-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_vce.c index 5b952bdfa68d..aa5d9bac70fa 100644 --- a/drivers/gpu/drm/radeon/radeon_vce.c +++ b/drivers/gpu/drm/radeon/radeon_vce.c @@ -118,7 +118,9 @@ int radeon_vce_init(struct radeon_device *rdev) rdev->vce.fw_version = (start << 24) | (mid << 16) | (end << 8); /* we can only work with this fw version for now */ - if (rdev->vce.fw_version != ((40 << 24) | (2 << 16) | (2 << 8))) + if ((rdev->vce.fw_version != ((40 << 24) | (2 << 16) | (2 << 8))) && + (rdev->vce.fw_version != ((50 << 24) | (0 << 16) | (1 << 8))) && + (rdev->vce.fw_version != ((50 << 24) | (1 << 16) | (2 << 8)))) return -EINVAL; /* allocate firmware, stack and heap BO */