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

Commit 15e9a760 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: vidc: Enable video drivers for sdm660"

parents 8e6e4ceb bb91f3ee

arch/arm64/configs/vendor/sdm660_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -401,6 +401,8 @@ CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y 
CONFIG_MSMB_JPEG=y

CONFIG_MSM_FD=y

CONFIG_MSM_JPEGDMA=y

CONFIG_MSM_VIDC_3X_V4L2=y

CONFIG_MSM_VIDC_3X_GOVERNORS=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_FB=y

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

+17 −26
Original line number Diff line number Diff line
@@ -1386,13 +1386,8 @@ static int hfi_process_session_prop_info(u32 device_id, 
		cmd_done.status = VIDC_ERR_NONE;

		cmd_done.data.property.buf_req = buff_req;

		cmd_done.size = sizeof(buff_req);

		break;



		*info = (struct msm_vidc_cb_info) {

			.response_type =  HAL_SESSION_PROPERTY_INFO,

			.response.cmd = cmd_done,

		};



		return 0;

	case HFI_PROPERTY_PARAM_PROFILE_LEVEL_CURRENT:

		hfi_process_sess_get_prop_profile_level(pkt, &profile_level);

		cmd_done.device_id = device_id;
@@ -1404,33 +1399,29 @@ static int hfi_process_session_prop_info(u32 device_id, 
				.level = profile_level.level,

			};

		cmd_done.size = sizeof(struct hal_profile_level);

		break;



	case HFI_PROPERTY_CONFIG_VDEC_ENTROPY:

		hfi_process_sess_get_prop_dec_entropy(pkt, &entropy);

		cmd_done.device_id = device_id;

		cmd_done.session_id = (void *)(uintptr_t)pkt->session_id;

		cmd_done.status = VIDC_ERR_NONE;

		cmd_done.data.property.h264_entropy = entropy;

		cmd_done.size = sizeof(enum hal_h264_entropy);

		break;



		*info = (struct msm_vidc_cb_info) {

			.response_type =  HAL_SESSION_PROPERTY_INFO,

			.response.cmd = cmd_done,

		};

		return 0;

/*

 *	case HFI_PROPERTY_CONFIG_VDEC_ENTROPY:

 *		hfi_process_sess_get_prop_dec_entropy(pkt, &entropy);

 *		cmd_done.device_id = device_id;

 *		cmd_done.session_id = (void *)(uintptr_t)pkt->session_id;

 *		cmd_done.status = VIDC_ERR_NONE;

 *		cmd_done.data.property.h264_entropy = entropy;

 *		cmd_done.size = sizeof(enum hal_h264_entropy);

 *

 *		*info = (struct msm_vidc_cb_info) {

 *			.response_type =  HAL_SESSION_PROPERTY_INFO,

 *			.response.cmd = cmd_done,

 *		};

 *		return 0;

 */

	default:

		dprintk(VIDC_DBG,

				"hal_process_session_prop_info: unknown_prop_id: %x\n",

				pkt->rg_property_data[0]);

		return -ENOTSUPP;

	}



	*info = (struct msm_vidc_cb_info) {

		.response_type =  HAL_SESSION_PROPERTY_INFO,

		.response.cmd = cmd_done,

	};

	return 0;

}



static int hfi_process_session_init_done(u32 device_id,