Merge c121e47aadf43137a5fd59747e710d0a7540def0 on remote branch (3638174b) · Commits · e / devices / android_kernel_fairphone_FP5

msm/vidc/hfi_common.c

+27 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
		*/

		#include "hfi_common.h"
		@@ -1105,8 +1105,21 @@ static int __set_clk_rate(struct venus_hfi_device *device,
		struct clock_info *cl, u64 rate, u32 sid)
		{
		int rc = 0;
		u64 threshold_freq = device->res->clk_freq_threshold;
		struct cx_ipeak_client *ipeak = device->res->cx_ipeak_context;
		struct clk *clk = cl->clk;

		if (ipeak && device->clk_freq < threshold_freq && rate >= threshold_freq) {
		rc = cx_ipeak_update(ipeak, true);
		if (rc) {
		s_vpr_e(sid, "%s: cx_ipeak_update failed!\n", __func__);
		return rc;
		}
		s_vpr_p(sid,
		"cx_ipeak_update: up, clk freq = %lu rate = %lu threshold_freq = %lu\n",
		device->clk_freq, rate, threshold_freq);
		}

		rc = clk_set_rate(clk, rate);
		if (rc) {
		s_vpr_e(sid,
		@@ -1115,6 +1128,19 @@ static int __set_clk_rate(struct venus_hfi_device *device,
		return rc;
		}

		if (ipeak && device->clk_freq >= threshold_freq && rate < threshold_freq) {
		rc = cx_ipeak_update(ipeak, false);
		if (rc) {
		s_vpr_e(sid,
		"cx_ipeak_update failed! ipeak %pK\n", ipeak);
		device->clk_freq = rate;
		return rc;
		}
		s_vpr_p(sid,
		"cx_ipeak_update: up, clk freq = %lu rate = %lu threshold_freq = %lu\n",
		device->clk_freq, rate, threshold_freq);
		}

		device->clk_freq = rate;

		return rc;

msm/vidc/msm_venc.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -2150,6 +2150,7 @@ int msm_venc_store_timestamp(struct msm_vidc_inst *inst, u64 timestamp_us)
		int count = 0;
		int rc = 0;
		struct v4l2_ctrl *superframe_ctrl = NULL;
		struct v4l2_ctrl *ctrl = NULL;

		if (!inst \|\| !inst->core) {
		d_vpr_e("%s: invalid parameters\n", __func__);
		@@ -2160,6 +2161,12 @@ int msm_venc_store_timestamp(struct msm_vidc_inst *inst, u64 timestamp_us)
		is_image_session(inst))
		return rc;

		/* set auto-framerate only for VBR CFR native recorder */
		ctrl = get_ctrl(inst, V4L2_CID_MPEG_VIDC_VENC_NATIVE_RECORDER);
		if ((ctrl && ctrl->val == V4L2_MPEG_MSM_VIDC_DISABLE) \|\|
		(inst->rc_type != V4L2_MPEG_VIDEO_BITRATE_MODE_VBR))
		return rc;

		mutex_lock(&inst->timestamps.lock);
		list_for_each_entry(node, &inst->timestamps.list, list) {
		count++;

msm/vidc/msm_vidc_res_parse.c

+53 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,13 @@ static inline void msm_vidc_free_clock_table(
		res->clock_set.count = 0;
		}

		static inline void msm_vidc_free_cx_ipeak_context(
		struct msm_vidc_platform_resources *res)
		{
		cx_ipeak_unregister(res->cx_ipeak_context);
		res->cx_ipeak_context = NULL;
		}

		void msm_vidc_free_platform_resources(
		struct msm_vidc_platform_resources *res)
		{
		@@ -125,6 +132,7 @@ void msm_vidc_free_platform_resources(
		msm_vidc_free_qdss_addr_table(res);
		msm_vidc_free_bus_table(res);
		msm_vidc_free_buffer_usage_table(res);
		msm_vidc_free_cx_ipeak_context(res);
		}

		static int msm_vidc_load_fw_name(struct msm_vidc_platform_resources *res)
		@@ -828,6 +836,44 @@ int read_platform_resources_from_drv_data(

		}

		static int msm_vidc_populate_cx_ipeak_context(
		struct msm_vidc_platform_resources *res)
		{
		struct platform_device *pdev = res->pdev;
		int rc = 0;

		if (of_find_property(pdev->dev.of_node,
		"qcom,cx-ipeak-data", NULL))
		res->cx_ipeak_context = cx_ipeak_register(
		pdev->dev.of_node, "qcom,cx-ipeak-data");
		else
		return rc;

		if (IS_ERR(res->cx_ipeak_context)) {
		rc = PTR_ERR(res->cx_ipeak_context);
		if (rc == -EPROBE_DEFER)
		d_vpr_h("cx-ipeak register failed. Deferring probe!");
		else
		d_vpr_e("cx-ipeak register failed. rc: %d", rc);

		res->cx_ipeak_context = NULL;
		return rc;
		}

		if (res->cx_ipeak_context)
		d_vpr_h("cx-ipeak register successful");
		else
		d_vpr_h("cx-ipeak register not implemented");

		of_property_read_u32(pdev->dev.of_node,
		"qcom,clock-freq-threshold",
		&res->clk_freq_threshold);
		d_vpr_h("cx ipeak threshold frequency = %u\n",
		res->clk_freq_threshold);

		return rc;
		}

		int read_platform_resources_from_dt(
		struct msm_vidc_platform_resources *res)
		{
		@@ -913,9 +959,16 @@ int read_platform_resources_from_dt(
		goto err_setup_legacy_cb;
		}

		rc = msm_vidc_populate_cx_ipeak_context(res);
		if (rc) {
		d_vpr_e("Failed to setup cx-ipeak %d\n", rc);
		goto err_register_cx_ipeak;
		}

		return rc;

		err_register_cx_ipeak:
		msm_vidc_free_cx_ipeak_context(res);
		err_setup_legacy_cb:
		err_load_reset_table:
		msm_vidc_free_allowed_clocks_table(res);

msm/vidc/msm_vidc_resources.h

+2 −1

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.
		*/

		#ifndef __MSM_VIDC_RESOURCES_H__
		@@ -9,6 +9,7 @@
		#include <linux/platform_device.h>
		#include "msm_vidc.h"
		#include <linux/soc/qcom/llcc-qcom.h>
		#include <soc/qcom/cx_ipeak.h>

		#define MAX_BUFFER_TYPES 32