Import video-driver changes

Removing video_mvs0_reset makes the video driver probe, as that reset
doesn't exist in our OF devicetrees.

Change-Id: I194cccc5d6362abe800445bf40891905b3805f7a

qcom/opensource/camera-kernel/Android.mk

@@ -13,11 +13,14 @@ LOCAL_PATH := $(call my-dir)
 # Path to DLKM make scripts
 DLKM_DIR := $(TOP)/device/qcom/common/dlkm
 
-LOCAL_MODULE_DDK_BUILD := true
+#LOCAL_MODULE_DDK_BUILD := true
 
 LOCAL_MODULE_DDK_SUBTARGET_REGEX := "camera.*"
 ifeq ($(TARGET_BOARD_PLATFORM), volcano)
   LOCAL_MODULE_DDK_SUBTARGET_REGEX := "$(TARGET_BOARD_PLATFORM)_camera.*"
+
+ifneq ($(PROJECT_NAME),)
+LOCAL_MODULE_DDK_EXTRA_ARGS := "--//vendor/qcom/opensource/camera-kernel:project_name=$(PROJECT_NAME)"
 endif
 
 # List of board platforms for which MMRM driver API should be enabled

qcom/opensource/video-driver/driver/platform/pineapple/src/msm_vidc_pineapple.c

@@ -2716,7 +2716,6 @@ static const struct clk_rst_table pineapple_clk_reset_table[] = {
 	{ "video_axi_reset",        0  },
 	{ "video_xo_reset",         1  },
 	{ "video_mvs0c_reset",      0  },
-	{ "video_mvs0_reset",       0  },
 };
 
 /* name, llcc_id */

qcom/opensource/video-driver/driver/variant/iris33/src/msm_vidc_iris33.c

@@ -516,11 +516,6 @@ static int __power_off_iris33_controller(struct msm_vidc_core *core)
 	rc = call_res_op(core, reset_control_assert, core, "video_axi_reset");
 	if (rc)
 		d_vpr_e("%s: assert video_axi_reset failed\n", __func__);
-
-	rc = call_res_op(core, reset_control_assert, core, "video_mvs0_reset");
-	if (rc)
-		d_vpr_e("%s: assert video_mvs0_reset failed\n", __func__);
-
 	/* set retain mem and peripheral before asset mvs0c reset */
 	rc = call_res_op(core, clk_set_flag, core,
 		"video_cc_mvs0c_clk", MSM_VIDC_CLKFLAG_RETAIN_MEM);
@@ -534,9 +529,6 @@ static int __power_off_iris33_controller(struct msm_vidc_core *core)
 	if (rc)
 		d_vpr_e("%s: assert video_mvs0c_reset failed\n", __func__);
 	usleep_range(400, 500);
-	rc = call_res_op(core, reset_control_deassert, core, "video_mvs0_reset");
-	if (rc)
-		d_vpr_e("%s: de-assert video_mvs0_reset failed\n", __func__);
 	rc = call_res_op(core, reset_control_deassert, core, "video_axi_reset");
 	if (rc)
 		d_vpr_e("%s: de-assert video_axi_reset failed\n", __func__);

qcom/opensource/video-driver/driver/vidc/src/msm_vidc_driver.c

@@ -25,6 +25,10 @@
 #include "hfi_packet.h"
 #include "msm_vidc_events.h"
 
+#if IS_ENABLED(CONFIG_SEC_ABC)
+#include <linux/sti/abc_common.h>
+#endif
+
 extern struct msm_vidc_core *g_core;
 
 #define is_odd(val) ((val) % 2 == 1)
@@ -3844,6 +3848,9 @@ int msm_vidc_core_init(struct msm_vidc_core *core)
 	if (rc) {
 		msm_vidc_change_core_state(core, MSM_VIDC_CORE_ERROR, __func__);
 		d_vpr_e("%s: core init failed\n", __func__);
+#if IS_ENABLED(CONFIG_SEC_ABC)
+		sec_abc_send_event("MODULE=mm@WARN=venus_fw_load_fail");
+#endif
 		/* do core deinit to handle error */
 		msm_vidc_core_deinit_locked(core, true);
 		goto unlock;

qcom/opensource/video-driver/driver/vidc/src/venus_hfi_response.c

@@ -16,6 +16,10 @@
 #include "msm_vidc_fence.h"
 #include "msm_vidc_platform.h"
 
+#if IS_ENABLED(CONFIG_SEC_ABC) //for SM8650 H/W AP defect issue screening - vidc_system_error_0x5000002 / vidc_system_error_0x5000003
+#include <linux/sti/abc_common.h>
+#endif
+
 #define in_range(range, val) (((range.begin) < (val)) && ((range.end) > (val)))
 
 extern struct msm_vidc_core *g_core;
@@ -1894,6 +1898,16 @@ static int handle_system_response(struct msm_vidc_core *core,
 			if (packet->flags & HFI_FW_FLAGS_SYSTEM_ERROR) {
 				d_vpr_e("%s: received system error %#x\n",
 					__func__, packet->type);
+#if IS_ENABLED(CONFIG_SEC_ABC)
+				if (packet->type == 0x5000003) {
+					sec_abc_send_event("MODULE=mm@INFO=vidc_sys_err_type3");
+				    d_vpr_e("%s: ABC report vidc_sys_err_type3(0x5000003)\n", __func__);
+				}
+				else if (packet->type == 0x5000002) {
+					sec_abc_send_event("MODULE=mm@INFO=vidc_sys_err_type2");
+				    d_vpr_e("%s: ABC report vidc_sys_err_type2(0x5000002)\n", __func__);
+				}
+#endif
 				rc = handle_system_error(core, packet);
 				if (rc)
 					goto exit;