From: Christian König Date: Wed, 28 Feb 2018 08:48:22 +0000 (+0100) Subject: drm/ttm: move initializing ttm->sg into ttm_tt_init_fields X-Git-Tag: v4.17-rc1~185^2~13^2~77 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=536bbeba9bd9ab6dc9d175a76a04aa10ea049fea;p=linux.git drm/ttm: move initializing ttm->sg into ttm_tt_init_fields Better to set this with all other fields as well. Signed-off-by: Christian König Reviewed-by: Roger He Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 65976238d24b..7e672be987b5 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -77,9 +77,6 @@ int ttm_tt_create(struct ttm_buffer_object *bo, bool zero_alloc) if (unlikely(bo->ttm == NULL)) return -ENOMEM; - if (bo->type == ttm_bo_type_sg) - bo->ttm->sg = bo->sg; - return 0; } @@ -245,6 +242,7 @@ void ttm_tt_init_fields(struct ttm_tt *ttm, struct ttm_buffer_object *bo, ttm->page_flags = page_flags; ttm->state = tt_unpopulated; ttm->swap_storage = NULL; + ttm->sg = bo->sg; } int ttm_tt_init(struct ttm_tt *ttm, struct ttm_buffer_object *bo,