Subversion Repositories Kolibri OS

Rev

Rev 4569 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4569 Rev 5078
Line 50... Line 50...
50 
int vmw_dmabuf_to_placement(struct vmw_private *dev_priv,
 50 
int vmw_dmabuf_to_placement(struct vmw_private *dev_priv,
51 
			    struct vmw_dma_buffer *buf,
 51 
			    struct vmw_dma_buffer *buf,
52 
			    struct ttm_placement *placement,
 52 
			    struct ttm_placement *placement,
53 
			    bool interruptible)
 53 
			    bool interruptible)
54 
{
 54 
{
55 
//   struct vmw_master *vmaster = dev_priv->active_master;
 - 
 
56 
	struct ttm_buffer_object *bo = &buf->base;
 55 
	struct ttm_buffer_object *bo = &buf->base;
57 
	int ret;
 56 
	int ret;
Line 58... Line 57...
58 
 
 57 
 
59 
//   ret = ttm_write_lock(&vmaster->lock, interruptible);
 58 
//   ret = ttm_write_lock(&vmaster->lock, interruptible);
60 
//   if (unlikely(ret != 0))
 59 
//   if (unlikely(ret != 0))
Line 61... Line 60...
61 
//       return ret;
 60 
//       return ret;
Line 62... Line 61...
62 
 
 61 
 
63 
	vmw_execbuf_release_pinned_bo(dev_priv);
 62 
	vmw_execbuf_release_pinned_bo(dev_priv);
64 
 
 63 
 
Line 65... Line 64...
65 
	ret = ttm_bo_reserve(bo, interruptible, false, false, 0);
 64 
	ret = ttm_bo_reserve(bo, interruptible, false, false, NULL);
Line 93... Line 92...
93 
 */
 92 
 */
94 
int vmw_dmabuf_to_vram_or_gmr(struct vmw_private *dev_priv,
 93 
int vmw_dmabuf_to_vram_or_gmr(struct vmw_private *dev_priv,
95 
			      struct vmw_dma_buffer *buf,
 94 
			      struct vmw_dma_buffer *buf,
96 
			      bool pin, bool interruptible)
 95 
			      bool pin, bool interruptible)
97 
{
 96 
{
98 
//   struct vmw_master *vmaster = dev_priv->active_master;
 - 
 
99 
	struct ttm_buffer_object *bo = &buf->base;
 97 
	struct ttm_buffer_object *bo = &buf->base;
100 
	struct ttm_placement *placement;
 98 
	struct ttm_placement *placement;
101 
	int ret;
 99 
	int ret;
Line 102... Line 100...
102 
 
 100 
 
Line 105... Line 103...
105 
//       return ret;
 103 
//       return ret;
Line 106... Line 104...
106 
 
 104 
 
107 
	if (pin)
 105 
	if (pin)
Line 108... Line 106...
108 
		vmw_execbuf_release_pinned_bo(dev_priv);
 106 
		vmw_execbuf_release_pinned_bo(dev_priv);
109 
 
 107 
 
110 
	ret = ttm_bo_reserve(bo, interruptible, false, false, 0);
 108 
	ret = ttm_bo_reserve(bo, interruptible, false, false, NULL);
Line 111... Line 109...
111 
	if (unlikely(ret != 0))
 109 
	if (unlikely(ret != 0))
112 
		goto err;
 110 
		goto err;
Line 196... Line 194...
196 
 */
 194 
 */
197 
int vmw_dmabuf_to_start_of_vram(struct vmw_private *dev_priv,
 195 
int vmw_dmabuf_to_start_of_vram(struct vmw_private *dev_priv,
198 
				struct vmw_dma_buffer *buf,
 196 
				struct vmw_dma_buffer *buf,
199 
				bool pin, bool interruptible)
 197 
				bool pin, bool interruptible)
200 
{
 198 
{
201 
//   struct vmw_master *vmaster = dev_priv->active_master;
 - 
 
202 
	struct ttm_buffer_object *bo = &buf->base;
 199 
	struct ttm_buffer_object *bo = &buf->base;
203 
	struct ttm_placement placement;
 200 
	struct ttm_placement placement;
204 
	int ret = 0;
 201 
	int ret = 0;
Line 205... Line 202...
205 
 
 202 
 
Line 213... Line 210...
213 
//   if (unlikely(ret != 0))
 210 
//   if (unlikely(ret != 0))
214 
//       return ret;
 211 
//       return ret;
Line 215... Line 212...
215 
 
 212 
 
216 
	if (pin)
 213 
	if (pin)
217 
		vmw_execbuf_release_pinned_bo(dev_priv);
 214 
		vmw_execbuf_release_pinned_bo(dev_priv);
218 
	ret = ttm_bo_reserve(bo, interruptible, false, false, 0);
 215 
	ret = ttm_bo_reserve(bo, interruptible, false, false, NULL);
219 
	if (unlikely(ret != 0))
 216 
	if (unlikely(ret != 0))
Line 220... Line 217...
220 
		goto err_unlock;
 217 
		goto err_unlock;
221 
 
 218