Merge "msm: vidc: Set preset registers after firmware reboot" (084dad50) · Commits · e / devices / android_kernel_sony_msm8994

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

+6 −7

Original line number	Diff line number	Diff line
		@@ -1331,6 +1331,12 @@ static inline int venus_hfi_power_on(struct venus_hfi_device *device)
		goto err_enable_clk;
		}

		/* Reboot the firmware */
		rc = venus_hfi_tzbsp_set_video_state(TZBSP_VIDEO_STATE_RESUME);
		if (rc) {
		dprintk(VIDC_ERR, "Failed to resume video core %d\n", rc);
		goto err_set_video_state;
		}

		/*
		* Re-program all of the registers that get reset as a result of
		@@ -1351,13 +1357,6 @@ static inline int venus_hfi_power_on(struct venus_hfi_device *device)
		venus_hfi_write_register(device, VIDC_MMAP_ADDR,
		(u32)device->qdss.align_device_addr);

		/* Reboot the firmware */
		rc = venus_hfi_tzbsp_set_video_state(TZBSP_VIDEO_STATE_RESUME);
		if (rc) {
		dprintk(VIDC_ERR, "Failed to resume video core %d\n", rc);
		goto err_set_video_state;
		}

		/* Wait for boot completion */
		rc = venus_hfi_reset_core(device);
		if (rc) {