diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-11-01 09:05:54 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-11-01 09:05:54 +1000 |
| commit | 5f7f8f6edbf860abf18149a64be036d4be5e2993 (patch) | |
| tree | 4dc508b8b13431758db78f7ada3e7d0a505c3323 /drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | |
| parent | a909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff) | |
| parent | 1cfa126c52af20c36e6a618e45c5449d1025ae55 (diff) | |
| download | linux-5f7f8f6edbf860abf18149a64be036d4be5e2993.tar.gz linux-5f7f8f6edbf860abf18149a64be036d4be5e2993.tar.bz2 linux-5f7f8f6edbf860abf18149a64be036d4be5e2993.zip | |
Merge branch 'drm-fixes-staging' of ssh://people.freedesktop.org/~/linux into drm-fixes
Pull the staging fixes tree I had into rc3 to make real -fixes again.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vce_v3_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c index 8533269ec160..6feed726e299 100644 --- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c @@ -52,6 +52,8 @@ #define VCE_V3_0_STACK_SIZE (64 * 1024) #define VCE_V3_0_DATA_SIZE ((16 * 1024 * AMDGPU_MAX_VCE_HANDLES) + (52 * 1024)) +#define FW_52_8_3 ((52 << 24) | (8 << 16) | (3 << 8)) + static void vce_v3_0_mc_resume(struct amdgpu_device *adev, int idx); static void vce_v3_0_set_ring_funcs(struct amdgpu_device *adev); static void vce_v3_0_set_irq_funcs(struct amdgpu_device *adev); @@ -382,6 +384,10 @@ static int vce_v3_0_sw_init(void *handle) if (r) return r; + /* 52.8.3 required for 3 ring support */ + if (adev->vce.fw_version < FW_52_8_3) + adev->vce.num_rings = 2; + r = amdgpu_vce_resume(adev); if (r) return r; |