DRM: Bridge: DW_HDMI: Add new features and bug fix
Subsystems (6)
cover DRM: Bridge: DW_HDMI: Add new features and bug fix
From: Sandor Yu <[email protected]>
It is new features and bug fix patch set for DW_HDMI DRM bridge driver that has verified by NXP iMX865.
Three new feature added:
1. Add GP Audio interface for DW_HDMI.
2. Add CEC PM functions to restore CEC status when device suspend/resume
3. New API for reset PHY Gen1.
Two bugs fixed:
1. Enable overflow workaround for v2.13a.
2. Clear GPC_Auto bit for 24bit bpp to pass CTS.
Sandor Yu (5):
drm: bridge: dw_hdmi: cec: Add cec suspend/resume function
drm: bridge: dw_hdmi: enable overflow workaround for v2.13a
drm: bridge: dw_hdmi: Enable GCP only for Deep Color
drm: bridge: dw_hdmi: add reset function for PHY GEN1
drm: bridge: dw_hdmi: Audio: Add General Parallel Audio (GPA) driver
drivers/gpu/drm/bridge/synopsys/Kconfig | 11 + drivers/gpu/drm/bridge/synopsys/Makefile | 1 + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 35 +++ .../drm/bridge/synopsys/dw-hdmi-gp-audio.c | 199 ++++++++++++++++++ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 157 +++++++++++++- drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 13 +- drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 2 +- include/drm/bridge/dw_hdmi.h | 9 +- 8 files changed, 416 insertions(+), 11 deletions(-) create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c
Signature · 1 line
2.25.1
PATCH 1/5 drm: bridge: dw_hdmi: cec: Add cec suspend/resume function
From: Sandor Yu <[email protected]>
CEC interrupt status/mask and logical address registers will be reset when device enter suspend.
It will cause cec fail to work after device resume. Add CEC suspend/resume functions, save these registers status when suspend and restore them when resume.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+)
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +35 -0
@@ -18,6 +18,8 @@#include "dw-hdmi-cec.h" +static u8 cec_saved_regs[5 ]; +enum {HDMI_IH_CEC_STAT0 =0x0106 ,HDMI_IH_MUTE_CEC_STAT0 =0x0186 ,
@@ -306,11 +308,44 @@ static int dw_hdmi_cec_remove(struct platform_device *pdev)return 0 ; } +static int __maybe_unused dw_hdmi_cec_resume (struct device *dev) +{ +struct dw_hdmi_cec *cec =dev_get_drvdata (dev); + +/* Restore logical address and interrupt status/mask register */ +dw_hdmi_write (cec, cec_saved_regs[0 ],HDMI_CEC_ADDR_L ); +dw_hdmi_write (cec, cec_saved_regs[1 ],HDMI_CEC_ADDR_H ); +dw_hdmi_write (cec, cec_saved_regs[2 ],HDMI_CEC_POLARITY ); +dw_hdmi_write (cec, cec_saved_regs[3 ],HDMI_CEC_MASK ); +dw_hdmi_write (cec, cec_saved_regs[4 ],HDMI_IH_MUTE_CEC_STAT0 ); + +return 0 ; +} + +static int __maybe_unused dw_hdmi_cec_suspend (struct device *dev) +{ +struct dw_hdmi_cec *cec =dev_get_drvdata (dev); + +/* store logical address and interrupt status/mask register */ + cec_saved_regs[0 ] =dw_hdmi_read (cec,HDMI_CEC_ADDR_L ); + cec_saved_regs[1 ] =dw_hdmi_read (cec,HDMI_CEC_ADDR_H ); + cec_saved_regs[2 ] =dw_hdmi_read (cec,HDMI_CEC_POLARITY ); + cec_saved_regs[3 ] =dw_hdmi_read (cec,HDMI_CEC_MASK ); + cec_saved_regs[4 ] =dw_hdmi_read (cec,HDMI_IH_MUTE_CEC_STAT0 ); + +return 0 ; +} + +static const struct dev_pm_ops dw_hdmi_cec_pm = { +SET_SYSTEM_SLEEP_PM_OPS (dw_hdmi_cec_suspend, dw_hdmi_cec_resume) +}; +static struct platform_driver dw_hdmi_cec_driver = { .probe = dw_hdmi_cec_probe, .remove = dw_hdmi_cec_remove, .driver = { .name ="dw-hdmi-cec" , + .pm = &dw_hdmi_cec_pm, }, };module_platform_driver (dw_hdmi_cec_driver);
Signature · 1 line
2.25.1
Re: [PATCH v1 1/5] drm: bridge: dw_hdmi: cec: Add cec suspend/resume function
Hi Sandor,
Quoted 18 lines · On 06/04/2022 10:48, [email protected] wrote:
From: Sandor Yu <[email protected]>
CEC interrupt status/mask and logical address registers will be reset when device enter suspend.
It will cause cec fail to work after device resume. Add CEC suspend/resume functions, save these registers status when suspend and restore them when resume.Signed-off-by Sandor Yu <[email protected]>--- drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+)drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +0
-0
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c line 21
Quoted 4 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +1
-0@@ -18,6 +18,8 @@#include "dw-hdmi-cec.h" +static u8 cec_saved_regs[5 ];
Ewww, not a global. Just save it in struct dw_hdmi_cec.
Quoted 5 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +1
-0+enum {HDMI_IH_CEC_STAT0 =0x0106 ,HDMI_IH_MUTE_CEC_STAT0 =0x0186 ,
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c static int dw_hdmi_cec_remove(struct platform_device *pdev) · line 317
Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +7
-0@@ -306,11 +308,44 @@ static int dw_hdmi_cec_remove(struct platform_device *pdev)return 0 ; } +static int __maybe_unused dw_hdmi_cec_resume (struct device *dev) +{ +struct dw_hdmi_cec *cec =dev_get_drvdata (dev); + +/* Restore logical address and interrupt status/mask register */ +dw_hdmi_write (cec, cec_saved_regs[0 ],HDMI_CEC_ADDR_L ); +dw_hdmi_write (cec, cec_saved_regs[1 ],HDMI_CEC_ADDR_H );
No need to store HDMI_CEC_ADDR_L/R, just use cec->addresses.
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c static int dw_hdmi_cec_remove(struct platform_device *pdev) · line 320
Quoted 3 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +3
-0+dw_hdmi_write (cec, cec_saved_regs[2 ],HDMI_CEC_POLARITY ); +dw_hdmi_write (cec, cec_saved_regs[3 ],HDMI_CEC_MASK ); +dw_hdmi_write (cec, cec_saved_regs[4 ],HDMI_IH_MUTE_CEC_STAT0 );
This doesn't call cec->ops->disable/enable. It might be better to just call dw_hdmi_cec_enable() and store the enable state in struct dw_hdmi_cec.
Regards,
Hans
Quoted 31 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +23
-0+ +return 0 ; +} + +static int __maybe_unused dw_hdmi_cec_suspend (struct device *dev) +{ +struct dw_hdmi_cec *cec =dev_get_drvdata (dev); + +/* store logical address and interrupt status/mask register */ + cec_saved_regs[0 ] =dw_hdmi_read (cec,HDMI_CEC_ADDR_L ); + cec_saved_regs[1 ] =dw_hdmi_read (cec,HDMI_CEC_ADDR_H ); + cec_saved_regs[2 ] =dw_hdmi_read (cec,HDMI_CEC_POLARITY ); + cec_saved_regs[3 ] =dw_hdmi_read (cec,HDMI_CEC_MASK ); + cec_saved_regs[4 ] =dw_hdmi_read (cec,HDMI_IH_MUTE_CEC_STAT0 ); + +return 0 ; +} + +static const struct dev_pm_ops dw_hdmi_cec_pm = { +SET_SYSTEM_SLEEP_PM_OPS (dw_hdmi_cec_suspend, dw_hdmi_cec_resume) +}; +static struct platform_driver dw_hdmi_cec_driver = { .probe = dw_hdmi_cec_probe, .remove = dw_hdmi_cec_remove, .driver = { .name ="dw-hdmi-cec" , + .pm = &dw_hdmi_cec_pm, }, };module_platform_driver (dw_hdmi_cec_driver);
RE: [EXT] Re: [PATCH v1 1/5] drm: bridge: dw_hdmi: cec: Add cec suspend/resume function
Hi,
Quoted 55 lines
-----Original Message-----
From: Hans Verkuil <[email protected]>
Sent: 2022年4月6日 17:47
To: Sandor Yu <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: S.J. Wang <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]
Subject: [EXT] Re: [PATCH v1 1/5] drm: bridge:dw_hdmi: cec: Add cec suspend/resume functionCaution: EXT Email
Hi Sandor,
Quoted 20 lines · On 06/04/2022 10:48, [email protected] wrote:
From: Sandor Yu <[email protected]>
CEC interrupt status/mask and logical address registers will be reset when device enter suspend.
It will cause cec fail to work after device resume.
Add CEC suspend/resume functions, save these registers status when suspend and restore them when resume.Signed-off-by Sandor Yu <[email protected]>--- drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+)drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +0
-0drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c line 21
Quoted 4 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +1
-0@@ -18,6 +18,8 @@#include "dw-hdmi-cec.h" +static u8 cec_saved_regs[5 ];Ewww, not a global. Just save it in struct
dw_hdmi_cec.drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
Quoted 4 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +1
-0+enum {HDMI_IH_CEC_STAT0 =0x0106 , HDMI_IH_MUTE_CEC_STAT0 = 0x0186, @@ -306,11 +308,44@@ static
Quoted 4 lines
int
dw_hdmi_cec_remove(struct platform_device *pdev)return 0;}
Quoted 8 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c static int dw_hdmi_cec_remove(struct platform_device *pdev) · line 317
Quoted 6 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +6
-0+static int __maybe_unused dw_hdmi_cec_resume (struct device *dev) { +struct dw_hdmi_cec *cec =dev_get_drvdata (dev); + +/* Restore logical address and interrupt status/mask register */ +dw_hdmi_write (cec, cec_saved_regs[0 ],HDMI_CEC_ADDR_L ); +dw_hdmi_write (cec, cec_saved_regs[1 ],HDMI_CEC_ADDR_H );No need to store HDMI_CEC_ADDR_L/R, just use
cec->addresses.
Agree, I will use it later.
Quoted 8 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c static int dw_hdmi_cec_remove(struct platform_device *pdev)
Quoted 4 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +3
-0+dw_hdmi_write (cec, cec_saved_regs[2 ],HDMI_CEC_POLARITY ); +dw_hdmi_write (cec, cec_saved_regs[3 ],HDMI_CEC_MASK ); + dw_hdmi_write(cec, cec_saved_regs[4],
HDMI_IH_MUTE_CEC_STAT0);This doesn't call cec->ops->disable/enable. It might be better to just call
dw_hdmi_cec_enable()and store the enable state in structdw_hdmi_cec.
If call cec->ops->disable/enable in suspend/resume, CEC stack will be reset. CEC user such as EARC/ARC, the CEC link is expect keep in active after device resume. So I prefer only save those registers for better user experience.
Quoted 5 lines
Regards,
Hans
Thanks
Sandor
Quoted 32 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c static int dw_hdmi_cec_remove(struct platform_device *pdev)
Quoted 13 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +13
-0+ +return 0 ; +} + +static int __maybe_unused dw_hdmi_cec_suspend (struct device *dev) { +struct dw_hdmi_cec *cec =dev_get_drvdata (dev); + +/* store logical address and interrupt status/mask register */ + cec_saved_regs[0 ] =dw_hdmi_read (cec,HDMI_CEC_ADDR_L ); + cec_saved_regs[1 ] =dw_hdmi_read (cec,HDMI_CEC_ADDR_H ); + cec_saved_regs[2 ] =dw_hdmi_read (cec,HDMI_CEC_POLARITY ); + cec_saved_regs[3 ] =dw_hdmi_read (cec,HDMI_CEC_MASK ); + cec_saved_regs[4] = dw_hdmi_read(cec,
HDMI_IH_MUTE_CEC_STAT0);drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c static int dw_hdmi_cec_remove(struct platform_device *pdev)
Quoted 6 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +6
-0+ +return 0 ; +} + +static const struct dev_pm_ops dw_hdmi_cec_pm = { + SET_SYSTEM_SLEEP_PM_OPS(dw_hdmi_cec_suspend,
dw_hdmi_cec_resume)Quoted 11 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +3
-0+}; +static struct platform_driver dw_hdmi_cec_driver = { .probe = dw_hdmi_cec_probe, .remove = dw_hdmi_cec_remove, .driver = { .name ="dw-hdmi-cec" , + .pm = &dw_hdmi_cec_pm, }, };module_platform_driver (dw_hdmi_cec_driver);
PATCH 2/5 drm: bridge: dw_hdmi: enable overflow workaround for v2.13a
In reply to [email protected]From: Sandor Yu <[email protected]>
iMX865 HDMI (v2.13a) have been identified as needing the workaround. Tests show that one iteration is enough.
Without the workaround, iMX865 HDMI audio may not work after cable plugout/in, because HDMI mode is not really set in register HDMI_FC_INVIDCONF.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +4 -3
@@ -2087,9 +2087,9 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi)* * The number of iterations matters and depends on the HDMI TX revision * (and possibly on the platform). So far i.MX6Q (v1.30a), i.MX6DL -* (v1.31a) and multiple Allwinner SoCs (v1.32a) have been identified -* as needing the workaround, with 4 iterations for v1.30a and 1 -* iteration for others. +* (v1.31a), iMX865(v2.13a) and multiple Allwinner SoCs (v1.32a) +* have been identified as needing the workaround, +* with 4 iterations for v1.30a and 1 iteration for others. * The Amlogic Meson GX SoCs (v2.01a) have been identified as needing * the workaround with a single iteration. * The Rockchip RK3288 SoC (v2.00a) and RK3328/RK3399 SoCs (v2.11a) have
@@ -2106,6 +2106,7 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi)case 0x201a :case 0x211a :case 0x212a : +case 0x213a : count =1 ;break ;default :
Signature · 1 line
2.25.1
Re: [PATCH v1 2/5] drm: bridge: dw_hdmi: enable overflow workaround for v2.13a
Hi,
Quoted 32 lines · On 06/04/2022 10:48, [email protected] wrote:
From: Sandor Yu <[email protected]>
iMX865 HDMI (v2.13a) have been identified as needing the workaround. Tests show that one iteration is enough.
Without the workaround, iMX865 HDMI audio may not work after cable plugout/in, because HDMI mode is not really set in register
HDMI_FC_INVIDCONF.Signed-off-by Sandor Yu <[email protected]>--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +3
-3@@ -2087,9 +2087,9 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi)* * The number of iterations matters and depends on the HDMI TX revision * (and possibly on the platform). So far i.MX6Q (v1.30a), i.MX6DL -* (v1.31a) and multiple Allwinner SoCs (v1.32a) have been identified -* as needing the workaround, with 4 iterations for v1.30a and 1 -* iteration for others. +* (v1.31a), iMX865(v2.13a) and multiple Allwinner SoCs (v1.32a) +* have been identified as needing the workaround, +* with 4 iterations for v1.30a and 1 iteration for others. * The Amlogic Meson GX SoCs (v2.01a) have been identified as needing * the workaround with a single iteration. * The Rockchip RK3288 SoC (v2.00a) and RK3328/RK3399 SoCs (v2.11a) have
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi) · line 2111
Quoted 6 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +1
-0@@ -2106,6 +2106,7 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi)case 0x201a :case 0x211a :case 0x212a : +case 0x213a : count =1 ;break ;
At some point we must consider only v1.30a needs 4, and other needs 1.
It would be simpler to put the "count = 1" in a default case.
The comment change is still welcome so we can track.
Thanks,
Neil
Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +0
-0default :
RE: [EXT] Re: [PATCH v1 2/5] drm: bridge: dw_hdmi: enable overflow workaround for v2.13a
Hi,
Quoted 63 lines
-----Original Message-----
From: Neil Armstrong <[email protected]>
Sent: 2022年4月6日 17:17
To: Sandor Yu <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: S.J. Wang <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: [EXT] Re: [PATCH v1 2/5] drm: bridge:dw_hdmi: enable overflow workaround for v2.13aCaution: EXT Email
Hi,
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void dw_hdmi_clear_overflow(struct
Quoted 20 lines · On 06/04/2022 10:48, [email protected] wrote:
From: Sandor Yu <[email protected]>
iMX865 HDMI (v2.13a) have been identified as needing the workaround. Tests show that one iteration is enough.
Without the workaround, iMX865 HDMI audio may not work after cable plugout/in, because HDMI mode is not really set in register
HDMI_FC_INVIDCONF.Signed-off-by Sandor Yu <[email protected]>--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +0
-0@@ -2087,9 +2087,9 @@ static void dw_hdmi_clear_overflow(struct
dw_hdmi*hdmi)drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void dw_hdmi_clear_overflow(struct · line 2088
Quoted 2 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +0
-0* * The number of iterations matters and depends on the HDMI TX revision
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void dw_hdmi_clear_overflow(struct · line 2090
Quoted 2 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +0
-1* (and possibly on the platform). So far i.MX6Q (v1.30a), i.MX6DL -* (v1.31a) and multiple Allwinner SoCs (v1.32a) have been identified
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi)
Quoted 6 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +3
-2-* as needing the workaround, with 4 iterations for v1.30a and 1 -* iteration for others. +* (v1.31a), iMX865(v2.13a) and multiple Allwinner SoCs (v1.32a) +* have been identified as needing the workaround, +* with 4 iterations for v1.30a and 1 iteration for others. * The Amlogic Meson GX SoCs (v2.01a) have been identified as needing
Quoted 3 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +0
-0* the workaround with a single iteration. * The Rockchip RK3288 SoC (v2.00a) and RK3328/RK3399 SoCs (v2.11a) have @@ -2106,6 +2106,7 @@ static void
dw_hdmi_clear_overflow(struct dw_hdmi *hdmi)Quoted 6 lines
case 0x201a: case 0x211a: case 0x212a: + case 0x213a: count = 1; break;
Quoted 4 lines
At some point we must consider only v1.30a needs 4, and other needs 1.
It would be simpler to put the "count = 1" in a default case.
Agree, I will put the "count = 1 " to default case.
Quoted 6 lines
The comment change is still welcome so we can track.
Thanks,
NeilQuoted 1 line
default:
Thanks
Sandor
PATCH 3/5 drm: bridge: dw_hdmi: Enable GCP only for Deep Color
In reply to [email protected]From: Sandor Yu <[email protected]>
HDMI1.4b specification section 6.5.3:
Source shall only send GCPs with non-zero CD to sinks that indicate support for Deep Color.
DW HDMI GPC default enabled, clear gpc_auto bit for bpp 24.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +8 -0
@@ -1160,6 +1160,14 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi) HDMI_VP_PR_CD_DESIRED_PR_FACTOR_MASK);hdmi_writeb (hdmi, val,HDMI_VP_PR_CD ); + val =hdmi_readb (hdmi,HDMI_FC_DATAUTO3 ); +if (color_depth ==4 ) +/* disable Auto GCP when bpp 24 */ + val &= ~0x4 ; +else + val |=0x4 ; +hdmi_writeb (hdmi, val,HDMI_FC_DATAUTO3 ); +hdmi_modb (hdmi,HDMI_VP_STUFF_PR_STUFFING_STUFFING_MODE ,HDMI_VP_STUFF_PR_STUFFING_MASK ,HDMI_VP_STUFF );
Signature · 1 line
2.25.1
Re: [PATCH v1 3/5] drm: bridge: dw_hdmi: Enable GCP only for Deep Color
Quoted 22 lines · On 06/04/2022 10:48, [email protected] wrote:
From: Sandor Yu <[email protected]>
HDMI1.4b specification section 6.5.3:
Source shall only send GCPs with non-zero CD to sinks that indicate support for Deep Color.DW HDMI GPC default enabled, clear
gpc_autobit for bpp 24.Signed-off-by Sandor Yu <[email protected]>--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +1
-0@@ -1160,6 +1160,14 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi) HDMI_VP_PR_CD_DESIRED_PR_FACTOR_MASK);hdmi_writeb (hdmi, val,HDMI_VP_PR_CD ); + val =hdmi_readb (hdmi,HDMI_FC_DATAUTO3 );
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void hdmi_video_packetize(struct dw_hdmi *hdmi) · line 1173
Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +7
-0+if (color_depth ==4 ) +/* disable Auto GCP when bpp 24 */ + val &= ~0x4 ; +else + val |=0x4 ; +hdmi_writeb (hdmi, val,HDMI_FC_DATAUTO3 ); +hdmi_modb (hdmi,HDMI_VP_STUFF_PR_STUFFING_STUFFING_MODE ,HDMI_VP_STUFF_PR_STUFFING_MASK ,HDMI_VP_STUFF );
Do you handle the case when color_depth == 0 when output is YUV422 ?
Neil
RE: [EXT] Re: [PATCH v1 3/5] drm: bridge: dw_hdmi: Enable GCP only for Deep Color
Hi,
Quoted 48 lines
-----Original Message-----
From: Neil Armstrong <[email protected]>
Sent: 2022年4月6日 17:20
To: Sandor Yu <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: S.J. Wang <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: [EXT] Re: [PATCH v1 3/5] drm: bridge:dw_hdmi: Enable GCP only for Deep ColorCaution: EXT Email
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void hdmi_video_packetize(struct
Quoted 19 lines · On 06/04/2022 10:48, [email protected] wrote:
From: Sandor Yu <[email protected]>
HDMI1.4b specification section 6.5.3:
Source shall only send GCPs with non-zero CD to sinks that indicate support for Deep Color.DW HDMI GPC default enabled, clear
gpc_autobit for bpp 24.Signed-off-by Sandor Yu <[email protected]>--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +0
-0@@ -1160,6 +1160,14 @@ static void hdmi_video_packetize(struct
dw_hdmi*hdmi)drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void hdmi_video_packetize(struct dw_hdmi *hdmi)
Quoted 12 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +8
-0HDMI_VP_PR_CD_DESIRED_PR_FACTOR_MASK);hdmi_writeb (hdmi, val,HDMI_VP_PR_CD ); + val =hdmi_readb (hdmi,HDMI_FC_DATAUTO3 ); +if (color_depth ==4 ) +/* disable Auto GCP when bpp 24 */ + val &= ~0x4 ; +else + val |=0x4 ; +hdmi_writeb (hdmi, val,HDMI_FC_DATAUTO3 ); + hdmi_modb(hdmi,
Quoted 6 lines
HDMI_VP_STUFF_PR_STUFFING_STUFFING_MODE,drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void hdmi_video_packetize(struct · line 1172
Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +0
-0HDMI_VP_STUFF_PR_STUFFING_MASK,
HDMI_VP_STUFF);Quoted 1 line
Do you handle the case when
color_depth== 0 when output is YUV422 ?
For YUV422 color depth 8, the gcp_auto bit need clear too, I will add it.
Quoted 2 lines
Neil
Thanks,
Sandor
PATCH 4/5 drm: bridge: dw_hdmi: add reset function for PHY GEN1
In reply to [email protected]From: Sandor Yu <[email protected]>
PHY reset register(MC_PHYRSTZ) active high reset control for PHY GEN2, and active low reset control for PHY GEN1.
Rename function dw_hdmi_phy_reset to dw_hdmi_phy_gen2_reset. Add dw_hdmi_phy_gen1_reset function for PHY GEN1.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 14 +++++++++++--- drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 2 +- include/drm/bridge/dw_hdmi.h | 4 +++- 3 files changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +11 -3
@@ -1365,13 +1365,21 @@ static void dw_hdmi_phy_sel_interface_control(struct dw_hdmi *hdmi, u8 enable) HDMI_PHY_CONF0_SELDIPIF_MASK); } -void dw_hdmi_phy_reset (struct dw_hdmi *hdmi) +void dw_hdmi_phy_gen1_reset (struct dw_hdmi *hdmi) +{ +/* PHY reset. The reset signal is active low on Gen1 PHYs. */ +hdmi_writeb (hdmi,0 ,HDMI_MC_PHYRSTZ ); +hdmi_writeb (hdmi,HDMI_MC_PHYRSTZ_PHYRSTZ ,HDMI_MC_PHYRSTZ ); +} +EXPORT_SYMBOL_GPL (dw_hdmi_phy_gen1_reset); + +void dw_hdmi_phy_gen2_reset (struct dw_hdmi *hdmi) {/* PHY reset. The reset signal is active high on Gen2 PHYs. */ hdmi_writeb (hdmi,HDMI_MC_PHYRSTZ_PHYRSTZ ,HDMI_MC_PHYRSTZ );hdmi_writeb (hdmi,0 ,HDMI_MC_PHYRSTZ ); } -EXPORT_SYMBOL_GPL (dw_hdmi_phy_reset); +EXPORT_SYMBOL_GPL (dw_hdmi_phy_gen2_reset);void dw_hdmi_phy_i2c_set_addr (struct dw_hdmi *hdmi,u8 address) {
@@ -1525,7 +1533,7 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi,if (phy->has_svsret)dw_hdmi_phy_enable_svsret (hdmi,1 ); -dw_hdmi_phy_reset (hdmi); +dw_hdmi_phy_gen2_reset (hdmi);hdmi_writeb (hdmi,HDMI_MC_HEACPHY_RST_ASSERT ,HDMI_MC_HEACPHY_RST );
drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c +1 -1
@@ -135,7 +135,7 @@ static int sun8i_hdmi_phy_config_a83t(struct dw_hdmi *hdmi,dw_hdmi_phy_gen2_txpwron (hdmi,0 );dw_hdmi_phy_gen2_pddq (hdmi,1 ); -dw_hdmi_phy_reset (hdmi); +dw_hdmi_phy_gen2_reset (hdmi);dw_hdmi_phy_gen2_pddq (hdmi,0 );
include/drm/bridge/dw_hdmi.h +3 -1
@@ -187,9 +187,11 @@ void dw_hdmi_phy_i2c_set_addr(struct dw_hdmi *hdmi, u8 address);void dw_hdmi_phy_i2c_write (struct dw_hdmi *hdmi,unsigned short data,unsigned char addr); +void dw_hdmi_phy_gen1_reset (struct dw_hdmi *hdmi); +void dw_hdmi_phy_gen2_pddq (struct dw_hdmi *hdmi,u8 enable);void dw_hdmi_phy_gen2_txpwron (struct dw_hdmi *hdmi,u8 enable); -void dw_hdmi_phy_reset (struct dw_hdmi *hdmi); +void dw_hdmi_phy_gen2_reset (struct dw_hdmi *hdmi);enum drm_connector_status dw_hdmi_phy_read_hpd (struct dw_hdmi *hdmi,void *data);
Signature · 1 line
2.25.1
PATCH 5/5 drm: bridge: dw_hdmi: Audio: Add General Parallel Audio (GPA) driver
In reply to [email protected]From: Sandor Yu <[email protected]>
General Parallel Audio (GPA) interface is one of the supported audio interface for synopsys HDMI module, which has verified for i.MX8MP platform.
This is initial version for GPA.
--- drivers/gpu/drm/bridge/synopsys/Kconfig | 11 + drivers/gpu/drm/bridge/synopsys/Makefile | 1 + .../drm/bridge/synopsys/dw-hdmi-gp-audio.c | 199 ++++++++++++++++++ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 128 ++++++++++- drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 13 +- include/drm/bridge/dw_hdmi.h | 5 + 6 files changed, 354 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c
drivers/gpu/drm/bridge/synopsys/Kconfig +11 -0
@@ -25,6 +25,17 @@ config DRM_DW_HDMI_I2S_AUDIO Support the I2S Audio interface which is part of the Synopsys Designware HDMI block. +config DRM_DW_HDMI_GP_AUDIO + tristate "Synopsys Designware GP Audio interface" + depends on DRM_DW_HDMI && SND + select SND_PCM + select SND_PCM_ELD + select SND_PCM_IEC958 + help + Support the GP Audio interface which is part of the Synopsys + Designware HDMI block. This is used in conjunction with + the i.MX865 HDMI driver. + config DRM_DW_HDMI_CEC tristate "Synopsis Designware CEC interface" depends on DRM_DW_HDMI
drivers/gpu/drm/bridge/synopsys/Makefile +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o +obj-$(CONFIG_DRM_DW_HDMI_GP_AUDIO) += dw-hdmi-gp-audio.o obj-$(CONFIG_DRM_DW_HDMI_I2S_AUDIO) += dw-hdmi-i2s-audio.o obj-$(CONFIG_DRM_DW_HDMI_CEC) += dw-hdmi-cec.o
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +199 -0
199 lines not on this page · raw message
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +127 -1
189 lines not on this page · raw message
drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +11 -2
@@ -158,8 +158,17 @@#define HDMI_FC_SPDDEVICEINF 0x1062#define HDMI_FC_AUDSCONF 0x1063#define HDMI_FC_AUDSSTAT 0x1064 -#define HDMI_FC_AUDSCHNLS7 0x106e -#define HDMI_FC_AUDSCHNLS8 0x106f +#define HDMI_FC_AUDSV 0x1065 +#define HDMI_FC_AUDSU 0x1066 +#define HDMI_FC_AUDSCHNLS0 0x1067 +#define HDMI_FC_AUDSCHNLS1 0x1068 +#define HDMI_FC_AUDSCHNLS2 0x1069 +#define HDMI_FC_AUDSCHNLS3 0x106A +#define HDMI_FC_AUDSCHNLS4 0x106B +#define HDMI_FC_AUDSCHNLS5 0x106C +#define HDMI_FC_AUDSCHNLS6 0x106D +#define HDMI_FC_AUDSCHNLS7 0x106E +#define HDMI_FC_AUDSCHNLS8 0x106F#define HDMI_FC_DATACH0FILL 0x1070#define HDMI_FC_DATACH1FILL 0x1071#define HDMI_FC_DATACH2FILL 0x1072
include/drm/bridge/dw_hdmi.h +5 -0
@@ -121,6 +121,9 @@ struct dw_hdmi_phy_ops {void (*update_hpd)(struct dw_hdmi *hdmi,void *data,bool force,bool disabled,bool rxsense);void (*setup_hpd)(struct dw_hdmi *hdmi,void *data); +void (*enable_audio)(struct dw_hdmi *hdmi,void *data,int channel, +int width,int rate,int non_pcm); +void (*disable_audio)(struct dw_hdmi *hdmi,void *data); };struct dw_hdmi_plat_data {
@@ -173,6 +176,8 @@ void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense);int dw_hdmi_set_plugged_cb (struct dw_hdmi *hdmi,hdmi_codec_plugged_cb fn,struct device *codec_dev); +void dw_hdmi_set_sample_non_pcm (struct dw_hdmi *hdmi,unsigned int non_pcm); +void dw_hdmi_set_sample_width (struct dw_hdmi *hdmi,unsigned int width);void dw_hdmi_set_sample_rate (struct dw_hdmi *hdmi,unsigned int rate);void dw_hdmi_set_channel_count (struct dw_hdmi *hdmi,unsigned int cnt);void dw_hdmi_set_channel_status (struct dw_hdmi *hdmi,u8 *channel_status);
Signature · 1 line
2.25.1
Re: [PATCH v1 5/5] drm: bridge: dw_hdmi: Audio: Add General Parallel Audio (GPA) driver
Hi,
Quoted 27 lines · On 06/04/2022 10:48, [email protected] wrote:
From: Sandor Yu <[email protected]>
General Parallel Audio (GPA) interface is one of the supported audio interface for synopsys HDMI module, which has verified for i.MX8MP platform.
This is initial version for GPA.Signed-off-by Shengjiu Wang <[email protected]>Signed-off-by Sandor Yu <[email protected]>--- drivers/gpu/drm/bridge/synopsys/Kconfig | 11 + drivers/gpu/drm/bridge/synopsys/Makefile | 1 + .../drm/bridge/synopsys/dw-hdmi-gp-audio.c | 199 ++++++++++++++++++ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 128 ++++++++++- drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 13 +- include/drm/bridge/dw_hdmi.h | 5 + 6 files changed, 354 insertions(+), 3 deletions(-)create mode 100644
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.cdrivers/gpu/drm/bridge/synopsys/Kconfig +0
-0@@ -25,6 +25,17 @@ config DRM_DW_HDMI_I2S_AUDIO Support the I2S Audio interface which is part of the Synopsys Designware HDMI block.
drivers/gpu/drm/bridge/synopsys/Kconfig config DRM_DW_HDMI_I2S_AUDIO · line 37
Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/Kconfig +10
-0+config DRM_DW_HDMI_GP_AUDIO + tristate "Synopsys Designware GP Audio interface" + depends on DRM_DW_HDMI && SND + select SND_PCM + select SND_PCM_ELD + select SND_PCM_IEC958 + help + Support the GP Audio interface which is part of the Synopsys + Designware HDMI block. This is used in conjunction with + the i.MX865 HDMI driver.
What does that mean ? it can only be used with i.MX865 HDMI driver ? If not, remove reference to i.MX865 HDMI driver.
Quoted 264 lines
drivers/gpu/drm/bridge/synopsys/Kconfig +1
-0+ config DRM_DW_HDMI_CEC tristate "Synopsis Designware CEC interface" depends on DRM_DW_HDMIdrivers/gpu/drm/bridge/synopsys/Makefile +1
-0@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o +obj-$(CONFIG_DRM_DW_HDMI_GP_AUDIO) += dw-hdmi-gp-audio.o obj-$(CONFIG_DRM_DW_HDMI_I2S_AUDIO) += dw-hdmi-i2s-audio.o obj-$(CONFIG_DRM_DW_HDMI_CEC) += dw-hdmi-cec.odrivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +199
-0@@ -0,0 +1,199 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* +* dw-hdmi-gp-audio.c +* +* Copyright 2020-2022 NXP +*/ +#include <linux/io.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/dmaengine.h> +#include <linux/dma-mapping.h> +#include <drm/bridge/dw_hdmi.h> +#include <drm/drm_edid.h> +#include <drm/drm_connector.h> + +#include <sound/hdmi-codec.h> +#include <sound/asoundef.h> +#include <sound/core.h> +#include <sound/initval.h> +#include <sound/pcm.h> +#include <sound/pcm_drm_eld.h> +#include <sound/pcm_iec958.h> +#include <sound/dmaengine_pcm.h> + +#include "dw-hdmi-audio.h" + +#define DRIVER_NAME "dw-hdmi-gp-audio" +#define DRV_NAME "hdmi-gp-audio" + +struct snd_dw_hdmi { +struct dw_hdmi_audio_data data; +struct platform_device *audio_pdev; +unsigned int pos; +}; + +struct dw_hdmi_channel_conf { +u8 conf1; +u8 ca; +}; + +/* +* The default mapping of ALSA channels to HDMI channels and speaker +* allocation bits. Note that we can't do channel remapping here - +* channels must be in the same order. +* +* Mappings for alsa-lib pcm/surround*.conf files: +* +* Front Sur4.0 Sur4.1 Sur5.0 Sur5.1 Sur7.1 +* Channels 2 4 6 6 6 8 +* +* Our mapping from ALSA channel to CEA686D speaker name and HDMI channel: +* +* Number of ALSA channels +* ALSA Channel 2 3 4 5 6 7 8 +* 0 FL:0 = = = = = = +* 1 FR:1 = = = = = = +* 2 FC:3 RL:4 LFE:2 = = = +* 3 RR:5 RL:4 FC:3 = = +* 4 RR:5 RL:4 = = +* 5 RR:5 = = +* 6 RC:6 = +* 7 RLC/FRC RLC/FRC +*/ +static struct dw_hdmi_channel_conf default_hdmi_channel_config[7 ] = { + {0x03 ,0x00 },/* FL,FR */ + {0x0b ,0x02 },/* FL,FR,FC */ + {0x33 ,0x08 },/* FL,FR,RL,RR */ + {0x37 ,0x09 },/* FL,FR,LFE,RL,RR */ + {0x3f ,0x0b },/* FL,FR,LFE,FC,RL,RR */ + {0x7f ,0x0f },/* FL,FR,LFE,FC,RL,RR,RC */ + {0xff ,0x13 },/* FL,FR,LFE,FC,RL,RR,[FR]RC,[FR]LC */ +}; + +static int audio_hw_params (struct device *dev,void *data, +struct hdmi_codec_daifmt *daifmt, +struct hdmi_codec_params *params) +{ +struct snd_dw_hdmi *dw =dev_get_drvdata (dev); +int ret =0 ; +u8 ca; + +dw_hdmi_set_sample_rate (dw->data.hdmi, params->sample_rate); + + ca = default_hdmi_channel_config[params->channels -2 ].ca; + +dw_hdmi_set_channel_count (dw->data.hdmi, params->channels); +dw_hdmi_set_channel_allocation (dw->data.hdmi, ca); + +dw_hdmi_set_sample_non_pcm (dw->data.hdmi, + params->iec.status[0 ] &IEC958_AES0_NONAUDIO ); +dw_hdmi_set_sample_width (dw->data.hdmi, params->sample_width); + +return ret; +} + +static void audio_shutdown (struct device *dev,void *data) +{ +} + +static int audio_mute_stream (struct device *dev,void *data, +bool enable,int direction) +{ +struct snd_dw_hdmi *dw =dev_get_drvdata (dev); +int ret =0 ; + +if (!enable) +dw_hdmi_audio_enable (dw->data.hdmi); +else +dw_hdmi_audio_disable (dw->data.hdmi); + +return ret; +} + +static int audio_get_eld (struct device *dev,void *data, +u8 *buf,size_t len) +{ +struct dw_hdmi_audio_data *audio = data; +u8 *eld; + + eld = audio->get_eld (audio->hdmi); +if (eld) +memcpy (buf, eld,min_t (size_t,MAX_ELD_BYTES , len)); +else +/* Pass en empty ELD if connector not available */ +memset (buf,0 , len); + +return 0 ; +} + +static int audio_hook_plugged_cb (struct device *dev,void *data, +hdmi_codec_plugged_cb fn, +struct device *codec_dev) +{ +struct snd_dw_hdmi *dw =dev_get_drvdata (dev); + +return dw_hdmi_set_plugged_cb (dw->data.hdmi, fn, codec_dev); +} + +static const struct hdmi_codec_ops audio_codec_ops = { + .hw_params = audio_hw_params, + .audio_shutdown = audio_shutdown, + .mute_stream = audio_mute_stream, + .get_eld = audio_get_eld, + .hook_plugged_cb = audio_hook_plugged_cb, +}; + +static int snd_dw_hdmi_probe (struct platform_device *pdev) +{ +struct dw_hdmi_audio_data *data = pdev->dev.platform_data; +struct snd_dw_hdmi *dw; + +const struct hdmi_codec_pdata codec_data = { + .i2s =1 , + .spdif =0 , + .ops = &audio_codec_ops, + .max_i2s_channels =8 , + .data = data, + }; + + dw =devm_kzalloc (&pdev->dev,sizeof (*dw),GFP_KERNEL ); +if (!dw) +return -ENOMEM ; + + dw->data = *data; + +platform_set_drvdata (pdev, dw); + + dw->audio_pdev =platform_device_register_data (&pdev->dev, +HDMI_CODEC_DRV_NAME ,1 , + &codec_data, +sizeof (codec_data)); + +return PTR_ERR_OR_ZERO (dw->audio_pdev); +} + +static int snd_dw_hdmi_remove (struct platform_device *pdev) +{ +struct snd_dw_hdmi *dw =platform_get_drvdata (pdev); + +platform_device_unregister (dw->audio_pdev); + +return 0 ; +} + +static struct platform_driver snd_dw_hdmi_driver = { + .probe = snd_dw_hdmi_probe, + .remove = snd_dw_hdmi_remove, + .driver = { + .name =DRIVER_NAME , + }, +}; + +module_platform_driver (snd_dw_hdmi_driver); + +MODULE_AUTHOR ("Shengjiu Wang <[email protected]>" ); +MODULE_DESCRIPTION ("Synopsis Designware HDMI GPA ALSA interface" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:" DRIVER_NAME );drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +9
-0@@ -191,7 +191,10 @@ struct dw_hdmi {spinlock_t audio_lock;struct mutex audio_mutex; +unsigned int sample_non_pcm; +unsigned int sample_width;unsigned int sample_rate; +unsigned int channels;unsigned int audio_cts;unsigned int audio_n;bool audio_enable;@@ -589,6 +592,8 @@ static unsigned int hdmi_compute_n(unsigned int freq, unsigned long pixel_clk) n =4096 ; else if (pixel_clk == 74176000 || pixel_clk == 148352000) n =11648 ; + else if (pixel_clk == 297000000) + n =3072 ; else n =4096 ; n *= mult;@@ -601,6 +606,8 @@ static unsigned int hdmi_compute_n(unsigned int freq, unsigned long pixel_clk) n =17836 ; else if (pixel_clk == 148352000) n =8918 ; + else if (pixel_clk == 297000000) + n =4704 ; else n =6272 ; n *= mult;@@ -615,6 +622,8 @@ static unsigned int hdmi_compute_n(unsigned int freq, unsigned long pixel_clk) n =11648 ; else if (pixel_clk == 148352000) n =5824 ; + else if (pixel_clk == 297000000) + n =5120 ; else n =6144 ; n *= mult;
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void hdmi_set_clk_regenerator(struct dw_hdmi *hdmi, · line 672
Quoted 5 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +1
-1@@ -660,7 +669,7 @@ static void hdmi_set_clk_regenerator(struct dw_hdmi *hdmi, config3 =hdmi_readb (hdmi,HDMI_CONFIG3_ID );/* Only compute CTS when using internal AHB audio */ -if (config3 &HDMI_CONFIG3_AHBAUDDMA ) { +if ((config3 &HDMI_CONFIG3_AHBAUDDMA ) || (config3 &HDMI_CONFIG3_GPAUD )) {
Update the comment to include GPAUD.
Quoted 194 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +117
-0/* * Compute the CTS value from the N value. Note that CTS and N * can be up to 20 bits in total, so we need 64-bit math. Also @@ -702,6 +711,22 @@ static void hdmi_clk_regenerator_update_pixel_clock(struct dw_hdmi *hdmi)mutex_unlock (&hdmi->audio_mutex); } +void dw_hdmi_set_sample_width (struct dw_hdmi *hdmi,unsigned int width) +{ +mutex_lock (&hdmi->audio_mutex); + hdmi->sample_width = width; +mutex_unlock (&hdmi->audio_mutex); +} +EXPORT_SYMBOL_GPL (dw_hdmi_set_sample_width); + +void dw_hdmi_set_sample_non_pcm (struct dw_hdmi *hdmi,unsigned int non_pcm) +{ +mutex_lock (&hdmi->audio_mutex); + hdmi->sample_non_pcm = non_pcm; +mutex_unlock (&hdmi->audio_mutex); +} +EXPORT_SYMBOL_GPL (dw_hdmi_set_sample_non_pcm); +void dw_hdmi_set_sample_rate (struct dw_hdmi *hdmi,unsigned int rate) {mutex_lock (&hdmi->audio_mutex);@@ -717,6 +742,7 @@ void dw_hdmi_set_channel_count(struct dw_hdmi *hdmi, unsigned int cnt)u8 layout;mutex_lock (&hdmi->audio_mutex); + hdmi->channels = cnt;/* * For >2 channel PCM audio, we need to select layout 1 @@ -765,6 +791,87 @@ static u8 *hdmi_audio_get_eld(struct dw_hdmi *hdmi)return hdmi->curr_conn->eld; } +static void dw_hdmi_gp_audio_enable (struct dw_hdmi *hdmi) +{ +int sample_freq =0x2 , org_sample_freq =0xD ; +int ch_mask =BIT (hdmi->channels) -1 ; + +switch (hdmi->sample_rate) { +case 32000 : + sample_freq =0x03 ; + org_sample_freq =0x0C ; +break ; +case 44100 : + sample_freq =0x00 ; + org_sample_freq =0x0F ; +break ; +case 48000 : + sample_freq =0x02 ; + org_sample_freq =0x0D ; +break ; +case 88200 : + sample_freq =0x08 ; + org_sample_freq =0x07 ; +break ; +case 96000 : + sample_freq =0x0A ; + org_sample_freq =0x05 ; +break ; +case 176400 : + sample_freq =0x0C ; + org_sample_freq =0x03 ; +break ; +case 192000 : + sample_freq =0x0E ; + org_sample_freq =0x01 ; +break ; +default : +break ; + } + +hdmi_set_cts_n (hdmi, hdmi->audio_cts, hdmi->audio_n); +hdmi_enable_audio_clk (hdmi, true); + +hdmi_writeb (hdmi,0x1 ,HDMI_FC_AUDSCHNLS0 ); +hdmi_writeb (hdmi, hdmi->channels,HDMI_FC_AUDSCHNLS2 ); +hdmi_writeb (hdmi,0x22 ,HDMI_FC_AUDSCHNLS3 ); +hdmi_writeb (hdmi,0x22 ,HDMI_FC_AUDSCHNLS4 ); +hdmi_writeb (hdmi,0x11 ,HDMI_FC_AUDSCHNLS5 ); +hdmi_writeb (hdmi,0x11 ,HDMI_FC_AUDSCHNLS6 ); +hdmi_writeb (hdmi, (0x3 <<4 ) | sample_freq,HDMI_FC_AUDSCHNLS7 ); +hdmi_writeb (hdmi, (org_sample_freq <<4 ) |0xb ,HDMI_FC_AUDSCHNLS8 ); + +hdmi_writeb (hdmi, ch_mask,HDMI_GP_CONF1 ); +hdmi_writeb (hdmi,0x02 ,HDMI_GP_CONF2 ); +hdmi_writeb (hdmi,0x01 ,HDMI_GP_CONF0 ); + +hdmi_modb (hdmi,0x3 ,0x3 ,HDMI_FC_DATAUTO3 ); + +/* hbr */ +if (hdmi->sample_rate ==192000 && hdmi->channels ==8 && + hdmi->sample_width ==32 && hdmi->sample_non_pcm) { +hdmi_modb (hdmi,0x01 ,0x01 ,HDMI_GP_CONF2 ); + } + +if (hdmi->phy.ops->enable_audio) + hdmi->phy.ops->enable_audio (hdmi, hdmi->phy.data, + hdmi->channels, + hdmi->sample_width, + hdmi->sample_rate, + hdmi->sample_non_pcm); +} + +static void dw_hdmi_gp_audio_disable (struct dw_hdmi *hdmi) +{ +hdmi_set_cts_n (hdmi, hdmi->audio_cts,0 ); + +hdmi_modb (hdmi,0 ,0x3 ,HDMI_FC_DATAUTO3 ); +if (hdmi->phy.ops->disable_audio) + hdmi->phy.ops->disable_audio (hdmi, hdmi->phy.data); + +hdmi_enable_audio_clk (hdmi, false); +} +static void dw_hdmi_ahb_audio_enable (struct dw_hdmi *hdmi) {hdmi_set_cts_n (hdmi, hdmi->audio_cts, hdmi->audio_n);@@ -3259,6 +3366,7 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, hdmi->plat_data = plat_data; hdmi->dev = dev; hdmi->sample_rate =48000 ; + hdmi->channels =2 ; hdmi->disabled = true; hdmi->rxsense = true; hdmi->phy_mask = (u8 )~(HDMI_PHY_HPD |HDMI_PHY_RX_SENSE );@@ -3482,6 +3590,24 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, pdevinfo.size_data =sizeof (audio); pdevinfo.dma_mask =DMA_BIT_MASK (32 ); hdmi->audio =platform_device_register_full (&pdevinfo); + }else if (iores && config3 &HDMI_CONFIG3_GPAUD ) { +struct dw_hdmi_audio_data audio; + + audio.phys = iores->start; + audio.base = hdmi->regs; + audio.irq = irq; + audio.hdmi = hdmi; + audio.get_eld = hdmi_audio_get_eld; + + hdmi->enable_audio = dw_hdmi_gp_audio_enable; + hdmi->disable_audio = dw_hdmi_gp_audio_disable; + + pdevinfo.name ="dw-hdmi-gp-audio" ; + pdevinfo.id =PLATFORM_DEVID_NONE ; + pdevinfo.data = &audio; + pdevinfo.size_data =sizeof (audio); + pdevinfo.dma_mask =DMA_BIT_MASK (32 ); + hdmi->audio =platform_device_register_full (&pdevinfo); }if (!plat_data->disable_cec && (config0 &HDMI_CONFIG0_CEC )) {drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +11
-2@@ -158,8 +158,17 @@#define HDMI_FC_SPDDEVICEINF 0x1062#define HDMI_FC_AUDSCONF 0x1063#define HDMI_FC_AUDSSTAT 0x1064 -#define HDMI_FC_AUDSCHNLS7 0x106e -#define HDMI_FC_AUDSCHNLS8 0x106f +#define HDMI_FC_AUDSV 0x1065 +#define HDMI_FC_AUDSU 0x1066 +#define HDMI_FC_AUDSCHNLS0 0x1067 +#define HDMI_FC_AUDSCHNLS1 0x1068 +#define HDMI_FC_AUDSCHNLS2 0x1069 +#define HDMI_FC_AUDSCHNLS3 0x106A +#define HDMI_FC_AUDSCHNLS4 0x106B +#define HDMI_FC_AUDSCHNLS5 0x106C +#define HDMI_FC_AUDSCHNLS6 0x106D +#define HDMI_FC_AUDSCHNLS7 0x106E +#define HDMI_FC_AUDSCHNLS8 0x106F#define HDMI_FC_DATACH0FILL 0x1070#define HDMI_FC_DATACH1FILL 0x1071#define HDMI_FC_DATACH2FILL 0x1072include/drm/bridge/dw_hdmi.h +3
-0@@ -121,6 +121,9 @@ struct dw_hdmi_phy_ops {void (*update_hpd)(struct dw_hdmi *hdmi,void *data,bool force,bool disabled,bool rxsense);void (*setup_hpd)(struct dw_hdmi *hdmi,void *data); +void (*enable_audio)(struct dw_hdmi *hdmi,void *data,int channel, +int width,int rate,int non_pcm); +void (*disable_audio)(struct dw_hdmi *hdmi,void *data); };struct dw_hdmi_plat_data {
include/drm/bridge/dw_hdmi.h void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense); · line 183
Quoted 8 lines
include/drm/bridge/dw_hdmi.h +2
-0@@ -173,6 +176,8 @@ void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense);int dw_hdmi_set_plugged_cb (struct dw_hdmi *hdmi,hdmi_codec_plugged_cb fn,struct device *codec_dev); +void dw_hdmi_set_sample_non_pcm (struct dw_hdmi *hdmi,unsigned int non_pcm); +void dw_hdmi_set_sample_width (struct dw_hdmi *hdmi,unsigned int width);void dw_hdmi_set_sample_rate (struct dw_hdmi *hdmi,unsigned int rate);void dw_hdmi_set_channel_count (struct dw_hdmi *hdmi,unsigned int cnt);void dw_hdmi_set_channel_status (struct dw_hdmi *hdmi,u8 *channel_status);
Thanks,
Neil
RE: [EXT] Re: [PATCH v1 5/5] drm: bridge: dw_hdmi: Audio: Add General Parallel Audio (GPA) driver
Hi,
Quoted 48 lines
-----Original Message-----
From: Neil Armstrong <[email protected]>
Sent: 2022年4月6日 17:28
To: Sandor Yu <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: S.J. Wang <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: [EXT] Re: [PATCH v1 5/5] drm: bridge:dw_hdmi: Audio: Add General Parallel Audio (GPA) driverCaution: EXT Email
Hi,
Quoted 7 lines · On 06/04/2022 10:48, [email protected] wrote:
From: Sandor Yu <[email protected]>
General Parallel Audio (GPA) interface is one of the supported audio interface for synopsys HDMI module, which has verified for i.MX8MP platform.
This is initial version for GPA.Quoted 6 lines
Signed-off-by Shengjiu Wang <[email protected]>Signed-off-by Sandor Yu <[email protected]>--- drivers/gpu/drm/bridge/synopsys/Kconfig | 11 + drivers/gpu/drm/bridge/synopsys/Makefile | 1 + .../drm/bridge/synopsys/dw-hdmi-gp-audio.c | 199++++++++++++++++++
Quoted 16 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 128 ++++++++++- drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 13 +- include/drm/bridge/dw_hdmi.h | 5 + 6 files changed, 354 insertions(+), 3 deletions(-)create mode 100644
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.cdrivers/gpu/drm/bridge/synopsys/Kconfig +0
-0@@ -25,6 +25,17 @@ config DRM_DW_HDMI_I2S_AUDIO Support the I2S Audio interface which is part of the Synopsys Designware HDMI block.
Quoted 14 lines
drivers/gpu/drm/bridge/synopsys/Kconfig config DRM_DW_HDMI_I2S_AUDIO · line 37
Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/Kconfig +10
-0+config DRM_DW_HDMI_GP_AUDIO + tristate "Synopsys Designware GP Audio interface" + depends on DRM_DW_HDMI && SND + select SND_PCM + select SND_PCM_ELD + select SND_PCM_IEC958 + help + Support the GP Audio interface which is part of the Synopsys + Designware HDMI block. This is used in conjunction with + the i.MX865 HDMI driver.What does that mean ? it can only be used with i.MX865 HDMI driver ? If not, remove reference to i.MX865 HDMI driver.
GP audio driver could be used for different SOCs, i.MX865 specific description will be removed.
Quoted 272 lines
Quoted 66 lines
drivers/gpu/drm/bridge/synopsys/Kconfig +1
-0+ config DRM_DW_HDMI_CEC tristate "Synopsis Designware CEC interface" depends on DRM_DW_HDMIdrivers/gpu/drm/bridge/synopsys/Makefile +1
-0@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o +obj-$(CONFIG_DRM_DW_HDMI_GP_AUDIO) += dw-hdmi-gp-audio.o obj-$(CONFIG_DRM_DW_HDMI_I2S_AUDIO) += dw-hdmi-i2s-audio.o obj-$(CONFIG_DRM_DW_HDMI_CEC) += dw-hdmi-cec.odrivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +42
-0@@ -0,0 +1,199 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* +* dw-hdmi-gp-audio.c +* +* Copyright 2020-2022 NXP +*/ +#include <linux/io.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/dmaengine.h> +#include <linux/dma-mapping.h> +#include <drm/bridge/dw_hdmi.h> +#include <drm/drm_edid.h> +#include <drm/drm_connector.h> + +#include <sound/hdmi-codec.h> +#include <sound/asoundef.h> +#include <sound/core.h> +#include <sound/initval.h> +#include <sound/pcm.h> +#include <sound/pcm_drm_eld.h> +#include <sound/pcm_iec958.h> +#include <sound/dmaengine_pcm.h> + +#include "dw-hdmi-audio.h" + +#define DRIVER_NAME "dw-hdmi-gp-audio" +#define DRV_NAME "hdmi-gp-audio" + +struct snd_dw_hdmi { +struct dw_hdmi_audio_data data; +struct platform_device *audio_pdev; +unsigned int pos; +}; + +struct dw_hdmi_channel_conf { +u8 conf1; +u8 ca; +}; + +/* drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c line 52
Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +10
-0+* The default mapping of ALSA channels to HDMI channels and speaker +* allocation bits. Note that we can't do channel remapping here - +* channels must be in the same order. +* +* Mappings for alsa-lib pcm/surround*.conf files: +* +* Front Sur4.0 Sur4.1 Sur5.0 Sur5.1 Sur7.1 +* Channels 2 4 6 6 6 8 +* +* Our mapping from ALSA channel to CEA686D speaker name and HDMI channel:
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c
Quoted 3 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +3
-0+* +* Number of ALSA channels +* ALSA Channel 2 3 4 5 6 7 8
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c line 56
Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +1
-0+* 0 FL:0 = = = = = =
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c line 57
Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +1
-0+* 1 FR:1 = = = = = =
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c
Quoted 3 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +3
-0+* 2 FC:3 RL:4 LFE:2 = = = +* 3 RR:5 RL:4 FC:3 = = +* 4 RR:5 RL:4 = =
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c line 61
Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +1
-0+* 5 RR:5 = =
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c line 62
Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +1
-0+* 6 RC:6 =
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c line 63
Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +1
-0+* 7 RLC/FRC RLC/FRC
Quoted 16 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +16
-0+*/ +static struct dw_hdmi_channel_conf default_hdmi_channel_config[7 ] = { + {0x03 ,0x00 },/* FL,FR */ + {0x0b ,0x02 },/* FL,FR,FC */ + {0x33 ,0x08 },/* FL,FR,RL,RR */ + {0x37 ,0x09 },/* FL,FR,LFE,RL,RR */ + {0x3f ,0x0b },/* FL,FR,LFE,FC,RL,RR */ + {0x7f ,0x0f },/* FL,FR,LFE,FC,RL,RR,RC */ + {0xff ,0x13 },/* FL,FR,LFE,FC,RL,RR,[FR]RC,[FR]LC */ }; + +static int audio_hw_params (struct device *dev,void *data, +struct hdmi_codec_daifmt *daifmt, +struct hdmi_codec_params *params) { +struct snd_dw_hdmi *dw =dev_get_drvdata (dev); +int ret =0 ; +u8 ca;drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c
Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +10
-0+ +dw_hdmi_set_sample_rate (dw->data.hdmi, params->sample_rate); + + ca = default_hdmi_channel_config[params->channels -2 ].ca; + +dw_hdmi_set_channel_count (dw->data.hdmi, params->channels); +dw_hdmi_set_channel_allocation (dw->data.hdmi, ca); + + dw_hdmi_set_sample_non_pcm(dw->data.hdmi, + params->iec.status[0] &
IEC958_AES0_NONAUDIO);drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c line 90
Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +1
-0+ dw_hdmi_set_sample_width(dw->data.hdmi,
params->sample_width);Quoted 60 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +60
-0+ +return ret; +} + +static void audio_shutdown (struct device *dev,void *data) { } + +static int audio_mute_stream (struct device *dev,void *data, +bool enable,int direction) { +struct snd_dw_hdmi *dw =dev_get_drvdata (dev); +int ret =0 ; + +if (!enable) +dw_hdmi_audio_enable (dw->data.hdmi); +else +dw_hdmi_audio_disable (dw->data.hdmi); + +return ret; +} + +static int audio_get_eld (struct device *dev,void *data, +u8 *buf,size_t len) { +struct dw_hdmi_audio_data *audio = data; +u8 *eld; + + eld = audio->get_eld (audio->hdmi); +if (eld) +memcpy (buf, eld,min_t (size_t,MAX_ELD_BYTES , len)); +else +/* Pass en empty ELD if connector not available */ +memset (buf,0 , len); + +return 0 ; +} + +static int audio_hook_plugged_cb (struct device *dev,void *data, +hdmi_codec_plugged_cb fn, +struct device *codec_dev) { +struct snd_dw_hdmi *dw =dev_get_drvdata (dev); + +return dw_hdmi_set_plugged_cb (dw->data.hdmi, fn, codec_dev); } + +static const struct hdmi_codec_ops audio_codec_ops = { + .hw_params = audio_hw_params, + .audio_shutdown = audio_shutdown, + .mute_stream = audio_mute_stream, + .get_eld = audio_get_eld, + .hook_plugged_cb = audio_hook_plugged_cb, }; + +static int snd_dw_hdmi_probe (struct platform_device *pdev) { +struct dw_hdmi_audio_data *data = pdev->dev.platform_data; +struct snd_dw_hdmi *dw; + +const struct hdmi_codec_pdata codec_data = { + .i2s =1 , + .spdif =0 , + .ops = &audio_codec_ops, + .max_i2s_channels =8 , + .data = data, + }; +drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c line 173
Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +10
-0+ dw =devm_kzalloc (&pdev->dev,sizeof (*dw),GFP_KERNEL ); +if (!dw) +return -ENOMEM ; + + dw->data = *data; + +platform_set_drvdata (pdev, dw); + + dw->audio_pdev = platform_device_register_data(&pdev->dev, +
HDMI_CODEC_DRV_NAME, 1,drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c line 161
Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +1
-0+
&codec_data,Quoted 15 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +15
-0+ + sizeof(codec_data)); + +return PTR_ERR_OR_ZERO (dw->audio_pdev); } + +static int snd_dw_hdmi_remove (struct platform_device *pdev) { +struct snd_dw_hdmi *dw =platform_get_drvdata (pdev); + +platform_device_unregister (dw->audio_pdev); + +return 0 ; +} + +static struct platform_driver snd_dw_hdmi_driver = { + .probe = snd_dw_hdmi_probe,drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c
Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +10
-0+ .remove = snd_dw_hdmi_remove, + .driver = { + .name = DRIVER_NAME, + }, +}; + +module_platform_driver (snd_dw_hdmi_driver); + +MODULE_AUTHOR ("Shengjiu Wang <[email protected]>" ); +MODULE_DESCRIPTION("Synopsis Designware HDMI GPA ALSAinterface");
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static unsigned int hdmi_compute_n(unsigned int
Quoted 18 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c new file +1
-0+MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:" DRIVER_NAME );drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +3
-0@@ -191,7 +191,10 @@ struct dw_hdmi {spinlock_t audio_lock;struct mutex audio_mutex; +unsigned int sample_non_pcm; +unsigned int sample_width;unsigned int sample_rate; +unsigned int channels;unsigned int audio_cts;unsigned int audio_n;bool audio_enable;@@ -589,6 +592,8 @@ static unsigned int hdmi_compute_n(unsigned intfreq, unsigned long
pixel_clk)drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static unsigned int hdmi_compute_n(unsigned int
Quoted 9 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +2
-0n =4096 ; else if (pixel_clk == 74176000 || pixel_clk == 148352000) n =11648 ; + else if (pixel_clk == 297000000) + n =3072 ; else n =4096 ; n *= mult;@@ -601,6 +606,8 @@ static unsigned int hdmi_compute_n(unsigned intfreq, unsigned long
pixel_clk)drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static unsigned int hdmi_compute_n(unsigned int
Quoted 9 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +2
-0n =17836 ; else if (pixel_clk == 148352000) n =8918 ; + else if (pixel_clk == 297000000) + n =4704 ; else n =6272 ; n *= mult;@@ -615,6 +622,8 @@ static unsigned int hdmi_compute_n(unsigned intfreq, unsigned long
pixel_clk)drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void hdmi_set_clk_regenerator(struct
Quoted 9 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +2
-0n =11648 ; else if (pixel_clk == 148352000) n =5824 ; + else if (pixel_clk == 297000000) + n =5120 ; else n =6144 ; n *= mult;@@ -660,7 +669,7 @@ static void hdmi_set_clk_regenerator(struct
dw_hdmi*hdmi,
Quoted 8 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void hdmi_set_clk_regenerator(struct dw_hdmi *hdmi,
Quoted 6 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +2
-1config3 =hdmi_readb (hdmi,HDMI_CONFIG3_ID );/* Only compute CTS when using internal AHB audio */ -if (config3 &HDMI_CONFIG3_AHBAUDDMA ) { +if ((config3 &HDMI_CONFIG3_AHBAUDDMA ) || (config3 & +HDMI_CONFIG3_GPAUD )) {Update the comment to include GPAUD.
I will update it.
Quoted 213 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void hdmi_set_clk_regenerator(struct · line 675
Quoted 3 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +0
-0/* * Compute the CTS value from the N value. Note that CTS and N
Quoted 2 lines
* can be up to 20 bits in total, so we need 64-bit
math. Also @@ -702,6 +711,22 @@ static void
hdmi_clk_regenerator_update_pixel_clock(struct dw_hdmi *hdmi)Quoted 8 lines
mutex_unlock(&hdmi->audio_mutex);}
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +5
-0+void dw_hdmi_set_sample_width (struct dw_hdmi *hdmi,unsigned int +width) { +mutex_lock (&hdmi->audio_mutex); + hdmi->sample_width = width; +mutex_unlock (&hdmi->audio_mutex); }drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void hdmi_clk_regenerator_update_pixel_clock(struct dw_hdmi *hdmi)
Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +9
-0+EXPORT_SYMBOL_GPL (dw_hdmi_set_sample_width); + +void dw_hdmi_set_sample_non_pcm (struct dw_hdmi *hdmi,unsigned int +non_pcm) { +mutex_lock (&hdmi->audio_mutex); + hdmi->sample_non_pcm = non_pcm; +mutex_unlock (&hdmi->audio_mutex); } +EXPORT_SYMBOL_GPL (dw_hdmi_set_sample_non_pcm); + void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned intrate)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c void dw_hdmi_set_channel_count(struct dw_hdmi
Quoted 3 lines
{ mutex_lock(&hdmi->audio_mutex);drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +0
-0@@ -717,6 +742,7 @@ void dw_hdmi_set_channel_count(struct dw_hdmi*hdmi, unsigned int cnt)
Quoted 48 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +38
-1u8 layout;mutex_lock (&hdmi->audio_mutex); + hdmi->channels = cnt;/* * For >2 channel PCM audio, we need to select layout 1 @@ -765,6 +791,87 @@ static u8 *hdmi_audio_get_eld(struct dw_hdmi *hdmi) return hdmi->curr_conn->eld; } +static void dw_hdmi_gp_audio_enable(struct dw_hdmi *hdmi) { +int sample_freq = 0x2, org_sample_freq = 0xD; +int ch_mask = BIT(hdmi->channels) - 1; + +switch (hdmi->sample_rate) { +case 32000: +sample_freq = 0x03; +org_sample_freq = 0x0C; +break; +case 44100: +sample_freq = 0x00; +org_sample_freq = 0x0F; +break; +case 48000: +sample_freq = 0x02; +org_sample_freq = 0x0D; +break; +case 88200: +sample_freq = 0x08; +org_sample_freq = 0x07; +break; +case 96000: +sample_freq = 0x0A; +org_sample_freq = 0x05; +break; +case 176400: +sample_freq = 0x0C; +org_sample_freq = 0x03; +break; +case 192000: +sample_freq = 0x0E; +org_sample_freq = 0x01; +break; +default: +break; +} +drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static u8 *hdmi_audio_get_eld(struct dw_hdmi *hdmi)
Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +10
-0+hdmi_set_cts_n (hdmi, hdmi->audio_cts, hdmi->audio_n); +hdmi_enable_audio_clk (hdmi, true); + +hdmi_writeb (hdmi,0x1 ,HDMI_FC_AUDSCHNLS0 ); +hdmi_writeb (hdmi, hdmi->channels,HDMI_FC_AUDSCHNLS2 ); +hdmi_writeb (hdmi,0x22 ,HDMI_FC_AUDSCHNLS3 ); +hdmi_writeb (hdmi,0x22 ,HDMI_FC_AUDSCHNLS4 ); +hdmi_writeb (hdmi,0x11 ,HDMI_FC_AUDSCHNLS5 ); +hdmi_writeb (hdmi,0x11 ,HDMI_FC_AUDSCHNLS6 ); + hdmi_writeb(hdmi, (0x3 << 4) | sample_freq,
HDMI_FC_AUDSCHNLS7);Quoted 11 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +11
-0+hdmi_writeb (hdmi, (org_sample_freq <<4 ) |0xb , +HDMI_FC_AUDSCHNLS8 ); + +hdmi_writeb (hdmi, ch_mask,HDMI_GP_CONF1 ); +hdmi_writeb (hdmi,0x02 ,HDMI_GP_CONF2 ); +hdmi_writeb (hdmi,0x01 ,HDMI_GP_CONF0 ); + +hdmi_modb (hdmi,0x3 ,0x3 ,HDMI_FC_DATAUTO3 ); + +/* hbr */ + if (hdmi->sample_rate == 192000 && hdmi->channels == 8 &&drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static u8 *hdmi_audio_get_eld(struct dw_hdmi *hdmi) · line 863
Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +10
-0+ hdmi->sample_width == 32 && hdmi->sample_non_pcm) { +hdmi_modb (hdmi,0x01 ,0x01 ,HDMI_GP_CONF2 ); + } + +if (hdmi->phy.ops->enable_audio) + hdmi->phy.ops->enable_audio(hdmi, hdmi->phy.data, + hdmi->channels, + hdmi->sample_width, + hdmi->sample_rate, +
hdmi->sample_non_pcm); }drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static u8 *hdmi_audio_get_eld(struct dw_hdmi *hdmi)
Quoted 13 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +10
-0+ +static void dw_hdmi_gp_audio_disable (struct dw_hdmi *hdmi) { +hdmi_set_cts_n (hdmi, hdmi->audio_cts,0 ); + +hdmi_modb (hdmi,0 ,0x3 ,HDMI_FC_DATAUTO3 ); +if (hdmi->phy.ops->disable_audio) + hdmi->phy.ops->disable_audio (hdmi, hdmi->phy.data); + +hdmi_enable_audio_clk (hdmi, false); } +static void dw_hdmi_ahb_audio_enable (struct dw_hdmi *hdmi) { hdmi_set_cts_n(hdmi, hdmi->audio_cts, hdmi->audio_n); @@-3259,6
Quoted 1 line
+3366,7 @@ struct
dw_hdmi*dw_hdmi_probe(structplatform_device*pdev,
Quoted 7 lines
hdmi->plat_data = plat_data; hdmi->dev = dev; hdmi->sample_rate = 48000; + hdmi->channels = 2; hdmi->disabled = true; hdmi->rxsense = true; hdmi->phy_mask = (u8)~(HDMI_PHY_HPD | HDMI_PHY_RX_SENSE);@@
Quoted 1 line
-3482,6 +3590,24 @@ struct
dw_hdmi*dw_hdmi_probe(struct
platform_device*pdev,Quoted 50 lines
pdevinfo.size_data = sizeof(audio); pdevinfo.dma_mask = DMA_BIT_MASK(32); hdmi->audio = platform_device_register_full(&pdevinfo);drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +18
-0+ }else if (iores && config3 &HDMI_CONFIG3_GPAUD ) { +struct dw_hdmi_audio_data audio; + + audio.phys = iores->start; + audio.base = hdmi->regs; + audio.irq = irq; + audio.hdmi = hdmi; + audio.get_eld = hdmi_audio_get_eld; + + hdmi->enable_audio = dw_hdmi_gp_audio_enable; + hdmi->disable_audio = dw_hdmi_gp_audio_disable; + + pdevinfo.name ="dw-hdmi-gp-audio" ; + pdevinfo.id =PLATFORM_DEVID_NONE ; + pdevinfo.data = &audio; + pdevinfo.size_data =sizeof (audio); + pdevinfo.dma_mask =DMA_BIT_MASK (32 ); + hdmi->audio =platform_device_register_full (&pdevinfo); }if (!plat_data->disable_cec && (config0 &HDMI_CONFIG0_CEC )) {drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +11
-2@@ -158,8 +158,17 @@#define HDMI_FC_SPDDEVICEINF 0x1062#define HDMI_FC_AUDSCONF 0x1063#define HDMI_FC_AUDSSTAT 0x1064 -#define HDMI_FC_AUDSCHNLS7 0x106e -#define HDMI_FC_AUDSCHNLS8 0x106f +#define HDMI_FC_AUDSV 0x1065 +#define HDMI_FC_AUDSU 0x1066 +#define HDMI_FC_AUDSCHNLS0 0x1067 +#define HDMI_FC_AUDSCHNLS1 0x1068 +#define HDMI_FC_AUDSCHNLS2 0x1069 +#define HDMI_FC_AUDSCHNLS3 0x106A +#define HDMI_FC_AUDSCHNLS4 0x106B +#define HDMI_FC_AUDSCHNLS5 0x106C +#define HDMI_FC_AUDSCHNLS6 0x106D +#define HDMI_FC_AUDSCHNLS7 0x106E +#define HDMI_FC_AUDSCHNLS8 0x106F#define HDMI_FC_DATACH0FILL 0x1070#define HDMI_FC_DATACH1FILL 0x1071#define HDMI_FC_DATACH2FILL 0x1072(quoted diff) +0
-0Quoted 1 line
b/include/drm/bridge/dw_hdmi.hindex70082f80a8c8..7f73c3398a54100644
include/drm/bridge/dw_hdmi.h void dw_hdmi_setup_rx_sense(struct dw_hdmi
Quoted 13 lines
include/drm/bridge/dw_hdmi.h +3
-0@@ -121,6 +121,9 @@ struct dw_hdmi_phy_ops {void (*update_hpd)(struct dw_hdmi *hdmi,void *data,bool force,bool disabled,bool rxsense);void (*setup_hpd)(struct dw_hdmi *hdmi,void *data); +void (*enable_audio)(struct dw_hdmi *hdmi,void *data,int channel, +int width,int rate,int non_pcm); +void (*disable_audio)(struct dw_hdmi *hdmi,void *data); };struct dw_hdmi_plat_data {@@ -173,6 +176,8 @@ void dw_hdmi_setup_rx_sense(struct dw_hdmi*hdmi,
include/drm/bridge/dw_hdmi.h void dw_hdmi_setup_rx_sense(struct dw_hdmi · line 178
Quoted 3 lines
include/drm/bridge/dw_hdmi.h +0
-0bool hpd, bool rx_sense); int dw_hdmi_set_plugged_cb(struct dw_hdmi *hdmi,
hdmi_codec_plugged_cbfn,include/drm/bridge/dw_hdmi.h void dw_hdmi_setup_rx_sense(struct dw_hdmi · line 183
Quoted 5 lines
include/drm/bridge/dw_hdmi.h +3
-0struct device *codec_dev); +void dw_hdmi_set_sample_non_pcm (struct dw_hdmi *hdmi,unsigned int +non_pcm);void dw_hdmi_set_sample_width (struct dw_hdmi *hdmi, +unsigned int width); void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned intrate);
Quoted 7 lines
Quoted 1 line
void dw_hdmi_set_channel_count(struct
dw_hdmi*hdmi, unsigned intcnt);
Quoted 2 lines
void dw_hdmi_set_channel_status(struct
dw_hdmi*hdmi, u8*channel_status);Thanks,
Neil
Thanks,
Sandor
Hi Sandor,
Quoted 4 lines · On Mi, 2022-04-06 at 16:48 +0800, [email protected] wrote:
From: Sandor Yu <[email protected]>
It is new features and bug fix patch set for
DW_HDMIDRM bridge driver that has verified by NXP iMX865.
Is that iMX865 or i.MX865? Both are used in different places of this patchset, I'd pick the official spelling and use it everywhere.
regards
Philipp
Hi Philipp
Quoted 17 lines
-----Original Message-----
From: Philipp Zabel <[email protected]>
Sent: 2022年4月7日 16:43
To: Sandor Yu <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: S.J. Wang <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]
Subject: [EXT] Re: [PATCH v1 0/5] DRM: Bridge:DW_HDMI: Add new features and bug fixCaution: EXT Email
Hi Sandor,
Quoted 9 lines
Quoted 4 lines · On Mi, 2022-04-06 at 16:48 +0800, [email protected] wrote:
From: Sandor Yu <[email protected]>
It is new features and bug fix patch set for
DW_HDMIDRM bridge driver that has verified by NXP iMX865.Is that iMX865 or i.MX865? Both are used in different places of this patchset, I'd pick the official spelling and use it everywhere.
Check it in NXP internal, the i.MX865 official name in community should be i.MX 8M Plus or i.MX8MPlus I will use i.MX8MPlus in the patch set later.
Thanks for your comments.
Quoted 2 lines
regards
Philipp
B.R
Sandor