[Openchrome-devel] drm-openchrome: Branch 'drm-next-4.13' - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/openchrome/via_ioc32.c |    4 ++--
 drivers/gpu/drm/openchrome/via_ttm.c   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7f3bac3c1df7272fec399398fd0b9e199b5d37fa
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Aug 4 16:18:52 2017 -0700

    Remove use_ticket parameter from ttm_bo_reserve
    
    Commit dfd5e50ea43ca4a89de061fb69618299760eb682 made this change,
    so our side needs to change as well.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/via_ioc32.c b/drivers/gpu/drm/openchrome/via_ioc32.c
index bfda82eb5b7f..027f99e17827 100644
--- a/drivers/gpu/drm/openchrome/via_ioc32.c
+++ b/drivers/gpu/drm/openchrome/via_ioc32.c
@@ -107,7 +107,7 @@ via_gem_state(struct drm_device *dev, void *data, struct drm_file *file_priv)
 	/* Don't bother to migrate to same domain */
 	args->domains &= ~(bo->mem.placement & TTM_PL_MASK_MEM);
 	if (args->domains) {
-		ret = ttm_bo_reserve(bo, true, false, false, 0);
+		ret = ttm_bo_reserve(bo, true, false, NULL);
 		if (unlikely(ret))
 			return ret;
 
@@ -148,7 +148,7 @@ via_gem_wait(struct drm_device *dev, void *data, struct drm_file *file_priv)
 		return ret;
 
 	no_wait = (args->no_wait != 0);
-	ret = ttm_bo_reserve(bo, true, no_wait, false, 0);
+	ret = ttm_bo_reserve(bo, true, no_wait, NULL);
 	if (unlikely(ret != 0))
 		return ret;
 
diff --git a/drivers/gpu/drm/openchrome/via_ttm.c b/drivers/gpu/drm/openchrome/via_ttm.c
index 89319116d015..2d98f06c5a0c 100644
--- a/drivers/gpu/drm/openchrome/via_ttm.c
+++ b/drivers/gpu/drm/openchrome/via_ttm.c
@@ -750,7 +750,7 @@ via_bo_pin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap)
     struct ttm_placement placement;
     int ret;
 
-    ret = ttm_bo_reserve(bo, true, false, false, 0);
+    ret = ttm_bo_reserve(bo, true, false, NULL);
     if (!ret) {
         placement.placement = heap->placements;
         placement.num_placement = 1;
@@ -771,7 +771,7 @@ via_bo_unpin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap)
     struct ttm_placement placement;
     int ret;
 
-    ret = ttm_bo_reserve(bo, true, false, false, 0);
+    ret = ttm_bo_reserve(bo, true, false, NULL);
     if (!ret) {
         if (kmap)
             ttm_bo_kunmap(kmap);