diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-18 21:42:28 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-18 21:42:28 -0500 |
| commit | 8e73a108acdb7c30ec84edcde1c550ad9448b6ac (patch) | |
| tree | 070c936af7ce70fa6d84d975395aa5dddd0fe77f /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
| parent | 76b8ebdc4c7a8299e6365428a36cc0fb1c2a4103 (diff) | |
| parent | 91acbeb68ab10c0c0f65f30b5b7fddbde4c97dd2 (diff) | |
Merge branch 'drm-fixes-4.4' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Just one important fix for amdgpu to avoid possible memory corruption.
* 'drm-fixes-4.4' of git://people.freedesktop.org/~agd5f/linux:
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 { |