diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-23 17:08:47 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-23 17:08:47 -0500 |
| commit | 20f8e032e6dc7053ab803f488e2a8839cd2f69a6 (patch) | |
| tree | 406b662934bffa205d90e9435bf96af7dc1a0cb0 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
| parent | ade1ba7346070709856d7e38f8d1a77b7aa710aa (diff) | |
| parent | 5b726e06d6e8309e5c9ef4109a32caf27c71dfc8 (diff) | |
Backmerge drm-fixes merge into Linus's tree into drm-next.
This merges '5b726e06d6e8309e5c9ef4109a32caf27c71dfc8' into drm-next
Just to resolve some merges to make Daniel's life easier.
Signed-off-by: DAve Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index fca4ef78589c..003959f99251 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
| @@ -1266,7 +1266,8 @@ struct amdgpu_cs_parser { | |||
| 1266 | struct ww_acquire_ctx ticket; | 1266 | struct ww_acquire_ctx ticket; |
| 1267 | 1267 | ||
| 1268 | /* user fence */ | 1268 | /* user fence */ |
| 1269 | struct amdgpu_user_fence uf; | 1269 | struct amdgpu_user_fence uf; |
| 1270 | struct amdgpu_bo_list_entry uf_entry; | ||
| 1270 | }; | 1271 | }; |
| 1271 | 1272 | ||
| 1272 | struct amdgpu_job { | 1273 | struct amdgpu_job { |