diff options
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem.h')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.h | 11 | 
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index c75d3b879a53..6b7d5bb3b575 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -145,7 +145,7 @@ struct msm_gem_object {  uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj);  int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct msm_gem_vma *vma); -void msm_gem_unpin_vma_locked(struct drm_gem_object *obj, struct msm_gem_vma *vma); +void msm_gem_unpin_locked(struct drm_gem_object *obj);  struct msm_gem_vma *msm_gem_get_vma_locked(struct drm_gem_object *obj,  					   struct msm_gem_address_space *aspace);  int msm_gem_get_iova(struct drm_gem_object *obj, @@ -377,10 +377,11 @@ struct msm_gem_submit {  	} *cmd;  /* array of size nr_cmds */  	struct {  /* make sure these don't conflict w/ MSM_SUBMIT_BO_x */ -#define BO_VALID    0x8000   /* is current addr in cmdstream correct/valid? */ -#define BO_LOCKED   0x4000   /* obj lock is held */ -#define BO_ACTIVE   0x2000   /* active refcnt is held */ -#define BO_PINNED   0x1000   /* obj is pinned and on active list */ +#define BO_VALID	0x8000	/* is current addr in cmdstream correct/valid? */ +#define BO_LOCKED	0x4000	/* obj lock is held */ +#define BO_ACTIVE	0x2000	/* active refcnt is held */ +#define BO_OBJ_PINNED	0x1000	/* obj (pages) is pinned and on active list */ +#define BO_VMA_PINNED	0x0800	/* vma (virtual address) is pinned */  		uint32_t flags;  		union {  			struct msm_gem_object *obj;  | 
