diff options
author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
commit | 067e2601d3c076abbf45db91261f9065eaa879b2 (patch) | |
tree | 86c8d4b913873dbd3b4ff23562a3a8597984b4df /drivers/gpu/drm/msm/msm_gem.h | |
parent | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (diff) | |
parent | 931830aa5c251e0803523213428f777a48bde254 (diff) |
Merge branch 'for-4.3/gembird' into for-linus
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem.h')
-rw-r--r-- | drivers/gpu/drm/msm/msm_gem.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 85d481e29276..6fc59bfeedeb 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h | |||
@@ -96,6 +96,7 @@ static inline uint32_t msm_gem_fence(struct msm_gem_object *msm_obj, | |||
96 | struct msm_gem_submit { | 96 | struct msm_gem_submit { |
97 | struct drm_device *dev; | 97 | struct drm_device *dev; |
98 | struct msm_gpu *gpu; | 98 | struct msm_gpu *gpu; |
99 | struct list_head node; /* node in gpu submit_list */ | ||
99 | struct list_head bo_list; | 100 | struct list_head bo_list; |
100 | struct ww_acquire_ctx ticket; | 101 | struct ww_acquire_ctx ticket; |
101 | uint32_t fence; | 102 | uint32_t fence; |