Merge "msm: vidc: Read 4k60D fuse and update max-hw-load value" (e1622377) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/atoll-vidc.dtsi

+2 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2019, 2021 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -18,6 +18,7 @@
		msm_vidc: qcom,vidc@aa00000 {
		compatible = "qcom,msm-vidc", "qcom,atoll-vidc";
		status = "ok";
		sku-index = <0>;
		reg = <0xaa00000 0x200000>;
		interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;

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

+81 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -238,6 +238,65 @@ static struct msm_vidc_common_data atoll_common_data[] = {
		},
		};

		static struct msm_vidc_common_data atoll_common_data_v1[] = {
		{
		.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 = 3,
		},
		{
		.key = "qcom,max-hw-load",
		.value = 1216800, /* UHD@30 +1080@30 */
		},
		{
		.key = "qcom,max-hq-mbs-per-frame",
		.value = 8160,
		},
		{
		.key = "qcom,max-hq-mbs-per-sec",
		.value = 244800, /* 1920 x 1088 @ 30 fps */
		},
		{
		.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 sm6150_common_data[] = {
		{
		.key = "qcom,never-unload-fw",
		@@ -743,6 +802,10 @@ static struct msm_vidc_efuse_data sdmmagpie_efuse_data[] = {
		EFUSE_ENTRY(0x00786018, 4, 0x00000400, 0x0a, SKU_VERSION),
		};

		static struct msm_vidc_efuse_data atoll_efuse_data[] = {
		EFUSE_ENTRY(0x007801D4, 4, 0x08000000, 0x1b, SKU_VERSION),
		};

		static struct msm_vidc_ubwc_config trinket_ubwc_data[] = {
		UBWC_CONFIG(sizeof(struct msm_vidc_ubwc_config_v1),
		HFI_PROPERTY_SYS_UBWC_CONFIG, 0, 1, 0, 0, 0, 64, 0, 0),
		@@ -789,8 +852,8 @@ static struct msm_vidc_platform_data atoll_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,
		.efuse_data = atoll_efuse_data,
		.efuse_data_length = ARRAY_SIZE(atoll_efuse_data),
		.heic_image_capability = &default_heic_image_capability,
		.hevc_image_capability = &default_hevc_image_capability,
		.sku_version = 0,
		@@ -1041,6 +1104,21 @@ void vidc_get_drv_data(struct device dev)
		driver_data->common_data_length =
		ARRAY_SIZE(sdmmagpie_common_data_v1);
		}
		} else if (!strcmp(match->compatible, "qcom,atoll-vidc")) {
		rc = msm_vidc_read_efuse(driver_data, dev);
		if (rc)
		goto exit;

		if (driver_data->sku_version == SKU_VERSION_1) {
		/* atoll SKU does not differentiate for any param in
		* devicetree.Keeping the same index for different SKU
		* so as to parse same DT node.
		*/
		driver_data->sku_version = 0;
		driver_data->common_data = atoll_common_data_v1;
		driver_data->common_data_length =
		ARRAY_SIZE(atoll_common_data_v1);
		}
		}

		exit: