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

Commit 071dcb6c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Add secure hint property" into msm-4.9

parents 98ac713a a0e4bad4

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

+8 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,14 @@ int create_pkt_cmd_session_set_property( 
		pkt->size += sizeof(u32) * 2;

		break;

	}

	case HAL_PARAM_SECURE:

	{

		create_pkt_enable(pkt->rg_property_data,

			  HFI_PROPERTY_PARAM_SECURE_SESSION,

			  ((struct hal_enable *)pdata)->enable);

		pkt->size += sizeof(u32) * 2;

		break;

	}

	case HAL_PARAM_VENC_SYNC_FRAME_SEQUENCE_HEADER:

	{

		create_pkt_enable(pkt->rg_property_data,

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

+3 −0
Original line number Diff line number Diff line
@@ -778,7 +778,10 @@ int msm_vdec_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		msm_dcvs_try_enable(inst);

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_SECURE:

		property_id = HAL_PARAM_SECURE;

		inst->flags |= VIDC_SECURE;

		property_val = !!(inst->flags & VIDC_SECURE);

		pdata = &property_val;

		dprintk(VIDC_DBG, "Setting secure mode to: %d\n",

				!!(inst->flags & VIDC_SECURE));

		break;

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

+3 −0
Original line number Diff line number Diff line
@@ -1501,6 +1501,9 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_SECURE:

		inst->flags |= VIDC_SECURE;

		property_id = HAL_PARAM_SECURE;

		property_val = !!(inst->flags & VIDC_SECURE);

		pdata = &property_val;

		dprintk(VIDC_INFO, "Setting secure mode to: %d\n",

				!!(inst->flags & VIDC_SECURE));

		break;

drivers/media/platform/msm/vidc/vidc_hfi_api.h

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ enum hal_property { 
	HAL_PARAM_VENC_IFRAMESIZE_TYPE,

	HAL_PARAM_VIDEO_CORES_USAGE,

	HAL_PARAM_VIDEO_WORK_MODE,

	HAL_PARAM_SECURE,

};



enum hal_domain {

drivers/media/platform/msm/vidc/vidc_hfi_helper.h

+2 −0
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ struct hfi_buffer_info { 
	(HFI_PROPERTY_PARAM_COMMON_START + 0x00E)

#define  HFI_PROPERTY_PARAM_MAX_SESSIONS_SUPPORTED	    \

	(HFI_PROPERTY_PARAM_COMMON_START + 0x010)

#define  HFI_PROPERTY_PARAM_SECURE_SESSION		\

	(HFI_PROPERTY_PARAM_COMMON_START + 0x011)

#define  HFI_PROPERTY_PARAM_WORK_MODE                       \

	(HFI_PROPERTY_PARAM_COMMON_START + 0x015)