qcacld-3.0: Keep STA-SAP-P2P for non DBS

Change-Id: I3ac70117f0ff645e2a2add4bdb1f5a938ef73dd7

qcom/opensource/display-drivers/msm/dsi/dsi_display.c

@@ -1475,10 +1475,17 @@ int dsi_display_set_power(struct drm_connector *connector,
 		rc = dsi_panel_set_lp2(display->panel);
 		break;
 	case SDE_MODE_DPMS_ON:
-		display->panel->mi_cfg.bl_enable = true;
 		if ((display->panel->power_mode == SDE_MODE_DPMS_LP1) ||
 			(display->panel->power_mode == SDE_MODE_DPMS_LP2)) {
 			rc = dsi_panel_set_nolp(display->panel);
+			/* Without mi layer additions, we don't know when we leave aod,
+			   so restore brightness on power on */
+			dsi_panel_acquire_panel_lock(display->panel);
+			display->panel->mi_cfg.bl_enable = true;
+			dsi_panel_update_backlight(
+				display->panel,
+				display->panel->mi_cfg.last_bl_level);
+			dsi_panel_release_panel_lock(display->panel);
 			if (mi_get_panel_id(display->panel->mi_cfg.mi_panel_id) == N16_PANEL_PC ||
 				mi_get_panel_id(display->panel->mi_cfg.mi_panel_id) == N16_PANEL_PB)
 				mi_dsi_panel_set_flat_mode(display->panel, false);

qcom/opensource/wlan/qcacld-3.0/core/hdd/src/wlan_hdd_cfg80211.c

@@ -19516,7 +19516,8 @@ static void wlan_hdd_update_iface_combination(struct hdd_context *hdd_ctx,
 
 	for (i = 0; i < num; i++) {
 		/* Filter for non-DBS targets */
-		if (!ucfg_policy_mgr_is_fw_supports_dbs(psoc) &&
+		if (!sta_sap_p2p_concurrency &&
+		    !ucfg_policy_mgr_is_fw_supports_dbs(psoc) &&
 		    wlan_hdd_iface_combination[i].max_interfaces > 2)
 			continue;