Commit cdf4100e authored by Danilo Krummrich's avatar Danilo Krummrich

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: e6303f32 ("drm: manager to keep track of GPUs VA mappings")
Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230823233119.2891-1-dakr@redhat.com
parent 91dc5215
...@@ -1076,7 +1076,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ...@@ -1076,7 +1076,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
u64 req_addr, u64 req_range, u64 req_addr, u64 req_range,
struct drm_gem_object *req_obj, u64 req_offset) 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; u64 req_end = req_addr + req_range;
int ret; int ret;
...@@ -1106,7 +1106,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ...@@ -1106,7 +1106,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
ret = op_unmap_cb(ops, priv, va, merge); ret = op_unmap_cb(ops, priv, va, merge);
if (ret) if (ret)
return ret; return ret;
goto next; continue;
} }
if (end > req_end) { if (end > req_end) {
...@@ -1151,7 +1151,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ...@@ -1151,7 +1151,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
ret = op_remap_cb(ops, priv, &p, NULL, &u); ret = op_remap_cb(ops, priv, &p, NULL, &u);
if (ret) if (ret)
return ret; return ret;
goto next; continue;
} }
if (end > req_end) { if (end > req_end) {
...@@ -1184,7 +1184,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ...@@ -1184,7 +1184,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
ret = op_unmap_cb(ops, priv, va, merge); ret = op_unmap_cb(ops, priv, va, merge);
if (ret) if (ret)
return ret; return ret;
goto next; continue;
} }
if (end > req_end) { if (end > req_end) {
...@@ -1205,8 +1205,6 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ...@@ -1205,8 +1205,6 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
break; break;
} }
} }
next:
prev = va;
} }
return op_map_cb(ops, priv, return op_map_cb(ops, priv,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment