Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 796ea51a authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 21b5e42b on remote branch 

Change-Id: I7be8baa49af4cb31efec12cf3234eb8959361968
parents 5a3fb439 21b5e42b

msm/vidc/hfi_iris2.c

+4 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

 */



#include "msm_vidc_debug.h"
@@ -189,6 +189,8 @@ void __power_off_iris2(struct venus_hfi_device *device) 
	__write_register(device, CPU_CS_X2RPMh_IRIS2, 0x3, sid);



	/* HPG 6.1.2 Step 2, noc to low power */

	if (device->res->vpu_ver == VPU_VERSION_IRIS2_1)

		goto skip_aon_mvp_noc;

	__write_register(device, AON_WRAPPER_MVP_NOC_LPI_CONTROL, 0x1, sid);

	while (!reg_status && count < max_count) {

		lpi_status =
@@ -205,6 +207,7 @@ void __power_off_iris2(struct venus_hfi_device *device) 
	}



	/* HPG 6.1.2 Step 3, debug bridge to low power */

skip_aon_mvp_noc:

	__write_register(device,

		WRAPPER_DEBUG_BRIDGE_LPI_CONTROL_IRIS2, 0x7, sid);

	reg_status = 0;

msm/vidc/msm_smem.c

+9 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

 */



#include <asm/dma-iommu.h>
@@ -129,6 +129,9 @@ static int msm_dma_put_device_address(u32 flags, 
	enum hal_buffer buffer_type, u32 sid)

{

	int rc = 0;

	struct sg_table *table = NULL;

	dma_addr_t iova;

	unsigned long buffer_size;



	if (!mapping_info) {

		s_vpr_e(sid, "Invalid mapping_info\n");
@@ -142,7 +145,11 @@ static int msm_dma_put_device_address(u32 flags, 
		return -EINVAL;

	}



	trace_msm_smem_buffer_iommu_op_start("UNMAP", 0, 0, 0, 0, 0);

	table = mapping_info->table;

	iova = table->sgl->dma_address;

	buffer_size = table->sgl->dma_length;

	trace_msm_smem_buffer_iommu_op_start("UNMAP", 0, 0,

			0, iova, buffer_size);

	dma_buf_unmap_attachment(mapping_info->attach,

		mapping_info->table, DMA_BIDIRECTIONAL);

	dma_buf_detach(mapping_info->buf, mapping_info->attach);

msm/vidc/msm_vdec.c

+3 −19
Original line number Diff line number Diff line
@@ -675,14 +675,6 @@ int msm_vdec_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 
		memcpy(f, &fmt->v4l2_fmt, sizeof(struct v4l2_format));

	}



	/*

	 * if batching enabled previously then you may chose

	 * to disable it based on recent configuration changes.

	 * if batching already disabled do not enable it again

	 * as sufficient extra buffers (required for batch mode

	 * on both ports) may not have been updated to client.

	 */

	if (inst->batch.enable)

	inst->batch.enable = is_batching_allowed(inst);

	msm_dcvs_try_enable(inst);
@@ -884,6 +876,7 @@ int msm_vdec_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		if (ctrl->val)

			inst->flags |= VIDC_THUMBNAIL;



		inst->batch.enable = is_batching_allowed(inst);

		rc = msm_vidc_calculate_buffer_counts(inst);

		if (rc) {

			s_vpr_e(inst->sid,
@@ -905,16 +898,6 @@ int msm_vdec_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_FRAME_RATE:

		inst->clk_data.frame_rate = ctrl->val;

		if (inst->state >= MSM_VIDC_LOAD_RESOURCES)

			break;

		/* Only recalculate buffer counts before buffers allocated */

		rc = msm_vidc_calculate_buffer_counts(inst);

		if (rc) {

			s_vpr_e(inst->sid,

				"%s failed to calculate buffer count after set fps\n",

				__func__);

			return rc;

		}

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_EXTRADATA:

		if (ctrl->val == EXTRADATA_NONE)
@@ -942,6 +925,7 @@ int msm_vdec_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_LOWLATENCY_MODE:

		inst->clk_data.low_latency_mode = !!ctrl->val;

		inst->batch.enable = is_batching_allowed(inst);

		break;

	default:

		s_vpr_e(inst->sid, "Unknown control %#x\n", ctrl->id);

msm/vidc/msm_vidc.c

+1 −9
Original line number Diff line number Diff line
@@ -881,14 +881,6 @@ static inline int start_streaming(struct msm_vidc_inst *inst) 
		}

	}



	/*

	 * if batching enabled previously then you may chose

	 * to disable it based on recent configuration changes.

	 * if batching already disabled do not enable it again

	 * as sufficient extra buffers (required for batch mode

	 * on both ports) may not have been updated to client.

	 */

	if (inst->batch.enable)

	inst->batch.enable = is_batching_allowed(inst);

	s_vpr_hp(inst->sid, "%s: batching %s for inst %pK\n",

		__func__, inst->batch.enable ? "enabled" : "disabled", inst);

msm/vidc/msm_vidc_buffer_calculations.c

+112 −103

File changed.

Preview size limit exceeded, changes collapsed.