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

Commit d39a41a4 authored by Manikanta Kanamarlapudi's avatar Manikanta Kanamarlapudi Committed by Gerrit - the friendly Code Review server
Browse files

msm: vidc: Add support for trinket video device 



Add support for trinket by adding platform specific
data in video driver as per H/W and spec.

CRs-Fixed: 2360061
Change-Id: I06c1dcdf8112be6e49aae0ffe802a05a8925d50f
Signed-off-by: default avatarManikanta Kanamarlapudi <kmanikan@codeaurora.org>
parent 7e09c6da

Documentation/devicetree/bindings/media/video/msm-vidc.txt

+2 −1
Original line number Diff line number Diff line
@@ -8,8 +8,9 @@ Required properties: 
	- "qcom,msm-vidc"

	- "qcom,sm6150-vidc" : Invokes driver specific data for SM6150.

        - "qcom,sm8150-vidc" : Invokes driver specific data for SM8150.

        - "qcom,sm6150-vidc" : Invokes driver specific data for SM6150.

        - "qcom,sdmmagpie-vidc" : Invokes driver specific data for sdmmagpie.

        - "qcom,sm6150-vidc" : Invokes driver specific data for SM6150.

        - "qcom,trinket-vidc" : Invokes driver specific data for trinket.

        - "qcom,sdm845-vidc" : Invokes driver specific data for SDM845.

        - "qcom,sdm670-vidc" : Invokes driver specific data for SDM670.

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

+92 −0
Original line number Diff line number Diff line
@@ -66,6 +66,19 @@ static struct msm_vidc_codec_data sm6150_codec_data[] = { 
	CODEC_ENTRY(V4L2_PIX_FMT_VP9, MSM_VIDC_DECODER, 50, 200, 200),

};



/* Update with trinket data */

static struct msm_vidc_codec_data trinket_codec_data[] =  {

	CODEC_ENTRY(V4L2_PIX_FMT_H264, MSM_VIDC_ENCODER, 125, 675, 320),

	CODEC_ENTRY(V4L2_PIX_FMT_HEVC, MSM_VIDC_ENCODER, 125, 675, 320),

	CODEC_ENTRY(V4L2_PIX_FMT_VP8, MSM_VIDC_ENCODER, 125, 675, 320),

	CODEC_ENTRY(V4L2_PIX_FMT_TME, MSM_VIDC_ENCODER, 0, 540, 540),

	CODEC_ENTRY(V4L2_PIX_FMT_MPEG2, MSM_VIDC_DECODER, 50, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_H264, MSM_VIDC_DECODER, 50, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_HEVC, MSM_VIDC_DECODER, 50, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_VP8, MSM_VIDC_DECODER, 50, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_VP9, MSM_VIDC_DECODER, 50, 200, 200),

};



/* Update with 855 data */

static struct msm_vidc_codec_data sm8150_codec_data[] =  {

	CODEC_ENTRY(V4L2_PIX_FMT_H264, MSM_VIDC_ENCODER, 10, 675, 320),
@@ -201,6 +214,65 @@ static struct msm_vidc_common_data sm6150_common_data[] = { 
	},

};



static struct msm_vidc_common_data trinket_common_data[] = {

	{

		.key = "qcom,never-unload-fw",

		.value = 1,

	},

	{

		.key = "qcom,sw-power-collapse",

		.value = 1,

	},

	{

		.key = "qcom,domain-attr-non-fatal-faults",

		.value = 1,

	},

	{

		.key = "qcom,max-secure-instances",

		.value = 5,

	},

	{

		.key = "qcom,max-hw-load",

		.value = 1944000,

	},

	{

		.key = "qcom,max-hq-mbs-per-frame",

		.value = 8160,

	},

	{

		.key = "qcom,max-hq-frames-per-sec",

		.value = 30,

	},

	{

		.key = "qcom,max-b-frame-size",

		.value = 8160,

	},

	{

		.key = "qcom,max-b-frames-per-sec",

		.value = 60,

	},

	{

		.key = "qcom,power-collapse-delay",

		.value = 1500,

	},

	{

		.key = "qcom,hw-resp-timeout",

		.value = 1000,

	},

	{

		.key = "qcom,dcvs",

		.value = 1,

	},

	{

		.key = "qcom,fw-cycles",

		.value = 733003,

	},

	{

		.key = "qcom,fw-vpp-cycles",

		.value = 225975,

	},

};



static struct msm_vidc_common_data sm8150_common_data[] = {

	{

		.key = "qcom,never-unload-fw",
@@ -641,6 +713,22 @@ static struct msm_vidc_platform_data sm6150_data = { 
	.vpu_ver = VPU_VERSION_4,

};



static struct msm_vidc_platform_data trinket_data = {

	.codec_data = trinket_codec_data,

	.codec_data_length =  ARRAY_SIZE(trinket_codec_data),

	.common_data = trinket_common_data,

	.common_data_length =  ARRAY_SIZE(trinket_common_data),

	.csc_data.vpe_csc_custom_bias_coeff = vpe_csc_custom_bias_coeff,

	.csc_data.vpe_csc_custom_matrix_coeff = vpe_csc_custom_matrix_coeff,

	.csc_data.vpe_csc_custom_limit_coeff = vpe_csc_custom_limit_coeff,

	.efuse_data = NULL,

	.efuse_data_length = 0,

	.sku_version = 0,

	.gcc_register_base = 0,

	.gcc_register_size = 0,

	.vpu_ver = VPU_VERSION_4,

};



static struct msm_vidc_platform_data sm8150_data = {

	.codec_data = sm8150_codec_data,

	.codec_data_length =  ARRAY_SIZE(sm8150_codec_data),
@@ -710,6 +798,10 @@ static const struct of_device_id msm_vidc_dt_match[] = { 
		.compatible = "qcom,sm6150-vidc",

		.data = &sm6150_data,

	},

	{

		.compatible = "qcom,trinket-vidc",

		.data = &trinket_data,

	},

	{

		.compatible = "qcom,sm8150-vidc",

		.data = &sm8150_data,