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

Commit 03edb084 authored by Praneeth Paladugu's avatar Praneeth Paladugu
Browse files

msm: vidc: Update video clock flags 



Set CLKFLAG_RETAIN flags during every clock prepare. Also
Set CLKFLAG_NORETAIN flags during unprepare to make flag
operations symmetric.

CRs-Fixed: 2035342
Change-Id: I072985743d8ee0d5f62b25b3be3f80caf29cda17
Signed-off-by: default avatarPraneeth Paladugu <ppaladug@codeaurora.org>
parent fd8f40e6

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

+22 −13
Original line number Diff line number Diff line
@@ -3425,6 +3425,7 @@ static inline int __init_clocks(struct venus_hfi_device *device) 
static inline void __disable_unprepare_clks(struct venus_hfi_device *device)

{

	struct clock_info *cl;

	int rc = 0;



	if (!device) {

		dprintk(VIDC_ERR, "Invalid params: %pK\n", device);
@@ -3434,6 +3435,18 @@ static inline void __disable_unprepare_clks(struct venus_hfi_device *device) 
	venus_hfi_for_each_clock_reverse(device, cl) {

		dprintk(VIDC_DBG, "Clock: %s disable and unprepare\n",

				cl->name);

		rc = clk_set_flags(cl->clk, CLKFLAG_NORETAIN_PERIPH);

		if (rc) {

			dprintk(VIDC_WARN,

				"Failed set flag NORETAIN_PERIPH %s\n",

					cl->name);

		}

		rc = clk_set_flags(cl->clk, CLKFLAG_NORETAIN_MEM);

		if (rc) {

			dprintk(VIDC_WARN,

				"Failed set flag NORETAIN_MEM %s\n",

					cl->name);

		}

		clk_disable_unprepare(cl->clk);

	}

}
@@ -3457,22 +3470,18 @@ static inline int __prepare_enable_clks(struct venus_hfi_device *device) 
		if (cl->has_scaling)

			clk_set_rate(cl->clk, clk_round_rate(cl->clk, 0));



		if (cl->has_mem_retention) {

			rc = clk_set_flags(cl->clk, CLKFLAG_NORETAIN_PERIPH);

		rc = clk_set_flags(cl->clk, CLKFLAG_RETAIN_PERIPH);

		if (rc) {

			dprintk(VIDC_WARN,

					"Failed set flag NORETAIN_PERIPH %s\n",

				"Failed set flag RETAIN_PERIPH %s\n",

					cl->name);

		}



			rc = clk_set_flags(cl->clk, CLKFLAG_NORETAIN_MEM);

		rc = clk_set_flags(cl->clk, CLKFLAG_RETAIN_MEM);

		if (rc) {

			dprintk(VIDC_WARN,

					"Failed set flag NORETAIN_MEM %s\n",

				"Failed set flag RETAIN_MEM %s\n",

					cl->name);

		}

		}



		rc = clk_prepare_enable(cl->clk);

		if (rc) {

			dprintk(VIDC_ERR, "Failed to enable clocks\n");