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

Commit 8b4b1ec1 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Fix compiler warnings"

parents d26883bc e8305dff

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

+1 −1
Original line number Diff line number Diff line
@@ -1829,7 +1829,7 @@ static int hfi_process_sys_property_info(u32 device_id, 
	default:

		dprintk(VIDC_DBG,

				"%s: unknown_prop_id: %x\n",

				pkt->rg_property_data[0], __func__);

				__func__, pkt->rg_property_data[0]);

		return -ENOTSUPP;

	}

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

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

/*

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

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

 */



#include <asm/dma-iommu.h>
@@ -520,7 +520,8 @@ int msm_smem_cache_operations(struct dma_buf *dbuf, 
	/* Return if buffer doesn't support caching */

	rc = dma_buf_get_flags(dbuf, &flags);

	if (rc) {

		dprintk(VIDC_ERR, "%s: dma_buf_get_flags failed, err %d\n", rc);

		dprintk(VIDC_ERR, "%s: dma_buf_get_flags failed, err %d\n",

			__func__, rc);

		return rc;

	} else if (!(flags & ION_FLAG_CACHED)) {

		return rc;

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

+1 −1
Original line number Diff line number Diff line
@@ -1400,7 +1400,7 @@ int msm_vdec_set_output_stream_mode(struct msm_vidc_inst *inst) 
		if (rc) {

			dprintk(VIDC_ERR,

				"%s: set prop frame_size failed\n",

				__func__, rc);

				__func__);

			return rc;

		}

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -1953,7 +1953,7 @@ int msm_venc_set_secure_mode(struct msm_vidc_inst *inst) 
	ctrl = get_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_SECURE);

	enable.enable = !!ctrl->val;



	dprintk(VIDC_DBG, "%s: %d\n", __func__, enable);

	dprintk(VIDC_DBG, "%s: %d\n", __func__, enable.enable);

	rc = call_hfi_op(hdev, session_set_property, inst->session,

		HFI_PROPERTY_PARAM_SECURE_SESSION, &enable, sizeof(enable));

	if (rc)
@@ -1978,7 +1978,7 @@ int msm_venc_set_priority(struct msm_vidc_inst *inst) 
	ctrl = get_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_PRIORITY);

	enable.enable = !!ctrl->val;



	dprintk(VIDC_DBG, "%s: %d\n", __func__, enable);

	dprintk(VIDC_DBG, "%s: %d\n", __func__, enable.enable);

	rc = call_hfi_op(hdev, session_set_property, inst->session,

		HFI_PROPERTY_CONFIG_REALTIME, &enable, sizeof(enable));

	if (rc)
@@ -3040,7 +3040,7 @@ int msm_venc_set_ltr_mode(struct msm_vidc_inst *inst) 
		return 0;

	if (ctrl->val > inst->capability.ltr_count.max) {

		dprintk(VIDC_ERR, "%s: invalid ltr count %d, max %d\n",

			__func__, ctrl->val > inst->capability.ltr_count.max);

			__func__, ctrl->val, inst->capability.ltr_count.max);

		return -EINVAL;

	}

	ltr.ltr_count =  ctrl->val;

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

+1 −1
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ static inline int start_streaming(struct msm_vidc_inst *inst) 
		rc = msm_vidc_set_rotation(inst);

		if (rc) {

			dprintk(VIDC_ERR,

				"Set rotation for encoder failed %pK\n");

				"Set rotation for encoder failed %pK\n", inst);

			goto fail_start;

		}

	} else if ((inst->session_type == MSM_VIDC_DECODER) &&