Просмотр исходного кода

Merge "msm: camera: isp: Enable sys cache usage" into camera-kernel.lnx.5.0

Haritha Chintalapati 4 лет назад
Родитель
Сommit
3d62e633cc

+ 2 - 1
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

@@ -7228,7 +7228,8 @@ static int cam_isp_blob_sfe_exp_order_update(
 			}
 		}
 		CAM_DBG(CAM_ISP,
-			"cache config based on exp order: %u [max: %u] for out: 0x%x",
+			"cache %s on exp order: %u [max: %u] for out: 0x%x",
+			(wm_rm_cache_cfg.use_cache ? "enabled" : "not enabled"),
 			i, exp_order_max, order_cfg->res_type);
 	}
 

+ 0 - 3
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus_rd.c

@@ -1602,9 +1602,6 @@ int cam_sfe_bus_rd_init(
 	*sfe_bus = sfe_bus_local;
 	bus_priv->common_data.sfe_debug_cfg = 0;
 
-	/* Remove after sys cache verification */
-	bus_priv->common_data.cache_dbg_cfg.disable_all = true;
-
 	return rc;
 
 deinit_sfe_bus_rd:

+ 0 - 3
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus_wr.c

@@ -2926,9 +2926,6 @@ int cam_sfe_bus_wr_init(
 	bus_priv->common_data.sfe_debug_cfg = 0;
 	*sfe_bus = sfe_bus_local;
 
-	/* Remove after sys cache verification */
-	bus_priv->common_data.cache_dbg_cfg.disable_all = true;
-
 	CAM_DBG(CAM_SFE, "Exit");
 	return rc;