diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-23 13:11:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-23 13:11:12 -0500 |
| commit | 2bfd43d80679db786e4349dc4711e2075a66d46b (patch) | |
| tree | 6b232c45470d5d64b7a3e0bae3b89818cd17e016 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
| parent | 24bc3ea5df2e1d89e9d50ecca57c210b87ad61d2 (diff) | |
| parent | 1957d62c29be413d77da2e69737f4251e5449fbd (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Not much happening, should have dequeued this lot earlier.
One amdgpu, one nouveau and one exynos fix"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/exynos: atomic check only enabled crtc states
drm/nouveau/bios/fan: hardcode the fan mode to linear
drm/amdgpu: fix user fence handling
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 5a5f04d0902d..048cfe073dae 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
| @@ -1264,7 +1264,8 @@ struct amdgpu_cs_parser { | |||
| 1264 | struct ww_acquire_ctx ticket; | 1264 | struct ww_acquire_ctx ticket; |
| 1265 | 1265 | ||
| 1266 | /* user fence */ | 1266 | /* user fence */ |
| 1267 | struct amdgpu_user_fence uf; | 1267 | struct amdgpu_user_fence uf; |
| 1268 | struct amdgpu_bo_list_entry uf_entry; | ||
| 1268 | }; | 1269 | }; |
| 1269 | 1270 | ||
| 1270 | struct amdgpu_job { | 1271 | struct amdgpu_job { |