diff options
| author |   Christian König <christian.koenig@amd.com> | 2015-05-11 22:01:48 +0200 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2015-05-26 10:31:20 -0400 |
| commit | c11d75c87a60c6f6493a55acc029ff644b1bc1a8 (patch) | |
| tree | 50a24eee558ccb397c96cde1c116372bc30e6506 /drivers/gpu/drm/radeon/radeon_vce.c | |
| parent | drm/radeon: rework VCE FW size calculation (diff) | |
| download | linux-dev-c11d75c87a60c6f6493a55acc029ff644b1bc1a8.tar.xz linux-dev-c11d75c87a60c6f6493a55acc029ff644b1bc1a8.zip | |
drm/radeon: allow some more VCE firmware versions
They seem to work fine with the kernel interface.
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_vce.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_vce.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 */ |