Merge "msm: cvp: Enable dsp power collapse for Kona" (2fe82766) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/platform/msm/cvp/cvp_hfi.c

+9 −11

Original line number	Diff line number	Diff line
		@@ -2191,7 +2191,7 @@ static int venus_hfi_core_release(void *dev)

		__resume(device);
		__set_state(device, VENUS_STATE_DEINIT);
		if (0)

		__dsp_shutdown(device, 0);

		__unload_fw(device);
		@@ -2919,14 +2919,12 @@ static int __power_collapse(struct venus_hfi_device *device, bool force)
		goto exit;
		}

		if (0) {
		rc = __core_in_valid_state(device);
		if (!rc) {
		dprintk(CVP_WARN,
		"Core is in bad state, Skipping power collapse\n");
		return -EINVAL;
		}
		}

		rc = __dsp_suspend(device, force, flags);
		if (rc == -EBUSY)
		@@ -4607,7 +4605,7 @@ static inline int __resume(struct venus_hfi_device *device)
		__enable_subcaches(device);
		__set_subcaches(device);

		if (0)

		__dsp_resume(device, flags);

		dprintk(CVP_PROF, "Resumed from power collapse\n");

+1 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ static struct msm_cvp_common_data sm8250_common_data[] = {
		},
		{
		.key = "qcom,power-collapse-delay",
		.value = 30000,
		.value = 1500,
		},
		{
		.key = "qcom,hw-resp-timeout",