Bladeren bron

Revert "video: driver: refine refcount handling for release buffer"

This reverts commit bdd7a33bfbf39b8b0dce06126f70e0aac46f5bb8.
Maheshwar Ajja 4 jaren geleden
bovenliggende
commit
da6943c26a
2 gewijzigde bestanden met toevoegingen van 1 en 12 verwijderingen
  1. 0 11
      driver/vidc/src/msm_vidc_driver.c
  2. 1 1
      driver/vidc/src/venus_hfi_response.c

+ 0 - 11
driver/vidc/src/msm_vidc_driver.c

@@ -2161,7 +2161,6 @@ int msm_vidc_map_driver_buf(struct msm_vidc_inst *inst,
 	int rc = 0;
 	int rc = 0;
 	struct msm_vidc_mappings *mappings;
 	struct msm_vidc_mappings *mappings;
 	struct msm_vidc_map *map;
 	struct msm_vidc_map *map;
-	struct msm_vidc_buffer *rel_buf;
 	bool found = false;
 	bool found = false;
 
 
 	if (!inst || !buf) {
 	if (!inst || !buf) {
@@ -2207,16 +2206,6 @@ int msm_vidc_map_driver_buf(struct msm_vidc_inst *inst,
 			}
 			}
 		}
 		}
 		list_add_tail(&map->list, &mappings->list);
 		list_add_tail(&map->list, &mappings->list);
-	} else {
-		/* increment map ref_count, if buf already present in release list */
-		list_for_each_entry(rel_buf, &inst->buffers.release.list, list) {
-			if (rel_buf->device_addr == buf->device_addr) {
-				rc = msm_vidc_memory_map(inst->core, map);
-				if (rc)
-					return rc;
-				break;
-			}
-		}
 	}
 	}
 	rc = msm_vidc_memory_map(inst->core, map);
 	rc = msm_vidc_memory_map(inst->core, map);
 	if (rc)
 	if (rc)

+ 1 - 1
driver/vidc/src/venus_hfi_response.c

@@ -1356,7 +1356,7 @@ static int handle_session_property(struct msm_vidc_inst *inst,
 		} else {
 		} else {
 			i_vpr_e(inst,
 			i_vpr_e(inst,
 				"%s: invalid property %#x for %s port %d dpb cap value %d\n",
 				"%s: invalid property %#x for %s port %d dpb cap value %d\n",
-				__func__, pkt->type, is_decode_session(inst) ? "decode" : "encode",
+				__func__, is_decode_session(inst) ? "decode" : "encode",
 				port, inst->capabilities->cap[DPB_LIST].value);
 				port, inst->capabilities->cap[DPB_LIST].value);
 		}
 		}
 		break;
 		break;