diff options
Diffstat (limited to 'linux-core/openchrome')
| -rw-r--r-- | linux-core/openchrome/via_buffer.c | 8 | ||||
| -rw-r--r-- | linux-core/openchrome/via_drv.h | 4 | ||||
| -rw-r--r-- | linux-core/openchrome/via_execbuf.c | 4 | ||||
| -rw-r--r-- | linux-core/openchrome/via_init.c | 10 | ||||
| -rw-r--r-- | linux-core/openchrome/via_ttm_glue.c | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/linux-core/openchrome/via_buffer.c b/linux-core/openchrome/via_buffer.c index fe1d60b4..6be83ba1 100644 --- a/linux-core/openchrome/via_buffer.c +++ b/linux-core/openchrome/via_buffer.c @@ -128,7 +128,7 @@ uint32_t via_evict_flags(struct ttm_buffer_object * bo) } static int via_move_dmablit(struct ttm_buffer_object *bo, - int evict, int no_wait, struct ttm_mem_reg *new_mem) + bool evict, bool no_wait, struct ttm_mem_reg *new_mem) { struct drm_via_private *dev_priv = container_of(bo->bdev, struct drm_via_private, bdev); @@ -165,7 +165,7 @@ static int via_move_dmablit(struct ttm_buffer_object *bo, } static int via_move_vram_tt(struct ttm_buffer_object *bo, - int evict, int no_wait, struct ttm_mem_reg *new_mem) + bool evict, bool no_wait, struct ttm_mem_reg *new_mem) { struct ttm_mem_reg *old_mem = &bo->mem; int ret; @@ -191,7 +191,7 @@ static int via_move_vram_tt(struct ttm_buffer_object *bo, tmp_mem.proposed_flags |= (TTM_PL_FLAG_SYSTEM | TTM_PL_FLAG_CACHED); tmp_mem.mem_type = TTM_PL_SYSTEM; - ret = via_move_dmablit(bo, 1, no_wait, &tmp_mem); + ret = via_move_dmablit(bo, true, no_wait, &tmp_mem); if (ret) return ret; return ttm_bo_move_ttm(bo, evict, no_wait, new_mem); @@ -212,7 +212,7 @@ static void via_move_null(struct ttm_buffer_object *bo, } int via_bo_move(struct ttm_buffer_object *bo, - int evict, int interruptible, int no_wait, + bool evict, bool interruptible, bool no_wait, struct ttm_mem_reg *new_mem) { struct ttm_mem_reg *old_mem = &bo->mem; diff --git a/linux-core/openchrome/via_drv.h b/linux-core/openchrome/via_drv.h index 75565e75..d17f9992 100644 --- a/linux-core/openchrome/via_drv.h +++ b/linux-core/openchrome/via_drv.h @@ -282,8 +282,8 @@ extern int via_invalidate_caches(struct ttm_bo_device *bdev, extern int via_init_mem_type(struct ttm_bo_device *dev, uint32_t type, struct ttm_mem_type_manager *man); extern uint32_t via_evict_flags(struct ttm_buffer_object *bo); -extern int via_bo_move(struct ttm_buffer_object *bo, int evict, - int interruptible, int no_wait, struct ttm_mem_reg *new_mem); +extern int via_bo_move(struct ttm_buffer_object *bo, bool evict, + bool interruptible, bool no_wait, struct ttm_mem_reg *new_mem); extern void via_dma_initialize(struct drm_via_private *dev_priv); extern void via_dma_takedown(struct drm_via_private *dev_priv); extern void via_wait_idle(struct drm_via_private *dev_priv); diff --git a/linux-core/openchrome/via_execbuf.c b/linux-core/openchrome/via_execbuf.c index b373972e..e16922e5 100644 --- a/linux-core/openchrome/via_execbuf.c +++ b/linux-core/openchrome/via_execbuf.c @@ -105,7 +105,7 @@ via_placement_fence_type(struct ttm_buffer_object *bo, if (old_fence && ((new_fence_class != old_fence->fence_class) || ((n_fence_type ^ old_fence_types) & old_fence_types))) { - ret = ttm_bo_wait(bo, 0, 0, 0); + ret = ttm_bo_wait(bo, false, false, false); if (unlikely(ret != 0)) return ret; } @@ -559,7 +559,7 @@ static int via_validate_buffer_list(struct drm_file *file_priv, if (unlikely(ret != 0)) goto out_err; - ret = ttm_buffer_object_validate(bo, 1, 0); + ret = ttm_buffer_object_validate(bo, true, false); if (unlikely(ret != 0)) goto out_err; diff --git a/linux-core/openchrome/via_init.c b/linux-core/openchrome/via_init.c index c67c5773..2d77a42d 100644 --- a/linux-core/openchrome/via_init.c +++ b/linux-core/openchrome/via_init.c @@ -252,7 +252,7 @@ static int via_exec_init(struct drm_device *dev) { struct drm_via_private *dev_priv = via_priv(dev); int ret; - int dummy; + bool dummy; memset(dev_priv->barriers, 0, sizeof(dev_priv->barriers)); @@ -264,7 +264,7 @@ static int via_exec_init(struct drm_device *dev) ttm_bo_type_kernel, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_NO_EVICT, - 0, 0, 0, NULL, &dev_priv->fence_bo); + 0, 0, false, NULL, &dev_priv->fence_bo); if (unlikely(ret)) return ret; @@ -286,7 +286,7 @@ static int via_exec_init(struct drm_device *dev) ttm_bo_type_kernel, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_NO_EVICT, - 0, 0, 0, NULL, &dev_priv->vq_bo); + 0, 0, false, NULL, &dev_priv->vq_bo); if (unlikely(ret)) goto out_err1; @@ -300,7 +300,7 @@ static int via_exec_init(struct drm_device *dev) ttm_bo_type_kernel, TTM_PL_FLAG_TT | TTM_PL_FLAG_NO_EVICT, - 0, 0, 0, NULL, &dev_priv->agpc_bo); + 0, 0, false, NULL, &dev_priv->agpc_bo); if (unlikely(ret)) goto out_err2; @@ -774,7 +774,7 @@ static int via_firstopen_locked(struct drm_device *dev) ttm_bo_type_kernel, TTM_PL_FLAG_TT | TTM_PL_FLAG_NO_EVICT, - 0, 0, 0, NULL, &dev_priv->agp_bo); + 0, 0, false, NULL, &dev_priv->agp_bo); if (ret) return ret; diff --git a/linux-core/openchrome/via_ttm_glue.c b/linux-core/openchrome/via_ttm_glue.c index 82dc8dd8..e567005c 100644 --- a/linux-core/openchrome/via_ttm_glue.c +++ b/linux-core/openchrome/via_ttm_glue.c @@ -181,7 +181,7 @@ ssize_t via_ttm_write(struct file * filp, const char __user * buf, struct drm_file *file_priv = (struct drm_file *)filp->private_data; struct drm_via_private *dev_priv = via_priv(file_priv->minor->dev); - return ttm_bo_io(&dev_priv->bdev, filp, buf, NULL, count, f_pos, 1); + return ttm_bo_io(&dev_priv->bdev, filp, buf, NULL, count, f_pos, true); } ssize_t via_ttm_read(struct file * filp, char __user * buf, @@ -190,7 +190,7 @@ ssize_t via_ttm_read(struct file * filp, char __user * buf, struct drm_file *file_priv = (struct drm_file *)filp->private_data; struct drm_via_private *dev_priv = via_priv(file_priv->minor->dev); - return ttm_bo_io(&dev_priv->bdev, filp, NULL, buf, count, f_pos, 1); + return ttm_bo_io(&dev_priv->bdev, filp, NULL, buf, count, f_pos, false); } int via_verify_access(struct ttm_buffer_object *bo, struct file *filp) |