diff --git a/bsp/drivers/drm/sunxi_drm_crtc.c b/bsp/drivers/drm/sunxi_drm_crtc.c
index a9c0562ae..ee9018929 100644
--- a/bsp/drivers/drm/sunxi_drm_crtc.c
+++ b/bsp/drivers/drm/sunxi_drm_crtc.c
@@ -480,6 +480,8 @@ int sunxi_fbdev_plane_update(struct fbdev_config *config)
 
 	plane = &fbdev_plane->plane;
 	if ((plane->state->fb || plane->state->crtc) && !config->force && dev->master) {
+		/* A DRM master owns display updates now; stop tracking this plane as fbdev output. */
+		scrtc_fbdev->fbdev_output = false;
 		WARN_ON(scrtc_fbdev->fbdev_output);
 		DRM_INFO("skip fbdev plane update because plane used by userspace\n");
 		if (lock)
diff --git a/bsp/drivers/net/wireless/rtl8852bs/os_dep/linux/rtw_cfg.c b/bsp/drivers/net/wireless/rtl8852bs/os_dep/linux/rtw_cfg.c
index c1a97d62f..9c3c6d866 100644
--- a/bsp/drivers/net/wireless/rtl8852bs/os_dep/linux/rtw_cfg.c
+++ b/bsp/drivers/net/wireless/rtl8852bs/os_dep/linux/rtw_cfg.c
@@ -860,7 +860,7 @@ MODULE_PARM_DESC(rtw_phy_file_path, "The path of phy parameter");
 * BIT9 - RF_TXPWR_LMT_6G_FILE		0: non-support, 1: support
 * BIT10 -RF_TXPWR_LMT_RU_6G_FILE	0: non-support, 1: support
 */
-int rtw_load_phy_file = ( BIT4 | BIT6 | BIT7 | BIT9 | BIT10);
+int rtw_load_phy_file = 0;
 module_param(rtw_load_phy_file, int, 0644);
 MODULE_PARM_DESC(rtw_load_phy_file, "PHY File Bit Map");
 int rtw_decrypt_phy_file = 0;