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

Commit c85df5a8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Always de-assert and assert video_core_clk"

parents 977524ec 962b9a3a

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

+21 −23
Original line number Diff line number Diff line
@@ -4165,12 +4165,11 @@ static int __core_clk_reset(struct venus_hfi_device *device, 
	if (!rinfo)

		return -EINVAL;



	if (regulator_is_enabled(rinfo->regulator)) {

	/*

	 * This is a workaround for msm8996 V2, because MDP enables

	 * Venus GDSC. Due to MDP's vote on Venus GDSC, some of Venus

	 * registers are not cleared after firmware is unloaded. This

		 * causes subsequent video sessions to fail. By reseting

	 * causes subsequent video sessions to fail. By resetting

	 * core_clk we are forcing a hard reset and ensure each

	 * firmware load starts on a clean slate.

	 */
@@ -4189,7 +4188,6 @@ static int __core_clk_reset(struct venus_hfi_device *device, 
		return -EINVAL;

	}

	udelay(1);

	}

	return rc;

}