diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-04-16 10:47:13 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-04-16 10:47:13 -0400 |
| commit | 8089f9f5a32938ddefb1767b8ee14bb7996e5e2f (patch) | |
| tree | c6c8924fda51c7f54bebffa63a41ae15954995bf /drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | |
| parent | c0db1b677e1d584fab5d7ac76a32e1c0157542e0 (diff) | |
| parent | a10beabba213924d876f2d10ca9351aeab93f58a (diff) | |
Merge airlied/drm-next into drm-misc-fixes
Fast forwarding -fixes for 4.17.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h index 0fd378ae92c3..71781267ee4c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h @@ -30,6 +30,8 @@ #define AMDGPU_VCE_HARVEST_VCE0 (1 << 0) #define AMDGPU_VCE_HARVEST_VCE1 (1 << 1) +#define AMDGPU_VCE_FW_53_45 ((53 << 24) | (45 << 16)) + struct amdgpu_vce { struct amdgpu_bo *vcpu_bo; uint64_t gpu_addr; |