Message ID | CAODyvywHfmeFJP_obZB=dWcaibH_1RRGX=+CSVwcdfjSLMbJ4A@mail.gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/amdgpu: remove "num_pages" local variable in amdgpu_gtt_mgr_new | expand |
sorry, this patch has format problem. abandon. I send another email use qq mail instead. > > amdgpu_gtt_mgr_new and ttm_range_man_alloc share similar logic, but > "num_pages" in amdgpu_gtt_mgr_new is defined as local variable which > is calculate directly in ttm_range_man_alloc. > > Signed-off-by: brolerliew <brolerliew@gmail.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c > index 44367f03316f..0c56e4057d85 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c > @@ -116,7 +116,6 @@ static int amdgpu_gtt_mgr_new(struct > ttm_resource_manager *man, > struct ttm_resource **res) > { > struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man); > - uint32_t num_pages = PFN_UP(tbo->base.size); > struct ttm_range_mgr_node *node; > int r; > > @@ -134,7 +133,7 @@ static int amdgpu_gtt_mgr_new(struct > ttm_resource_manager *man, > if (place->lpfn) { > spin_lock(&mgr->lock); > r = drm_mm_insert_node_in_range(&mgr->mm, &node->mm_nodes[0], > - num_pages, tbo->page_alignment, > + > PFN_UP(node->base.size), tbo->page_alignment, > 0, place->fpfn, place->lpfn, > DRM_MM_INSERT_BEST); > spin_unlock(&mgr->lock); > -- > 2.40.1
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c index 44367f03316f..0c56e4057d85 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c @@ -116,7 +116,6 @@ static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man, struct ttm_resource **res) { struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man); - uint32_t num_pages = PFN_UP(tbo->base.size); struct ttm_range_mgr_node *node; int r;
amdgpu_gtt_mgr_new and ttm_range_man_alloc share similar logic, but "num_pages" in amdgpu_gtt_mgr_new is defined as local variable which is calculate directly in ttm_range_man_alloc. Signed-off-by: brolerliew <brolerliew@gmail.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) @@ -134,7 +133,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man, if (place->lpfn) { spin_lock(&mgr->lock); r = drm_mm_insert_node_in_range(&mgr->mm, &node->mm_nodes[0], - num_pages, tbo->page_alignment, + PFN_UP(node->base.size), tbo->page_alignment, 0, place->fpfn, place->lpfn, DRM_MM_INSERT_BEST); spin_unlock(&mgr->lock); -- 2.40.1