Merge "msm: vidc: adjust max hw_load to support additional 1 fps usecases" (21b5e42b) · Commits · e / devices / android_kernel_oneplus_sm7250

msm/vidc/msm_vidc_platform.c

+27 −13

Original line number	Diff line number	Diff line
		@@ -853,8 +853,11 @@ static struct msm_vidc_common_data lito_common_data_v0[] = {
		},
		{
		.key = "qcom,max-hw-load",
		.value = 1958400,/* ((3840x2176)/256)@60fps */
		/* UHD@30 decode + UHD@30 encode */
		.value = 2220544,
		/**
		* ((3840x2176)/256)@60 + ((8192x8192)/256)@1fps
		* UHD@30 decode + UHD@30 encode + ((8192x8192)/256)@1fps
		*/
		},
		{
		.key = "qcom,max-hq-mbs-per-frame",
		@@ -933,7 +936,10 @@ static struct msm_vidc_common_data lito_common_data_v1[] = {
		},
		{
		.key = "qcom,max-hw-load",
		.value = 1224000,/* UHD@30 decode + 1080@30 encode */
		.value = 1486144,
		/**
		* UHD@30 decode + 1080@30 encode + ((8192x8192)/256)@1fps
		*/
		},
		{
		.key = "qcom,max-hq-mbs-per-frame",
		@@ -1012,8 +1018,11 @@ static struct msm_vidc_common_data lagoon_common_data_v0[] = {
		},
		{
		.key = "qcom,max-hw-load",
		.value = 1958400, /* ((3840x2176)/256)@60fps decode */
		/* UHD@30 decode + 1080@30 encode */
		.value = 2220544,
		/**
		* ((3840x2176)/256)@60fps decode + ((8192x8192)/256)@1fps
		* UHD@30 decode + 1080@30 encode + ((8192x8192)/256)@1fps
		*/
		},
		{
		.key = "qcom,max-mbpf",
		@@ -1092,7 +1101,8 @@ static struct msm_vidc_common_data lagoon_common_data_v1[] = {
		},
		{
		.key = "qcom,max-hw-load",
		.value = 1224000, /* UHD@30 decode + 1080@30 encode */
		.value = 1486144,
		/* UHD@30 decode + 1080@30 encode + ((8192x8192)/256)@1fps */
		},
		{
		.key = "qcom,max-mbpf",
		@@ -1171,11 +1181,13 @@ static struct msm_vidc_common_data kona_common_data[] = {
		},
		{
		.key = "qcom,max-hw-load",
		.value = 7833600, /*
		* 7680x4320@60fps, 3840x2176@240fps
		.value = 8882176,
		/**
		* (7680x4320@60fps, 3840x2176@240fps
		* Greater than 4096x2176@120fps,
		* 8192x4320@48fps
		* 8192x4320@48fps) + ((16384x16384)/256)@1fps
		*/

		},
		{
		.key = "qcom,max-mbpf",
		@@ -1317,7 +1329,8 @@ static struct msm_vidc_common_data bengal_common_data_v0[] = {
		},
		{
		.key = "qcom,max-hw-load",
		.value = 489600,
		.value = 751744,
		/* ((1088x1920)/256)@60fps + ((8192x8192)/256)@1fps */
		},
		{
		.key = "qcom,max-mbpf",
		@@ -1372,7 +1385,8 @@ static struct msm_vidc_common_data bengal_common_data_v1[] = {
		},
		{
		.key = "qcom,max-hw-load",
		.value = 244800,
		.value = 506944,
		/* ((1088x1920)/256)@30fps + ((8192x8192)/256)@1fps */
		},
		{
		.key = "qcom,max-mbpf",