drm/gpuva_mgr: remove unused prev pointer in __drm_gpuva_sm_map()

dakr · dakr · commit cdf4100eaa1f · 2023-08-24T14:27:14.000+02:00
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: e6303f3 ("drm: manager to keep track of GPUs VA mappings") Signed-off-by: Danilo Krummrich <dakr@redhat.com> Reviewed-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230823233119.2891-1-dakr@redhat.com
diff --git a/drivers/gpu/drm/drm_gpuva_mgr.c b/drivers/gpu/drm/drm_gpuva_mgr.c
@@ -1076,7 +1076,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;
 
@@ -1106,7 +1106,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) {
@@ -1151,7 +1151,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) {
@@ -1184,7 +1184,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) {
@@ -1205,8 +1205,6 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
 				break;
 			}
 		}
-next:
-		prev = va;
 	}
 
 	return op_map_cb(ops, priv,

Original file line number	Diff line number	Diff line change
`@@ -1076,7 +1076,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,`
`1076`	`1076`	`u64 req_addr, u64 req_range,`
`1077`	`1077`	`struct drm_gem_object *req_obj, u64 req_offset)`
`1078`	`1078`	`{`
`1079`		`- struct drm_gpuva va, next, *prev = NULL;`
	`1079`	`+ struct drm_gpuva va, next;`
`1080`	`1080`	`u64 req_end = req_addr + req_range;`
`1081`	`1081`	`int ret;`
`1082`	`1082`
`@@ -1106,7 +1106,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,`
`1106`	`1106`	`ret = op_unmap_cb(ops, priv, va, merge);`
`1107`	`1107`	`if (ret)`
`1108`	`1108`	`return ret;`
`1109`		`- goto next;`
	`1109`	`+ continue;`
`1110`	`1110`	`}`
`1111`	`1111`
`1112`	`1112`	`if (end > req_end) {`
`@@ -1151,7 +1151,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,`
`1151`	`1151`	`ret = op_remap_cb(ops, priv, &p, NULL, &u);`
`1152`	`1152`	`if (ret)`
`1153`	`1153`	`return ret;`
`1154`		`- goto next;`
	`1154`	`+ continue;`
`1155`	`1155`	`}`
`1156`	`1156`
`1157`	`1157`	`if (end > req_end) {`
`@@ -1184,7 +1184,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,`
`1184`	`1184`	`ret = op_unmap_cb(ops, priv, va, merge);`
`1185`	`1185`	`if (ret)`
`1186`	`1186`	`return ret;`
`1187`		`- goto next;`
	`1187`	`+ continue;`
`1188`	`1188`	`}`
`1189`	`1189`
`1190`	`1190`	`if (end > req_end) {`
`@@ -1205,8 +1205,6 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,`
`1205`	`1205`	`break;`
`1206`	`1206`	`}`
`1207`	`1207`	`}`
`1208`		`-next:`
`1209`		`- prev = va;`
`1210`	`1208`	`}`
`1211`	`1209`
`1212`	`1210`	`return op_map_cb(ops, priv,`