Merge "msm: vidc: alter log printing sequence" (adbb6b96) · Commits · e / devices / android_kernel_oneplus_sm7250

msm/vidc/msm_vidc_clocks.c

+6 −3

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

		#include "msm_vidc_common.h"
		@@ -1698,9 +1698,9 @@ int msm_vidc_decide_core_and_power_mode_iris2(struct msm_vidc_inst *inst)
		{
		u32 mbpf, mbps, max_hq_mbpf, max_hq_mbps;
		bool enable = true;
		int rc = 0;

		inst->clk_data.core_id = VIDC_CORE_ID_1;
		msm_print_core_status(inst->core, VIDC_CORE_ID_1, inst->sid);

		/* Power saving always disabled for CQ and LOSSLESS RC modes. */
		mbpf = msm_vidc_get_mbs_per_frame(inst);
		@@ -1714,7 +1714,10 @@ int msm_vidc_decide_core_and_power_mode_iris2(struct msm_vidc_inst *inst)
		(mbpf <= max_hq_mbpf && mbps <= max_hq_mbps))
		enable = false;

		return msm_vidc_power_save_mode_enable(inst, enable);
		rc = msm_vidc_power_save_mode_enable(inst, enable);
		msm_print_core_status(inst->core, VIDC_CORE_ID_1, inst->sid);

		return rc;
		}

		void msm_vidc_init_core_clk_ops(struct msm_vidc_core *core)