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.
Unified · Split
| @@ -1076,7 +1076,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, · 1075 unmodified lines | |||
| 1076 | u64 req_addr, u64 req_range, | 1076 | u64 req_addr, u64 req_range, |
| 1077 | struct drm_gem_object *req_obj, u64 req_offset) | 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 | u64 req_end = req_addr + req_range; | 1080 | u64 req_end = req_addr + req_range; |
| 1081 | int ret; | 1081 | int ret; |
| 1082 | 1082 | ||
| @@ -1106,7 +1106,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, · 23 unmodified lines | |||
| 1106 | ret = op_unmap_cb(ops, priv, va, merge); | 1106 | ret = op_unmap_cb(ops, priv, va, merge); |
| 1107 | if (ret) | 1107 | if (ret) |
| 1108 | return ret; | 1108 | return ret; |
| 1109 | goto next; | 1109 | continue; |
| 1110 | } | 1110 | } |
| 1111 | 1111 | ||
| 1112 | if (end > req_end) { | 1112 | if (end > req_end) { |
| @@ -1151,7 +1151,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, · 38 unmodified lines | |||
| 1151 | ret = op_remap_cb(ops, priv, &p, NULL, &u); | 1151 | ret = op_remap_cb(ops, priv, &p, NULL, &u); |
| 1152 | if (ret) | 1152 | if (ret) |
| 1153 | return ret; | 1153 | return ret; |
| 1154 | goto next; | 1154 | continue; |
| 1155 | } | 1155 | } |
| 1156 | 1156 | ||
| 1157 | if (end > req_end) { | 1157 | if (end > req_end) { |
| @@ -1184,7 +1184,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, · 26 unmodified lines | |||
| 1184 | ret = op_unmap_cb(ops, priv, va, merge); | 1184 | ret = op_unmap_cb(ops, priv, va, merge); |
| 1185 | if (ret) | 1185 | if (ret) |
| 1186 | return ret; | 1186 | return ret; |
| 1187 | goto next; | 1187 | continue; |
| 1188 | } | 1188 | } |
| 1189 | 1189 | ||
| 1190 | if (end > req_end) { | 1190 | if (end > req_end) { |
| @@ -1205,8 +1205,6 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, · 14 unmodified lines | |||
| 1205 | break; | 1205 | break; |
| 1206 | } | 1206 | } |
| 1207 | } | 1207 | } |
| 1208 | next: | ||
| 1209 | prev = va; | ||
| 1210 | } | 1208 | } |
| 1211 | 1209 | ||
| 1212 | return op_map_cb(ops, priv, | 1210 | return op_map_cb(ops, priv, |