drm/gpuva_mgr: remove unused prev pointer in __drm_gpuva_sm_map()
Subsystems (2)
PATCH 1/1 drm/gpuva_mgr: remove unused prev pointer in __drm_gpuva_sm_map()
The prev pointer in __drm_gpuva_sm_map() was used to implement automatic merging of mappings. Since automatic merging did not make its way upstream, remove this leftover.
Fixes e6303f323b1a ("drm: manager to keep track of GPUs VA mappings")
Signed-off-by Danilo Krummrich <[email protected]>
--- drivers/gpu/drm/drm_gpuva_mgr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/drm_gpuva_mgr.c +4 -6
@@ -1743,7 +1743,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, u64 req_addr, u64 req_range, struct drm_gem_object *req_obj, u64 req_offset) { - struct drm_gpuva *va, *next, *prev = NULL; + struct drm_gpuva *va, *next;u64 req_end = req_addr + req_range;int ret;
@@ -1773,7 +1773,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ret =op_unmap_cb (ops, priv, va, merge);if (ret)return ret; - goto next; +continue ; }if (end > req_end) {
@@ -1818,7 +1818,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ret =op_remap_cb (ops, priv, &p,NULL , &u);if (ret)return ret; - goto next; +continue ; }if (end > req_end) {
@@ -1851,7 +1851,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ret =op_unmap_cb (ops, priv, va, merge);if (ret)return ret; - goto next; +continue ; }if (end > req_end) {
@@ -1872,8 +1872,6 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,break ; } } -next: - prev = va; } return op_map_cb(ops, priv,
Signature · 1 line
2.41.0
Quoted 7 lines · Danilo Krummrich
The prev pointer in
__drm_gpuva_sm_map()was used to implement automatic merging of mappings. Since automatic merging did not make its way upstream, remove this leftover.Fixes e6303f323b1a ("drm: manager to keep track of GPUs VA mappings")Signed-off-by Danilo Krummrich <[email protected]>
Reviewed-by Dave Airlie <[email protected]>
Quoted 56 lines
--- drivers/gpu/drm/drm_gpuva_mgr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)drivers/gpu/drm/drm_gpuva_mgr.c +4
-7@@ -1743,7 +1743,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, u64 req_addr, u64 req_range, struct drm_gem_object *req_obj, u64 req_offset) { - struct drm_gpuva *va, *next, *prev = NULL; + struct drm_gpuva *va, *next;u64 req_end = req_addr + req_range;int ret;@@ -1773,7 +1773,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ret =op_unmap_cb (ops, priv, va, merge);if (ret)return ret; - goto next; +continue ; }if (end > req_end) {@@ -1818,7 +1818,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ret =op_remap_cb (ops, priv, &p,NULL , &u);if (ret)return ret; - goto next; +continue ; }if (end > req_end) {@@ -1851,7 +1851,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ret =op_unmap_cb (ops, priv, va, merge);if (ret)return ret; - goto next; +continue ; }if (end > req_end) {@@ -1872,8 +1872,6 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,break ; } } -next: - prev = va; } return op_map_cb(ops, priv, --2.41.0