diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-09-20 09:06:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-09-20 09:06:48 +1000 |
| commit | 6ddf2ed6e00396883b3123032ccb4416205aac7c (patch) | |
| tree | aa544e6288bfc4c9aba53df49be798bb2226ffe8 /drivers/gpu/drm/msm/msm_gem.h | |
| parent | 9808cc946943e4c260ff270f8b2e7884dd6968f8 (diff) | |
| parent | 7e60353a1f5335ecd63b1c54897c2aa75874aaee (diff) | |
Merge branch 'msm-fixes-3.12' of git://people.freedesktop.org/~robclark/linux into drm-fixes
A couple small msm fixes. Plus drop of set_need_resched().
* 'msm-fixes-3.12' of git://people.freedesktop.org/~robclark/linux:
drm/msm: drop unnecessary set_need_resched()
drm/msm: fix potential NULL pointer dereference
drm/msm: workaround for missing irq
drm/msm: return -EBUSY if bo still active
drm/msm: fix return value check in ERR_PTR()
drm/msm: fix cmdstream size check
drm/msm: hangcheck harder
drm/msm: handle read vs write fences
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem.h')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index d746f13d283..0676f32e2c6 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -36,7 +36,7 @@ struct msm_gem_object { */ struct list_head mm_list; struct msm_gpu *gpu; /* non-null if active */ - uint32_t fence; + uint32_t read_fence, write_fence; /* Transiently in the process of submit ioctl, objects associated * with the submit are on submit->bo_list.. this only lasts for |