Merge "msm: vidc: Invalidate cache for read only FBD" (65dfe82b) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/vidc/msm_vidc.c

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -940,10 +940,12 @@ int msm_vidc_dqbuf(void instance, struct v4l2_buffer b)
	return -EINVAL;		return -EINVAL;
	}		}

	if (is_dynamic_output_buffer_mode(b, inst)) {		rc = output_buffer_cache_invalidate(inst, buffer_info);
	if (!buffer_info)		if (rc)
	return -EINVAL;		return rc;


			if (is_dynamic_output_buffer_mode(b, inst)) {
	buffer_info->dequeued = true;		buffer_info->dequeued = true;

	dprintk(VIDC_DBG, "[DEQUEUED]: fd[0] = %d\n",		dprintk(VIDC_DBG, "[DEQUEUED]: fd[0] = %d\n",
	@@ -951,8 +953,7 @@ int msm_vidc_dqbuf(void instance, struct v4l2_buffer b)
	mutex_lock(&inst->registeredbufs.lock);		mutex_lock(&inst->registeredbufs.lock);
	rc = unmap_and_deregister_buf(inst, buffer_info);		rc = unmap_and_deregister_buf(inst, buffer_info);
	mutex_unlock(&inst->registeredbufs.lock);		mutex_unlock(&inst->registeredbufs.lock);
	} else		}
	rc = output_buffer_cache_invalidate(inst, buffer_info);

	return rc;		return rc;
	}		}

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1768,10 +1768,6 @@ int buf_ref_put(struct msm_vidc_inst inst, struct buffer_info binfo)
	if (cnt < 0)		if (cnt < 0)
	return cnt;		return cnt;

	rc = output_buffer_cache_invalidate(inst, binfo);
	if (rc)
	return rc;

	if (release_buf) {		if (release_buf) {
	/*		/*
	* We can not delete binfo here as we need to set the user		* We can not delete binfo here as we need to set the user