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

Revert "arm64: sun60i: stabilize HDMI 1080p and auto audio negotiation"

Browse Source 
This reverts commit e839ccfe1e563f782e1c7674676b7befd11b0582.
This commit is contained in:
Qubot 2026-05-31 22:37:32 +08:00
parent e839ccfe1e
commit 57fd4dd297
4 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/sunxi/sun60i-a733-bananapi-m8.dts
View File

@ -1795,8 +1795,8 @@
hdmi_ddc_index = <20>;
priority = <6>;
force-output = <1>;
force-output-timing = "148500-1920-2008-2052-2200-1080-1084-1089-1125";
force-output = <0>;
force-output-timing = "440000-3440-3450-4500-4800-1440-1455-1464-1494";
snps_phy = <
25000 185625 0x0007 0x8160 0x8188

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

@ -811,12 +811,6 @@ int dw_audio_on(void)
struct dw_hdmi_dev_s *hdmi = dw_get_hdmi();
struct dw_audio_s *audio = &hdmi->audio_dev;
if (!dw_sink_support_audio()) {
hdmi_inf("sink does not advertise audio, skip audio enable\n");
hdmi->audio_on = 0;
return 0;
}
_dw_audio_param_print(audio);
ret = dw_hdmi_ctrl_update();
@ -832,7 +826,7 @@ int dw_audio_on(void)
}
if (_dw_audio_check_params() == false) {
hdmi_wrn("dw audio check params is invalid, skip audio path\n");
hdmi_err("dw audio check params is invalid!\n");
goto exit;
}

19
bsp/drivers/drm/sunxi_device/hardware/lowlevel_hdmi20/dw_edid.c
View File

@ -981,25 +981,6 @@ bool dw_sink_support_scdc(void)
return sink->edid_mHdmiForumvsdb.mSCDC_Present;
}
int dw_sink_support_audio(void)
{
struct sink_info_s *sink = dw_get_sink();
if (IS_ERR_OR_NULL(sink)) {
shdmi_err(sink);
return 0;
}
/*
* Prefer CTA basic-audio bit, and fallback to SAD entries for sinks
* that only expose detailed audio descriptors.
*/
if (sink->edid_mBasicAudioSupport || sink->edid_mSadIndex > 0)
return 1;
return 0;
}
int dw_sink_support_only_yuv420(u32 vic)
{
struct sink_info_s *sink = dw_get_sink();

2
bsp/drivers/drm/sunxi_device/hardware/lowlevel_hdmi20/dw_edid.h
View File

@ -51,8 +51,6 @@ int dw_sink_support_cea_vic(u32 code);
bool dw_sink_support_scdc(void);
int dw_sink_support_audio(void);
int dw_edid_exit(void);
int dw_edid_init(void);