BPI/pi-linux
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "drm: sunxi: log only HDMI state changes"

Browse Source 
This reverts commit 7fcd7b732ec3e9aa7935eaf69a0ee8e43048c8e6.
This commit is contained in:
Qubot 2026-06-06 11:14:48 +08:00
parent 02c48b6f7f
commit 3a1667dda6
6 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bsp/drivers/drm/sunxi_device/hardware/lowlevel_hdmi20/phy_snps.c
View File

@ -684,10 +684,10 @@ clk_cfg:
dw_phy_write(snps_phy->mpll_reg2, table[i].mpll[index].data2);
dw_phy_write(snps_phy->mpll_reg3, table[i].mpll[index].data3);
hdmi_trace("[snps phy]\n");
hdmi_trace(" - refer clock: %dKHz, color bits: %d, repeat: %d\n",
hdmi_inf("[snps phy]\n");
hdmi_inf(" - refer clock: %dKHz, color bits: %d, repeat: %d\n",
ref_clk, hdmi->color_bits, hdmi->pixel_repeat);
hdmi_trace(" - mpll: 0x%04x, 0x%04x, 0x%04x\n",
hdmi_inf(" - mpll: 0x%04x, 0x%04x, 0x%04x\n",
table[i].mpll[index].data1,
table[i].mpll[index].data2,
table[i].mpll[index].data3);
@ -713,9 +713,9 @@ static int _snps_phy_cfg_drive(void)
continue;
}
hdmi_trace(" - refer clock: %dKHz. [%dKHz~%dKHz]\n",
hdmi_inf(" - refer clock: %dKHz. [%dKHz~%dKHz]\n",
clock, table[i].min_clk, table[i].max_clk);
hdmi_trace(" - drive: 0x%04x, 0x%04x, 0x%04x\n",
hdmi_inf(" - drive: 0x%04x, 0x%04x, 0x%04x\n",
table[i].drive_data1,
table[i].drive_data2,
table[i].drive_data3);
@ -763,7 +763,7 @@ int snps_phy_config(void)
dw_phy_set_power(DW_HDMI_ENABLE);
ret = dw_phy_wait_lock();
hdmi_trace("snps phy state: %s\n", ret == 1 ? "lock" : "unlock");
hdmi_inf("snps phy state: %s\n", ret == 1 ? "lock" : "unlock");
if (ret == 1)
return 0;

8
bsp/drivers/drm/sunxi_device/hardware/lowlevel_hdmi20/phy_top.c
View File

@ -354,9 +354,9 @@ cfg_pll:
/* enable lock check */
phy_reg->reg_0020.sun60i.lock_enable = 0x1;
hdmi_trace("[top phy]\n");
hdmi_trace(" - pixel clock %dKHz\n", clock);
hdmi_trace(" - pll: 0x%08X, 0x%08X, 0x%08X, 0x%08X\n",
hdmi_inf("[top phy]\n");
hdmi_inf(" - pixel clock %dKHz\n", clock);
hdmi_inf(" - pll: 0x%08X, 0x%08X, 0x%08X, 0x%08X\n",
pll_cfg.pll_value, pll_cfg.ldo_value, pll_cfg.pll_patern0, pll_cfg.pll_patern1);
/* wait top phy pll lock */
@ -369,7 +369,7 @@ cfg_pll:
udelay(20);
top_phy_pll_set_output(0x1);
hdmi_trace("top phy config done\n");
hdmi_inf("top phy config done\n");
return 0;
}

12
bsp/drivers/drm/sunxi_device/sunxi_hdmi.c
View File

@ -217,11 +217,11 @@ int sunxi_hdmi_edid_parse(u8 *buffer)
hdmi_err("hdmi edid parse block0 failed\n");
return -1;
}
hdmi_trace("sunxi hdmi edid parse block0 finish\n");
hdmi_inf("sunxi hdmi edid parse block0 finish\n");
edid_ext_cnt = temp_edid[126];
if (edid_ext_cnt == 0x0) {
hdmi_trace("hdmi edid only has block0 and parse finish\n");
hdmi_inf("hdmi edid only has block0 and parse finish\n");
return 0;
}
@ -232,7 +232,7 @@ int sunxi_hdmi_edid_parse(u8 *buffer)
hdmi_err("hdmi edid parse block%d failed\n", i + 1);
continue;
}
hdmi_trace("sunxi hdmi edid parse block%d finish\n", i + 1);
hdmi_inf("sunxi hdmi edid parse block%d finish\n", i + 1);
}
return 0;
@ -799,7 +799,7 @@ void sunxi_hdmi_select_output_packets(u8 flags)
if ((flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING) {
dw_video_set_vic_format(DW_VIDEO_FORMAT_3D, dtd_code);
dw_video_use_hdmi14_vsif(DW_VIDEO_FORMAT_3D, 0x0);
hdmi_trace("sunxi hdmi select vic %d 3d format struct\n", dtd_code);
hdmi_inf("sunxi hdmi select vic %d 3d format struct\n", dtd_code);
return;
}
@ -807,7 +807,7 @@ void sunxi_hdmi_select_output_packets(u8 flags)
if (hdmi_vic > 0) {
dw_video_set_vic_format(DW_VIDEO_FORMAT_HDMI14_4K, hdmi_vic);
dw_video_use_hdmi14_vsif(DW_VIDEO_FORMAT_HDMI14_4K, hdmi_vic);
hdmi_trace("sunxi hdmi select vic %d to hdmi vic %d\n", dtd_code, hdmi_vic);
hdmi_inf("sunxi hdmi select vic %d to hdmi vic %d\n", dtd_code, hdmi_vic);
return;
}
@ -819,7 +819,7 @@ void sunxi_hdmi_select_output_packets(u8 flags)
else
dw_video_use_hdmi14_vsif(DW_VIDEO_FORMAT_NONE, 0x0);
hdmi_trace("sunxi hdmi select vic %d use %s vsif\n",
hdmi_inf("sunxi hdmi select vic %d use %s vsif\n",
dtd_code, ret ? "hdmi20" : "hdmi14");
}

2
bsp/drivers/drm/sunxi_device/sunxi_tcon.c
View File

@ -521,7 +521,7 @@ _sunxi_tcon_hdmi_set_rate(struct sunxi_tcon *hwtcon, unsigned long pclk)
clk_set_rate(hwtcon->mclk, pclk);
rate_diff = (pclk - clk_round_rate(hwtcon->mclk, pclk));
if (rate_diff != 0)
DRM_DEBUG_DRIVER("sunxi tcon hdmi set rate: %ldHz and get diff: %ldHz\n",
DRM_WARN("suxni tcon hdmi set rate: %ldHz and get diff: %ldHz\n",
pclk, rate_diff);
if (!IS_ERR_OR_NULL(hwtcon->mclk_bus))

6
bsp/drivers/drm/sunxi_drm_drv.c
View File

@ -574,7 +574,7 @@ static int sunxi_drm_offline_mode_pre_init(struct drm_device *drm)
c = list_first_entry_or_null(&pri->priv->connecting_head, struct sunxi_init_connecting, list);
if (!c) {
DRM_DEBUG_DRIVER("offline mode: init connecting not found %s\n", __func__);
DRM_ERROR("offline mode: init connecting not found %s\n", __func__);
return -1;
}
scn_w = c->mode->hdisplay;
@ -855,7 +855,7 @@ static int init_connecting(struct drm_device *drm, struct drm_crtc **crtcs, unsi
c->mode = mode;
list_add_tail(&c->list, &pri->priv->connecting_head);
} else
DRM_DEBUG_DRIVER("none mode found %s\n", __func__);
DRM_ERROR("none mode found %s\n", __func__);
mutex_unlock(&drm->mode_config.mutex);
}
return 0;
@ -879,7 +879,7 @@ int sunxi_drm_get_logo_info(struct drm_device *dev, struct sunxi_logo_info *logo
c = list_first_entry_or_null(&pri->priv->connecting_head, struct sunxi_init_connecting, list);
if (!c) {
DRM_DEBUG_DRIVER("init connecting not found %s\n", __func__);
DRM_ERROR("init connecting not found %s\n", __func__);
return -1;
}
*scn_w = c->mode->hdisplay;

9
bsp/drivers/drm/sunxi_drm_hdmi.c
View File

@ -142,7 +142,6 @@ struct sunxi_hdmi_ctrl_s {
int drv_clock;
int drv_enable;
int drv_hpd_state;
int drv_last_hpd_state;
int drv_hpd_mask;
int drv_boot_enable;
int drv_sw_enable;
@ -2710,7 +2709,7 @@ static int _sunxi_drm_hdmi_get_modes(struct drm_connector *connector)
ret = drm_edid_connector_add_modes(connector);
#endif
hdmi_trace("drm get edid support modes: %d\n", ret);
hdmi_inf("drm get edid support modes: %d\n", ret);
return ret;
use_default:
@ -2774,10 +2773,7 @@ _sunxi_drm_hdmi_detect(struct drm_connector *connector, bool force)
}
ret = _sunxi_drv_hdmi_hpd_get(hdmi);
if (hdmi->hdmi_ctrl.drv_last_hpd_state != ret) {
hdmi->hdmi_ctrl.drv_last_hpd_state = ret;
hdmi_inf("HDMI-A-1 %s\n", ret ? "connected" : "disconnected");
}
hdmi_inf("drm hdmi detect: %s\n", ret ? "connect" : "disconnect");
return ret == 1 ? connector_status_connected : connector_status_disconnected;
}
@ -3481,7 +3477,6 @@ static int sunxi_hdmi_bind(struct device *dev, struct device *master, void *data
hdmi->dev = dev;
hdmi->sdrm.drm_dev = drm;
hdmi->sdrm.hw_id = 0;
hdmi->hdmi_ctrl.drv_last_hpd_state = -1;
ret = _sunxi_hdmi_init_get_tcon(dev);
if (ret != 0) {