diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-25 17:43:15 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-25 17:43:15 +0300 |
| commit | 83bae01182ea755280adc1c3a24032d63a614ede (patch) | |
| tree | f05249057a392e750c0622bbdd3620e19aafd031 /drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | |
| parent | cf25e24db61cc9df42c47485a2ec2bff4e9a3692 (diff) | |
| parent | 7b8474466ed97be458c825f34a85f2c2b84c3f95 (diff) | |
| download | linux-83bae01182ea755280adc1c3a24032d63a614ede.tar.xz | |
Merge branch 'timers/urgent' into timers/core, to pick up fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h index 6ee4021910e2..6d19183b478b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h @@ -289,6 +289,7 @@ struct amdgpu_gfx { uint32_t mec2_feature_version; bool mec_fw_write_wait; bool me_fw_write_wait; + bool cp_fw_write_wait; struct amdgpu_ring gfx_ring[AMDGPU_MAX_GFX_RINGS]; unsigned num_gfx_rings; struct amdgpu_ring compute_ring[AMDGPU_MAX_COMPUTE_RINGS]; |