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

[Kevin Brace]

 drivers/gpu/drm/openchrome/openchrome_drv.c   |    2 +-
 drivers/gpu/drm/openchrome/openchrome_ioc32.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 03fad8298a7dc27087629dff2c943857fa73f185
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Sep 20 14:14:37 2019 -0700

    drm/openchrome: use gem vma_node
    
    Based on commit b96f3e7c8069b749a40ca3a33c97835d57dd45d2
    (drm/ttm: use gem vma_node).
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c
index 60f1bf1caf3c..e32b19548580 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -126,7 +126,7 @@ static int openchrome_drm_driver_dumb_map_offset(
 	}
 
 	bo = container_of(gem, struct openchrome_bo, gem);
-	*offset = drm_vma_node_offset_addr(&bo->ttm_bo.vma_node);
+	*offset = drm_vma_node_offset_addr(&bo->ttm_bo.base.vma_node);
 
 	drm_gem_object_put_unlocked(gem);
 exit:
diff --git a/drivers/gpu/drm/openchrome/openchrome_ioc32.c b/drivers/gpu/drm/openchrome/openchrome_ioc32.c
index 6087bfd4fb5e..ec0a890a7e13 100644
--- a/drivers/gpu/drm/openchrome/openchrome_ioc32.c
+++ b/drivers/gpu/drm/openchrome/openchrome_ioc32.c
@@ -100,7 +100,7 @@ via_gem_alloc(struct drm_device *dev, void *data,
 						TTM_PL_MASK_MEM;
 	args->offset		= bo->ttm_bo.offset;
 	args->map_handle	= drm_vma_node_offset_addr(
-						&bo->ttm_bo.vma_node);
+						&bo->ttm_bo.base.vma_node);
 	args->handle		= handle;
 	args->version		= 1;
 
@@ -147,7 +147,7 @@ via_gem_state(struct drm_device *dev, void *data, struct drm_file *file_priv)
 						TTM_PL_MASK_MEM;
 			args->offset = bo->ttm_bo.offset;
 			args->map_handle = drm_vma_node_offset_addr(
-						&bo->ttm_bo.vma_node);
+						&bo->ttm_bo.base.vma_node);
 		}
 	}