drm/ast: Fix DP hotplugging and clean up
Thomas Zimmermann
maintainercover drm/ast: Fix DP hotplugging and clean up
Here are a number of updates for ast's ASTDP transmitter code.
So far the ast driver required the DisplayPort to be connected at boot. Later detection was not supported. Re-connecting the cable was also not supported. Once atomic_disable powered off the physical ASTDP connector, there was no way of detecting a conencted display. Patch 1 makes Hot Plug Detection work. If ncesessary, the connector's detect helper powers up the physical connector to read the HPD status.
That's a good oportunity to clean up ast's whole detection code for ASTDP transmitters. So patch 2 to 4 remove duplicated status tests throughout the ASTDP code.
Patch 5 simplified the code for reading the display's EDID data from the firmware.
Tested on AST2600 hardware with an ASTDP transmitter.
Thomas Zimmermann (5):
drm/ast: astdp: Wake up during connector status detection drm/ast: astdp: Test firmware status once during probing drm/ast: astdp: Only test HDP state in ast_astdp_is_connected() drm/ast: astdp: Perform link training during atomic_enable drm/ast: astdp: Clean up EDID reading
drivers/gpu/drm/ast/ast_dp.c | 186 +++++++++++++++------------------ drivers/gpu/drm/ast/ast_drv.h | 4 +- drivers/gpu/drm/ast/ast_main.c | 6 +- drivers/gpu/drm/ast/ast_mode.c | 31 +++++- drivers/gpu/drm/ast/ast_post.c | 2 +- drivers/gpu/drm/ast/ast_reg.h | 22 ++-- 6 files changed, 126 insertions(+), 125 deletions(-)
Signature · 1 line
2.45.2
Thomas Zimmermann
maintainerPATCH 1/5 drm/ast: astdp: Wake up during connector status detection
Power up the ASTDP connector for connection status detection if the connector is not active. Keep it powered if a display is attached.
This fixes a bug where the connector does not come back after disconnecting the display. The encoder's atomic_disable turns off power on the physical connector. Further HPD reads will fail, thus preventing the driver from detecting re-connected displays.
For connectors that are actively used, only test the HPD flag without touching power.
--- drivers/gpu/drm/ast/ast_dp.c | 7 +++++++ drivers/gpu/drm/ast/ast_drv.h | 1 + drivers/gpu/drm/ast/ast_mode.c | 29 +++++++++++++++++++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-)
drivers/gpu/drm/ast/ast_dp.c +7 -0
@@ -158,7 +158,14 @@ void ast_dp_launch(struct drm_device *dev) ASTDP_HOST_EDID_READ_DONE); } +bool ast_dp_power_is_on (struct ast_device *ast) +{ +u8 vgacre3; + + vgacre3 =ast_get_index_reg (ast,AST_IO_VGACRI ,0xe3 ); +return !(vgacre3 &AST_DP_PHY_SLEEP ); +}void ast_dp_power_on_off (struct drm_device *dev,bool on) {
drivers/gpu/drm/ast/ast_drv.h +1 -0
@@ -472,6 +472,7 @@ void ast_init_3rdtx(struct drm_device *dev);bool ast_astdp_is_connected (struct ast_device *ast);int ast_astdp_read_edid (struct drm_device *dev,u8 *ediddata);void ast_dp_launch (struct drm_device *dev); +bool ast_dp_power_is_on (struct ast_device *ast);void ast_dp_power_on_off (struct drm_device *dev,bool no);void ast_dp_set_on_off (struct drm_device *dev,bool no);void ast_dp_set_mode (struct drm_crtc *crtc,struct ast_vbios_mode_info *vbios_mode);
drivers/gpu/drm/ast/ast_mode.c +27 -2
@@ -28,6 +28,7 @@* Authors: Dave Airlie <[email protected]> */ +#include <linux/delay.h> #include <linux/export.h> #include <linux/pci.h>
@@ -1687,11 +1688,35 @@ static int ast_astdp_connector_helper_detect_ctx(struct drm_connector *connector struct drm_modeset_acquire_ctx *ctx, bool force) { +struct drm_device *dev = connector->dev;struct ast_device *ast =to_ast_device (connector->dev); +enum drm_connector_status status = connector_status_disconnected; +struct drm_connector_state *connector_state = connector->state; +bool is_active = false; + +mutex_lock (&ast->modeset_lock); + +if (connector_state && connector_state->crtc) { +struct drm_crtc_state *crtc_state = connector_state->crtc->state; + +if (crtc_state && crtc_state->active) + is_active = true; + } + +if (!is_active && !ast_dp_power_is_on (ast)) { +ast_dp_power_on_off (dev, true); +msleep (50 ); + }if (ast_astdp_is_connected (ast)) -return connector_status_connected; -return connector_status_disconnected; + status = connector_status_connected; + +if (!is_active && status == connector_status_disconnected) +ast_dp_power_on_off (dev, false); + +mutex_unlock (&ast->modeset_lock); + +return status; }static const struct drm_connector_helper_funcs ast_astdp_connector_helper_funcs = {
Signature · 1 line
2.45.2
Re: [PATCH 1/5] drm/ast: astdp: Wake up during connector status detection
Quoted 10 lines · Thomas Zimmermann
Power up the ASTDP connector for connection status detection if the connector is not active. Keep it powered if a display is attached.
This fixes a bug where the connector does not come back after disconnecting the display. The encoder's
atomic_disableturns off power on the physical connector. Further HPD reads will fail, thus preventing the driver from detecting re-connected displays.For connectors that are actively used, only test the HPD flag without touching power.
Thanks, it looks good to me.
Quoted 95 lines
Fixes f81bb0ac7872 ("drm/ast: report connection status on Display Port.")Cc Jocelyn Falempe <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc Dave Airlie <[email protected]>Cc <[email protected]> # v6.6+Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/ast/ast_dp.c | 7 +++++++ drivers/gpu/drm/ast/ast_drv.h | 1 + drivers/gpu/drm/ast/ast_mode.c | 29 +++++++++++++++++++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-)drivers/gpu/drm/ast/ast_dp.c +7
-0@@ -158,7 +158,14 @@ void ast_dp_launch(struct drm_device *dev) ASTDP_HOST_EDID_READ_DONE); } +bool ast_dp_power_is_on (struct ast_device *ast) +{ +u8 vgacre3; + + vgacre3 =ast_get_index_reg (ast,AST_IO_VGACRI ,0xe3 ); +return !(vgacre3 &AST_DP_PHY_SLEEP ); +}void ast_dp_power_on_off (struct drm_device *dev,bool on) {drivers/gpu/drm/ast/ast_drv.h +1
-0@@ -472,6 +472,7 @@ void ast_init_3rdtx(struct drm_device *dev);bool ast_astdp_is_connected (struct ast_device *ast);int ast_astdp_read_edid (struct drm_device *dev,u8 *ediddata);void ast_dp_launch (struct drm_device *dev); +bool ast_dp_power_is_on (struct ast_device *ast);void ast_dp_power_on_off (struct drm_device *dev,bool no);void ast_dp_set_on_off (struct drm_device *dev,bool no);void ast_dp_set_mode (struct drm_crtc *crtc,struct ast_vbios_mode_info *vbios_mode);drivers/gpu/drm/ast/ast_mode.c +27
-2@@ -28,6 +28,7 @@* Authors: Dave Airlie <[email protected]> */ +#include <linux/delay.h> #include <linux/export.h> #include <linux/pci.h> @@ -1687,11 +1688,35 @@ static int ast_astdp_connector_helper_detect_ctx(struct drm_connector *connector struct drm_modeset_acquire_ctx *ctx, bool force) { +struct drm_device *dev = connector->dev;struct ast_device *ast =to_ast_device (connector->dev); +enum drm_connector_status status = connector_status_disconnected; +struct drm_connector_state *connector_state = connector->state; +bool is_active = false; + +mutex_lock (&ast->modeset_lock); + +if (connector_state && connector_state->crtc) { +struct drm_crtc_state *crtc_state = connector_state->crtc->state; + +if (crtc_state && crtc_state->active) + is_active = true; + } + +if (!is_active && !ast_dp_power_is_on (ast)) { +ast_dp_power_on_off (dev, true); +msleep (50 ); + }if (ast_astdp_is_connected (ast)) -return connector_status_connected; -return connector_status_disconnected; + status = connector_status_connected; + +if (!is_active && status == connector_status_disconnected) +ast_dp_power_on_off (dev, false); + +mutex_unlock (&ast->modeset_lock); + +return status; }static const struct drm_connector_helper_funcs ast_astdp_connector_helper_funcs = {
Re: [PATCH 1/5] drm/ast: astdp: Wake up during connector status detection
In reply to Thomas ZimmermannI merged this patch into drm-misc-fixes.
Am 17.07.24 um 16:24 schrieb Thomas Zimmermann:
Quoted 105 lines
Power up the ASTDP connector for connection status detection if the connector is not active. Keep it powered if a display is attached.
This fixes a bug where the connector does not come back after disconnecting the display. The encoder's
atomic_disableturns off power on the physical connector. Further HPD reads will fail, thus preventing the driver from detecting re-connected displays.For connectors that are actively used, only test the HPD flag without touching power.
Fixes f81bb0ac7872 ("drm/ast: report connection status on Display Port.")Cc Jocelyn Falempe <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc Dave Airlie <[email protected]>Cc <[email protected]> # v6.6+Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/ast/ast_dp.c | 7 +++++++ drivers/gpu/drm/ast/ast_drv.h | 1 + drivers/gpu/drm/ast/ast_mode.c | 29 +++++++++++++++++++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-)drivers/gpu/drm/ast/ast_dp.c +7
-0@@ -158,7 +158,14 @@ void ast_dp_launch(struct drm_device *dev) ASTDP_HOST_EDID_READ_DONE); } +bool ast_dp_power_is_on (struct ast_device *ast) +{ +u8 vgacre3; + + vgacre3 =ast_get_index_reg (ast,AST_IO_VGACRI ,0xe3 ); +return !(vgacre3 &AST_DP_PHY_SLEEP ); +}void ast_dp_power_on_off (struct drm_device *dev,bool on) {drivers/gpu/drm/ast/ast_drv.h +1
-0@@ -472,6 +472,7 @@ void ast_init_3rdtx(struct drm_device *dev);bool ast_astdp_is_connected (struct ast_device *ast);int ast_astdp_read_edid (struct drm_device *dev,u8 *ediddata);void ast_dp_launch (struct drm_device *dev); +bool ast_dp_power_is_on (struct ast_device *ast);void ast_dp_power_on_off (struct drm_device *dev,bool no);void ast_dp_set_on_off (struct drm_device *dev,bool no);void ast_dp_set_mode (struct drm_crtc *crtc,struct ast_vbios_mode_info *vbios_mode);drivers/gpu/drm/ast/ast_mode.c +27
-2@@ -28,6 +28,7 @@* Authors: Dave Airlie <[email protected]> */ +#include <linux/delay.h> #include <linux/export.h> #include <linux/pci.h> @@ -1687,11 +1688,35 @@ static int ast_astdp_connector_helper_detect_ctx(struct drm_connector *connector struct drm_modeset_acquire_ctx *ctx, bool force) { +struct drm_device *dev = connector->dev;struct ast_device *ast =to_ast_device (connector->dev); +enum drm_connector_status status = connector_status_disconnected; +struct drm_connector_state *connector_state = connector->state; +bool is_active = false; + +mutex_lock (&ast->modeset_lock); + +if (connector_state && connector_state->crtc) { +struct drm_crtc_state *crtc_state = connector_state->crtc->state; + +if (crtc_state && crtc_state->active) + is_active = true; + } + +if (!is_active && !ast_dp_power_is_on (ast)) { +ast_dp_power_on_off (dev, true); +msleep (50 ); + }if (ast_astdp_is_connected (ast)) -return connector_status_connected; -return connector_status_disconnected; + status = connector_status_connected; + +if (!is_active && status == connector_status_disconnected) +ast_dp_power_on_off (dev, false); + +mutex_unlock (&ast->modeset_lock); + +return status; }static const struct drm_connector_helper_funcs ast_astdp_connector_helper_funcs = {
Signature · 7 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Thomas Zimmermann
maintainerPATCH 2/5 drm/ast: astdp: Test firmware status once during probing
In reply to Thomas ZimmermannTest for running ASTDP firmware during probe. Do not bother testing this later. We cannot do much anyway if the firmware fails. Do not initialize the ASTDP conenctor if the test fails during device probing.
--- drivers/gpu/drm/ast/ast_dp.c | 41 +++++++++++++--------------------- drivers/gpu/drm/ast/ast_drv.h | 2 +- drivers/gpu/drm/ast/ast_main.c | 6 +++-- drivers/gpu/drm/ast/ast_post.c | 2 +- drivers/gpu/drm/ast/ast_reg.h | 4 ++-- 5 files changed, 23 insertions(+), 32 deletions(-)
drivers/gpu/drm/ast/ast_dp.c +15 -26
@@ -9,8 +9,6 @@bool ast_astdp_is_connected (struct ast_device *ast) { -if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,ASTDP_MCU_FW_EXECUTING )) -return false;if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ))return false;if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ))
@@ -24,13 +22,11 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)u8 i =0 , j =0 ;/* -* CRD1[b5]: DP MCU FW is executing * CRDC[b0]: DP link success * CRDF[b0]: DP HPD * CRE5[b0]: Host reading EDID process is done */ -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,ASTDP_MCU_FW_EXECUTING ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) && +if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) &&ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ) &&ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK ))) {
@@ -64,9 +60,7 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)*/ mdelay (j+1 ); -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 , -ASTDP_MCU_FW_EXECUTING ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC , +if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) &&ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ))) { goto err_astdp_jump_out_loop_of_edid;
@@ -115,8 +109,6 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)return (~(j+256 ) +1 ); err_astdp_edid_not_ready: -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,ASTDP_MCU_FW_EXECUTING ))) -return (~0xD1 +1 );if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS )))return (~0xDC +1 );if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD )))
@@ -130,32 +122,29 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)/* * Launch Aspeed DP */ -void ast_dp_launch (struct drm_device *dev) +int ast_dp_launch (struct ast_device *ast) { -u32 i =0 ; -u8 bDPExecute =1 ; -struct ast_device *ast =to_ast_device (dev); +struct drm_device *dev = &ast->base; +unsigned int i =10 ; -// Wait one second then timeout. -while (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,ASTDP_MCU_FW_EXECUTING ) != -ASTDP_MCU_FW_EXECUTING ) { - i++; -// wait 100 ms -msleep (100 ); +while (i) { +u8 vgacrd1 =ast_get_index_reg (ast,AST_IO_VGACRI ,0xd1 ); -if (i >=10 ) { -// DP would not be ready. - bDPExecute =0 ; +if (vgacrd1 &AST_IO_VGACRD1_MCU_FW_EXECUTING )break ; - } + --i; +msleep (100 ); } - -if (!bDPExecute) +if (!i) {drm_err (dev,"Wait DPMCU executing timeout\n" ); +return -ENODEV ; + }ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK ,ASTDP_HOST_EDID_READ_DONE ); + +return 0 ; }bool ast_dp_power_is_on (struct ast_device *ast)
drivers/gpu/drm/ast/ast_drv.h +1 -1
@@ -471,7 +471,7 @@ void ast_init_3rdtx(struct drm_device *dev);/* aspeed DP */ bool ast_astdp_is_connected (struct ast_device *ast);int ast_astdp_read_edid (struct drm_device *dev,u8 *ediddata); -void ast_dp_launch (struct drm_device *dev); +int ast_dp_launch (struct ast_device *ast);bool ast_dp_power_is_on (struct ast_device *ast);void ast_dp_power_on_off (struct drm_device *dev,bool no);void ast_dp_set_on_off (struct drm_device *dev,bool no);
drivers/gpu/drm/ast/ast_main.c +4 -2
@@ -115,8 +115,10 @@ static void ast_detect_tx_chip(struct ast_device *ast, bool need_post) }else if (IS_AST_GEN7 (ast)) {if (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,TX_TYPE_MASK ) ==ASTDP_DPMCU_TX ) { - ast->tx_chip_types =AST_TX_ASTDP_BIT ; -ast_dp_launch (&ast->base); +int ret =ast_dp_launch (ast); + +if (!ret) + ast->tx_chip_types =AST_TX_ASTDP_BIT ; } }
drivers/gpu/drm/ast/ast_post.c +1 -1
@@ -351,7 +351,7 @@ void ast_post_gpu(struct drm_device *dev)if (IS_AST_GEN7 (ast)) {if (ast->tx_chip_types &AST_TX_ASTDP_BIT ) -ast_dp_launch (dev); +ast_dp_launch (ast); }else if (ast->config_mode == ast_use_p2a) {if (IS_AST_GEN6 (ast))ast_post_chip_2500 (dev);
drivers/gpu/drm/ast/ast_reg.h +2 -2
@@ -37,6 +37,8 @@#define AST_IO_VGACRCB_HWC_16BPP BIT(0)/* set: ARGB4444, cleared: 2bpp palette */ #define AST_IO_VGACRCB_HWC_ENABLED BIT(1) +#define AST_IO_VGACRD1_MCU_FW_EXECUTING BIT(5) +#define AST_IO_VGAIR1_R (0x5A)#define AST_IO_VGAIR1_VREFRESH BIT(3)
@@ -67,12 +69,10 @@#define AST_DP_VIDEO_ENABLE BIT(0)/* -* CRD1[b5]: DP MCU FW is executing * CRDC[b0]: DP link success * CRDF[b0]: DP HPD * CRE5[b0]: Host reading EDID process is done */ -#define ASTDP_MCU_FW_EXECUTING BIT(5)#define ASTDP_LINK_SUCCESS BIT(0)#define ASTDP_HPD BIT(0)#define ASTDP_HOST_EDID_READ_DONE BIT(0)
Signature · 1 line
2.45.2
Re: [PATCH 2/5] drm/ast: astdp: Test firmware status once during probing
Am 17.07.24 um 16:24 schrieb Thomas Zimmermann:
Quoted 5 lines
Test for running ASTDP firmware during probe. Do not bother testing this later. We cannot do much anyway if the firmware fails. Do not initialize the ASTDP conenctor if the test fails during device probing.
Signed-off-by Thomas Zimmermann <[email protected]>
See https://lore.kernel.org/dri-devel/[email protected]/T/#m09539bfbdad6c65a1b0bc50620025477fd8dc9d2
Quoted 171 lines
--- drivers/gpu/drm/ast/ast_dp.c | 41 +++++++++++++--------------------- drivers/gpu/drm/ast/ast_drv.h | 2 +- drivers/gpu/drm/ast/ast_main.c | 6 +++-- drivers/gpu/drm/ast/ast_post.c | 2 +- drivers/gpu/drm/ast/ast_reg.h | 4 ++-- 5 files changed, 23 insertions(+), 32 deletions(-)drivers/gpu/drm/ast/ast_dp.c +15
-26@@ -9,8 +9,6 @@bool ast_astdp_is_connected (struct ast_device *ast) { -if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,ASTDP_MCU_FW_EXECUTING )) -return false;if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ))return false;if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ))@@ -24,13 +22,11 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)u8 i =0 , j =0 ;/* -* CRD1[b5]: DP MCU FW is executing * CRDC[b0]: DP link success * CRDF[b0]: DP HPD * CRE5[b0]: Host reading EDID process is done */ -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,ASTDP_MCU_FW_EXECUTING ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) && +if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) &&ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ) &&ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK ))) {@@ -64,9 +60,7 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)*/ mdelay (j+1 ); -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 , -ASTDP_MCU_FW_EXECUTING ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC , +if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) &&ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ))) { goto err_astdp_jump_out_loop_of_edid;@@ -115,8 +109,6 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)return (~(j+256 ) +1 ); err_astdp_edid_not_ready: -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,ASTDP_MCU_FW_EXECUTING ))) -return (~0xD1 +1 );if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS )))return (~0xDC +1 );if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD )))@@ -130,32 +122,29 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)/* * Launch Aspeed DP */ -void ast_dp_launch (struct drm_device *dev) +int ast_dp_launch (struct ast_device *ast) { -u32 i =0 ; -u8 bDPExecute =1 ; -struct ast_device *ast =to_ast_device (dev); +struct drm_device *dev = &ast->base; +unsigned int i =10 ; -// Wait one second then timeout. -while (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,ASTDP_MCU_FW_EXECUTING ) != -ASTDP_MCU_FW_EXECUTING ) { - i++; -// wait 100 ms -msleep (100 ); +while (i) { +u8 vgacrd1 =ast_get_index_reg (ast,AST_IO_VGACRI ,0xd1 ); -if (i >=10 ) { -// DP would not be ready. - bDPExecute =0 ; +if (vgacrd1 &AST_IO_VGACRD1_MCU_FW_EXECUTING )break ; - } + --i; +msleep (100 ); } - -if (!bDPExecute) +if (!i) {drm_err (dev,"Wait DPMCU executing timeout\n" ); +return -ENODEV ; + }ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK ,ASTDP_HOST_EDID_READ_DONE ); + +return 0 ; }bool ast_dp_power_is_on (struct ast_device *ast)drivers/gpu/drm/ast/ast_drv.h +1
-1@@ -471,7 +471,7 @@ void ast_init_3rdtx(struct drm_device *dev);/* aspeed DP */ bool ast_astdp_is_connected (struct ast_device *ast);int ast_astdp_read_edid (struct drm_device *dev,u8 *ediddata); -void ast_dp_launch (struct drm_device *dev); +int ast_dp_launch (struct ast_device *ast);bool ast_dp_power_is_on (struct ast_device *ast);void ast_dp_power_on_off (struct drm_device *dev,bool no);void ast_dp_set_on_off (struct drm_device *dev,bool no);drivers/gpu/drm/ast/ast_main.c +4
-2@@ -115,8 +115,10 @@ static void ast_detect_tx_chip(struct ast_device *ast, bool need_post) }else if (IS_AST_GEN7 (ast)) {if (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,TX_TYPE_MASK ) ==ASTDP_DPMCU_TX ) { - ast->tx_chip_types =AST_TX_ASTDP_BIT ; -ast_dp_launch (&ast->base); +int ret =ast_dp_launch (ast); + +if (!ret) + ast->tx_chip_types =AST_TX_ASTDP_BIT ; } }drivers/gpu/drm/ast/ast_post.c +1
-1@@ -351,7 +351,7 @@ void ast_post_gpu(struct drm_device *dev)if (IS_AST_GEN7 (ast)) {if (ast->tx_chip_types &AST_TX_ASTDP_BIT ) -ast_dp_launch (dev); +ast_dp_launch (ast); }else if (ast->config_mode == ast_use_p2a) {if (IS_AST_GEN6 (ast))ast_post_chip_2500 (dev);drivers/gpu/drm/ast/ast_reg.h +2
-2@@ -37,6 +37,8 @@#define AST_IO_VGACRCB_HWC_16BPP BIT(0)/* set: ARGB4444, cleared: 2bpp palette */ #define AST_IO_VGACRCB_HWC_ENABLED BIT(1) +#define AST_IO_VGACRD1_MCU_FW_EXECUTING BIT(5) +#define AST_IO_VGAIR1_R (0x5A)#define AST_IO_VGAIR1_VREFRESH BIT(3)@@ -67,12 +69,10 @@#define AST_DP_VIDEO_ENABLE BIT(0)/* -* CRD1[b5]: DP MCU FW is executing * CRDC[b0]: DP link success * CRDF[b0]: DP HPD * CRE5[b0]: Host reading EDID process is done */ -#define ASTDP_MCU_FW_EXECUTING BIT(5)#define ASTDP_LINK_SUCCESS BIT(0)#define ASTDP_HPD BIT(0)#define ASTDP_HOST_EDID_READ_DONE BIT(0)
Signature · 7 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Re: [PATCH 2/5] drm/ast: astdp: Test firmware status once during probing
In reply to Thomas ZimmermannQuoted 4 lines · Thomas Zimmermann
Test for running ASTDP firmware during probe. Do not bother testing this later. We cannot do much anyway if the firmware fails. Do not initialize the ASTDP conenctor if the test fails during device probing.
Thanks, it looks good to me.
Quoted 172 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/ast/ast_dp.c | 41 +++++++++++++--------------------- drivers/gpu/drm/ast/ast_drv.h | 2 +- drivers/gpu/drm/ast/ast_main.c | 6 +++-- drivers/gpu/drm/ast/ast_post.c | 2 +- drivers/gpu/drm/ast/ast_reg.h | 4 ++-- 5 files changed, 23 insertions(+), 32 deletions(-)drivers/gpu/drm/ast/ast_dp.c +15
-26@@ -9,8 +9,6 @@bool ast_astdp_is_connected (struct ast_device *ast) { -if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,ASTDP_MCU_FW_EXECUTING )) -return false;if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ))return false;if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ))@@ -24,13 +22,11 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)u8 i =0 , j =0 ;/* -* CRD1[b5]: DP MCU FW is executing * CRDC[b0]: DP link success * CRDF[b0]: DP HPD * CRE5[b0]: Host reading EDID process is done */ -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,ASTDP_MCU_FW_EXECUTING ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) && +if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) &&ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ) &&ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK ))) {@@ -64,9 +60,7 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)*/ mdelay (j+1 ); -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 , -ASTDP_MCU_FW_EXECUTING ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC , +if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) &&ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ))) { goto err_astdp_jump_out_loop_of_edid;@@ -115,8 +109,6 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)return (~(j+256 ) +1 ); err_astdp_edid_not_ready: -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,ASTDP_MCU_FW_EXECUTING ))) -return (~0xD1 +1 );if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS )))return (~0xDC +1 );if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD )))@@ -130,32 +122,29 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)/* * Launch Aspeed DP */ -void ast_dp_launch (struct drm_device *dev) +int ast_dp_launch (struct ast_device *ast) { -u32 i =0 ; -u8 bDPExecute =1 ; -struct ast_device *ast =to_ast_device (dev); +struct drm_device *dev = &ast->base; +unsigned int i =10 ; -// Wait one second then timeout. -while (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,ASTDP_MCU_FW_EXECUTING ) != -ASTDP_MCU_FW_EXECUTING ) { - i++; -// wait 100 ms -msleep (100 ); +while (i) { +u8 vgacrd1 =ast_get_index_reg (ast,AST_IO_VGACRI ,0xd1 ); -if (i >=10 ) { -// DP would not be ready. - bDPExecute =0 ; +if (vgacrd1 &AST_IO_VGACRD1_MCU_FW_EXECUTING )break ; - } + --i; +msleep (100 ); } - -if (!bDPExecute) +if (!i) {drm_err (dev,"Wait DPMCU executing timeout\n" ); +return -ENODEV ; + }ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK ,ASTDP_HOST_EDID_READ_DONE ); + +return 0 ; }bool ast_dp_power_is_on (struct ast_device *ast)drivers/gpu/drm/ast/ast_drv.h +1
-1@@ -471,7 +471,7 @@ void ast_init_3rdtx(struct drm_device *dev);/* aspeed DP */ bool ast_astdp_is_connected (struct ast_device *ast);int ast_astdp_read_edid (struct drm_device *dev,u8 *ediddata); -void ast_dp_launch (struct drm_device *dev); +int ast_dp_launch (struct ast_device *ast);bool ast_dp_power_is_on (struct ast_device *ast);void ast_dp_power_on_off (struct drm_device *dev,bool no);void ast_dp_set_on_off (struct drm_device *dev,bool no);drivers/gpu/drm/ast/ast_main.c +4
-2@@ -115,8 +115,10 @@ static void ast_detect_tx_chip(struct ast_device *ast, bool need_post) }else if (IS_AST_GEN7 (ast)) {if (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD1 ,TX_TYPE_MASK ) ==ASTDP_DPMCU_TX ) { - ast->tx_chip_types =AST_TX_ASTDP_BIT ; -ast_dp_launch (&ast->base); +int ret =ast_dp_launch (ast); + +if (!ret) + ast->tx_chip_types =AST_TX_ASTDP_BIT ; } }drivers/gpu/drm/ast/ast_post.c +1
-1@@ -351,7 +351,7 @@ void ast_post_gpu(struct drm_device *dev)if (IS_AST_GEN7 (ast)) {if (ast->tx_chip_types &AST_TX_ASTDP_BIT ) -ast_dp_launch (dev); +ast_dp_launch (ast); }else if (ast->config_mode == ast_use_p2a) {if (IS_AST_GEN6 (ast))ast_post_chip_2500 (dev);drivers/gpu/drm/ast/ast_reg.h +2
-2@@ -37,6 +37,8 @@#define AST_IO_VGACRCB_HWC_16BPP BIT(0)/* set: ARGB4444, cleared: 2bpp palette */ #define AST_IO_VGACRCB_HWC_ENABLED BIT(1) +#define AST_IO_VGACRD1_MCU_FW_EXECUTING BIT(5) +#define AST_IO_VGAIR1_R (0x5A)#define AST_IO_VGAIR1_VREFRESH BIT(3)@@ -67,12 +69,10 @@#define AST_DP_VIDEO_ENABLE BIT(0)/* -* CRD1[b5]: DP MCU FW is executing * CRDC[b0]: DP link success * CRDF[b0]: DP HPD * CRE5[b0]: Host reading EDID process is done */ -#define ASTDP_MCU_FW_EXECUTING BIT(5)#define ASTDP_LINK_SUCCESS BIT(0)#define ASTDP_HPD BIT(0)#define ASTDP_HOST_EDID_READ_DONE BIT(0)
Thomas Zimmermann
maintainerPATCH 3/5 drm/ast: astdp: Only test HDP state in ast_astdp_is_connected()
In reply to Thomas ZimmermannThe overall control flow of the driver ensures that it never reads EDID or sets display state on unconnected outputs. Therefore remove all tests for Hot Plug Detection from these helpers. Also rename the register constants.
--- drivers/gpu/drm/ast/ast_dp.c | 12 +++--------- drivers/gpu/drm/ast/ast_reg.h | 3 +-- 2 files changed, 4 insertions(+), 11 deletions(-)
drivers/gpu/drm/ast/ast_dp.c +3 -9
@@ -9,7 +9,7 @@bool ast_astdp_is_connected (struct ast_device *ast) { -if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD )) +if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,AST_IO_VGACRDF_HPD ))return false;if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ))return false;
@@ -23,11 +23,9 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)/* * CRDC[b0]: DP link success -* CRDF[b0]: DP HPD * CRE5[b0]: Host reading EDID process is done */ if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ) &&ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK ))) { goto err_astdp_edid_not_ready;
@@ -61,8 +59,7 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)mdelay (j+1 );if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC , -ASTDP_LINK_SUCCESS ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ))) { +ASTDP_LINK_SUCCESS ))) { goto err_astdp_jump_out_loop_of_edid; }
@@ -111,8 +108,6 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata) err_astdp_edid_not_ready:if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS )))return (~0xDC +1 ); -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ))) -return (~0xDF +1 );if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK )))return (~0xE5 +1 );
@@ -182,8 +177,7 @@ void ast_dp_set_on_off(struct drm_device *dev, bool on)ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE3 , (u8 ) ~AST_DP_VIDEO_ENABLE , on);// If DP plug in and link successful then check video on / off status -if (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD )) { +if (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS )) { video_on_off <<=4 ;while (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_MIRROR_VIDEO_ENABLE ) != video_on_off) {
drivers/gpu/drm/ast/ast_reg.h +1 -2
@@ -38,6 +38,7 @@#define AST_IO_VGACRCB_HWC_ENABLED BIT(1)#define AST_IO_VGACRD1_MCU_FW_EXECUTING BIT(5) +#define AST_IO_VGACRDF_HPD BIT(0)#define AST_IO_VGAIR1_R (0x5A)#define AST_IO_VGAIR1_VREFRESH BIT(3)
@@ -70,11 +71,9 @@/* * CRDC[b0]: DP link success -* CRDF[b0]: DP HPD * CRE5[b0]: Host reading EDID process is done */ #define ASTDP_LINK_SUCCESS BIT(0) -#define ASTDP_HPD BIT(0)#define ASTDP_HOST_EDID_READ_DONE BIT(0)#define ASTDP_HOST_EDID_READ_DONE_MASK GENMASK(0, 0)
Signature · 1 line
2.45.2
Re: [PATCH 3/5] drm/ast: astdp: Only test HDP state in ast_astdp_is_connected()
Quoted 4 lines · Thomas Zimmermann
The overall control flow of the driver ensures that it never reads EDID or sets display state on unconnected outputs. Therefore remove all tests for Hot Plug Detection from these helpers. Also rename the register constants.
Thanks, it looks good to me.
Quoted 85 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/ast/ast_dp.c | 12 +++--------- drivers/gpu/drm/ast/ast_reg.h | 3 +-- 2 files changed, 4 insertions(+), 11 deletions(-)drivers/gpu/drm/ast/ast_dp.c +3
-9@@ -9,7 +9,7 @@bool ast_astdp_is_connected (struct ast_device *ast) { -if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD )) +if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,AST_IO_VGACRDF_HPD ))return false;if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ))return false;@@ -23,11 +23,9 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)/* * CRDC[b0]: DP link success -* CRDF[b0]: DP HPD * CRE5[b0]: Host reading EDID process is done */ if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ) &&ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK ))) { goto err_astdp_edid_not_ready;@@ -61,8 +59,7 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)mdelay (j+1 );if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC , -ASTDP_LINK_SUCCESS ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ))) { +ASTDP_LINK_SUCCESS ))) { goto err_astdp_jump_out_loop_of_edid; }@@ -111,8 +108,6 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata) err_astdp_edid_not_ready:if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS )))return (~0xDC +1 ); -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD ))) -return (~0xDF +1 );if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK )))return (~0xE5 +1 );@@ -182,8 +177,7 @@ void ast_dp_set_on_off(struct drm_device *dev, bool on)ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE3 , (u8 ) ~AST_DP_VIDEO_ENABLE , on);// If DP plug in and link successful then check video on / off status -if (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_HPD )) { +if (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS )) { video_on_off <<=4 ;while (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_MIRROR_VIDEO_ENABLE ) != video_on_off) {drivers/gpu/drm/ast/ast_reg.h +1
-2@@ -38,6 +38,7 @@#define AST_IO_VGACRCB_HWC_ENABLED BIT(1)#define AST_IO_VGACRD1_MCU_FW_EXECUTING BIT(5) +#define AST_IO_VGACRDF_HPD BIT(0)#define AST_IO_VGAIR1_R (0x5A)#define AST_IO_VGAIR1_VREFRESH BIT(3)@@ -70,11 +71,9 @@/* * CRDC[b0]: DP link success -* CRDF[b0]: DP HPD * CRE5[b0]: Host reading EDID process is done */ #define ASTDP_LINK_SUCCESS BIT(0) -#define ASTDP_HPD BIT(0)#define ASTDP_HOST_EDID_READ_DONE BIT(0)#define ASTDP_HOST_EDID_READ_DONE_MASK GENMASK(0, 0)
Thomas Zimmermann
maintainerPATCH 4/5 drm/ast: astdp: Perform link training during atomic_enable
In reply to Thomas ZimmermannThe place for link training is in the encoder's atomic_enable helper. Remove all related tests from other helper ASTDP functions; especially ast_astdp_is_connected(), which tests HPD status.
DP link training is controlled by the firmware. A status flag reports success or failure. The process can be fragile on Aspeed hardware. Moving the test from connector detection to the atomic_enable allows for several retries and a longer timeout.
--- drivers/gpu/drm/ast/ast_dp.c | 45 +++++++++++++++++----------------- drivers/gpu/drm/ast/ast_drv.h | 1 + drivers/gpu/drm/ast/ast_mode.c | 2 ++ drivers/gpu/drm/ast/ast_reg.h | 3 +-- 4 files changed, 26 insertions(+), 25 deletions(-)
drivers/gpu/drm/ast/ast_dp.c +22 -23
@@ -11,8 +11,6 @@ bool ast_astdp_is_connected(struct ast_device *ast) {if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,AST_IO_VGACRDF_HPD ))return false; -if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS )) -return false;return true; }
@@ -22,14 +20,10 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)u8 i =0 , j =0 ;/* -* CRDC[b0]: DP link success * CRE5[b0]: Host reading EDID process is done */ -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , -ASTDP_HOST_EDID_READ_DONE_MASK ))) { +if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK ))) goto err_astdp_edid_not_ready; - }ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK ,0x00 );
@@ -58,11 +52,6 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)*/ mdelay (j+1 ); -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC , -ASTDP_LINK_SUCCESS ))) { - goto err_astdp_jump_out_loop_of_edid; - } - j++;if (j >200 ) goto err_astdp_jump_out_loop_of_edid;
@@ -106,8 +95,6 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)return (~(j+256 ) +1 ); err_astdp_edid_not_ready: -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ))) -return (~0xDC +1 );if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK )))return (~0xE5 +1 );
@@ -165,7 +152,22 @@ void ast_dp_power_on_off(struct drm_device *dev, bool on)ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE3 , (u8 ) ~AST_DP_PHY_SLEEP , bE3); } +void ast_dp_link_training (struct ast_device *ast) +{ +struct drm_device *dev = &ast->base; +unsigned int i =10 ; + +while (i--) { +u8 vgacrdc =ast_get_index_reg (ast,AST_IO_VGACRI ,0xdc ); +if (vgacrdc &AST_IO_VGACRDC_LINK_SUCCESS ) +break ; +if (i) +msleep (100 ); + } +if (!i) +drm_err (dev,"Link training failed\n" ); +}void ast_dp_set_on_off (struct drm_device *dev,bool on) {
@@ -176,16 +178,13 @@ void ast_dp_set_on_off(struct drm_device *dev, bool on)// Video On/Off ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE3 , (u8 ) ~AST_DP_VIDEO_ENABLE , on); -// If DP plug in and link successful then check video on / off status -if (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS )) { - video_on_off <<=4 ; -while (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF , + video_on_off <<=4 ; +while (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_MIRROR_VIDEO_ENABLE ) != video_on_off) { -// wait 1 ms -mdelay (1 ); -if (++i >200 ) -break ; - } +// wait 1 ms +mdelay (1 ); +if (++i >200 ) +break ; } }
drivers/gpu/drm/ast/ast_drv.h +1 -0
@@ -474,6 +474,7 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata);int ast_dp_launch (struct ast_device *ast);bool ast_dp_power_is_on (struct ast_device *ast);void ast_dp_power_on_off (struct drm_device *dev,bool no); +void ast_dp_link_training (struct ast_device *ast);void ast_dp_set_on_off (struct drm_device *dev,bool no);void ast_dp_set_mode (struct drm_crtc *crtc,struct ast_vbios_mode_info *vbios_mode);
drivers/gpu/drm/ast/ast_mode.c +2 -0
@@ -1622,6 +1622,8 @@ static void ast_astdp_encoder_helper_atomic_enable(struct drm_encoder *encoder,struct ast_device *ast =to_ast_device (dev);ast_dp_power_on_off (dev,AST_DP_POWER_ON ); +ast_dp_link_training (ast); +ast_wait_for_vretrace (ast);ast_dp_set_on_off (dev,1 ); }
drivers/gpu/drm/ast/ast_reg.h +1 -2
@@ -38,6 +38,7 @@#define AST_IO_VGACRCB_HWC_ENABLED BIT(1)#define AST_IO_VGACRD1_MCU_FW_EXECUTING BIT(5) +#define AST_IO_VGACRDC_LINK_SUCCESS BIT(0)#define AST_IO_VGACRDF_HPD BIT(0)#define AST_IO_VGAIR1_R (0x5A)
@@ -70,10 +71,8 @@#define AST_DP_VIDEO_ENABLE BIT(0)/* -* CRDC[b0]: DP link success * CRE5[b0]: Host reading EDID process is done */ -#define ASTDP_LINK_SUCCESS BIT(0)#define ASTDP_HOST_EDID_READ_DONE BIT(0)#define ASTDP_HOST_EDID_READ_DONE_MASK GENMASK(0, 0)
Signature · 1 line
2.45.2
Re: [PATCH 4/5] drm/ast: astdp: Perform link training during atomic_enable
Quoted 9 lines · Thomas Zimmermann
The place for link training is in the encoder's
atomic_enablehelper. Remove all related tests from other helper ASTDP functions; especiallyast_astdp_is_connected(), which tests HPD status.DP link training is controlled by the firmware. A status flag reports success or failure. The process can be fragile on Aspeed hardware. Moving the test from connector detection to the
atomic_enableallows for several retries and a longer timeout.
Thanks, it looks good to me.
Quoted 152 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/ast/ast_dp.c | 45 +++++++++++++++++----------------- drivers/gpu/drm/ast/ast_drv.h | 1 + drivers/gpu/drm/ast/ast_mode.c | 2 ++ drivers/gpu/drm/ast/ast_reg.h | 3 +-- 4 files changed, 26 insertions(+), 25 deletions(-)drivers/gpu/drm/ast/ast_dp.c +22
-23@@ -11,8 +11,6 @@ bool ast_astdp_is_connected(struct ast_device *ast) {if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,AST_IO_VGACRDF_HPD ))return false; -if (!ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS )) -return false;return true; }@@ -22,14 +20,10 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)u8 i =0 , j =0 ;/* -* CRDC[b0]: DP link success * CRE5[b0]: Host reading EDID process is done */ -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ) && -ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , -ASTDP_HOST_EDID_READ_DONE_MASK ))) { +if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK ))) goto err_astdp_edid_not_ready; - }ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK ,0x00 );@@ -58,11 +52,6 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)*/ mdelay (j+1 ); -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC , -ASTDP_LINK_SUCCESS ))) { - goto err_astdp_jump_out_loop_of_edid; - } - j++;if (j >200 ) goto err_astdp_jump_out_loop_of_edid;@@ -106,8 +95,6 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)return (~(j+256 ) +1 ); err_astdp_edid_not_ready: -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS ))) -return (~0xDC +1 );if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK )))return (~0xE5 +1 );@@ -165,7 +152,22 @@ void ast_dp_power_on_off(struct drm_device *dev, bool on)ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE3 , (u8 ) ~AST_DP_PHY_SLEEP , bE3); } +void ast_dp_link_training (struct ast_device *ast) +{ +struct drm_device *dev = &ast->base; +unsigned int i =10 ; + +while (i--) { +u8 vgacrdc =ast_get_index_reg (ast,AST_IO_VGACRI ,0xdc ); +if (vgacrdc &AST_IO_VGACRDC_LINK_SUCCESS ) +break ; +if (i) +msleep (100 ); + } +if (!i) +drm_err (dev,"Link training failed\n" ); +}void ast_dp_set_on_off (struct drm_device *dev,bool on) {@@ -176,16 +178,13 @@ void ast_dp_set_on_off(struct drm_device *dev, bool on)// Video On/Off ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE3 , (u8 ) ~AST_DP_VIDEO_ENABLE , on); -// If DP plug in and link successful then check video on / off status -if (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDC ,ASTDP_LINK_SUCCESS )) { - video_on_off <<=4 ; -while (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF , + video_on_off <<=4 ; +while (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDF ,ASTDP_MIRROR_VIDEO_ENABLE ) != video_on_off) { -// wait 1 ms -mdelay (1 ); -if (++i >200 ) -break ; - } +// wait 1 ms +mdelay (1 ); +if (++i >200 ) +break ; } }drivers/gpu/drm/ast/ast_drv.h +1
-0@@ -474,6 +474,7 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata);int ast_dp_launch (struct ast_device *ast);bool ast_dp_power_is_on (struct ast_device *ast);void ast_dp_power_on_off (struct drm_device *dev,bool no); +void ast_dp_link_training (struct ast_device *ast);void ast_dp_set_on_off (struct drm_device *dev,bool no);void ast_dp_set_mode (struct drm_crtc *crtc,struct ast_vbios_mode_info *vbios_mode);drivers/gpu/drm/ast/ast_mode.c +2
-0@@ -1622,6 +1622,8 @@ static void ast_astdp_encoder_helper_atomic_enable(struct drm_encoder *encoder,struct ast_device *ast =to_ast_device (dev);ast_dp_power_on_off (dev,AST_DP_POWER_ON ); +ast_dp_link_training (ast); +ast_wait_for_vretrace (ast);ast_dp_set_on_off (dev,1 ); }drivers/gpu/drm/ast/ast_reg.h +1
-2@@ -38,6 +38,7 @@#define AST_IO_VGACRCB_HWC_ENABLED BIT(1)#define AST_IO_VGACRD1_MCU_FW_EXECUTING BIT(5) +#define AST_IO_VGACRDC_LINK_SUCCESS BIT(0)#define AST_IO_VGACRDF_HPD BIT(0)#define AST_IO_VGAIR1_R (0x5A)@@ -70,10 +71,8 @@#define AST_DP_VIDEO_ENABLE BIT(0)/* -* CRDC[b0]: DP link success * CRE5[b0]: Host reading EDID process is done */ -#define ASTDP_LINK_SUCCESS BIT(0)#define ASTDP_HOST_EDID_READ_DONE BIT(0)#define ASTDP_HOST_EDID_READ_DONE_MASK GENMASK(0, 0)
Thomas Zimmermann
maintainerPATCH 5/5 drm/ast: astdp: Clean up EDID reading
In reply to Thomas ZimmermannSimplify ast_astdp_read_edid(). Rename register constants. Drop unnecessary error handling. On success, the helper returns 0; an error code otherwise.
--- drivers/gpu/drm/ast/ast_dp.c | 93 ++++++++++++++++------------------- drivers/gpu/drm/ast/ast_reg.h | 12 +---- 2 files changed, 44 insertions(+), 61 deletions(-)
drivers/gpu/drm/ast/ast_dp.c +42 -51
@@ -17,54 +17,55 @@ bool ast_astdp_is_connected(struct ast_device *ast)int ast_astdp_read_edid (struct drm_device *dev,u8 *ediddata) {struct ast_device *ast =to_ast_device (dev); -u8 i =0 , j =0 ; +int ret =0 ; +u8 i; -/* -* CRE5[b0]: Host reading EDID process is done -*/ -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK ))) - goto err_astdp_edid_not_ready; - -ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK , -0x00 ); +/* Start reading EDID data */ +ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xe5 , (u8 )~AST_IO_VGACRE5_EDID_READ_DONE ,0x00 );for (i =0 ; i <32 ; i++) { +unsigned int j; +/* * CRE4[7:0]: Read-Pointer for EDID (Unit: 4bytes); valid range: 0~64 */ -ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE4 , -ASTDP_AND_CLEAR_MASK , (u8 )i); - j =0 ; +ast_set_index_reg (ast,AST_IO_VGACRI ,0xe4 , i);/* * CRD7[b0]: valid flag for EDID * CRD6[b0]: mirror read pointer for EDID */ -while ((ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD7 , -ASTDP_EDID_VALID_FLAG_MASK ) !=0x01 ) || - (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD6 , -ASTDP_EDID_READ_POINTER_MASK ) != i)) { +for (j =0 ; j <200 ; ++j) { +u8 vgacrd7, vgacrd6; +/* * Delay are getting longer with each retry. -* 1. The Delays are often 2 loops when users request "Display Settings" +* +* 1. No delay on first try +* 2. The Delays are often 2 loops when users request "Display Settings" * of right-click of mouse. -* 2. The Delays are often longer a lot when system resume from S3/S4. +* 3. The Delays are often longer a lot when system resume from S3/S4. */ -mdelay (j+1 ); - - j++; -if (j >200 ) - goto err_astdp_jump_out_loop_of_edid; +if (j) +mdelay (j +1 ); + +/* Wait for EDID offset to show up in mirror register */ + vgacrd7 =ast_get_index_reg (ast,AST_IO_VGACRI ,0xd7 ); +if (vgacrd7 &AST_IO_VGACRD7_EDID_VALID_FLAG ) { + vgacrd6 =ast_get_index_reg (ast,AST_IO_VGACRI ,0xd6 ); +if (vgacrd6 == i) +break ; + } + } +if (j ==200 ) { + ret = -EBUSY ; + goto out; } - *(ediddata) =ast_get_index_reg_mask (ast,AST_IO_VGACRI , -0xD8 ,ASTDP_EDID_READ_DATA_MASK ); - *(ediddata +1 ) =ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD9 , -ASTDP_EDID_READ_DATA_MASK ); - *(ediddata +2 ) =ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDA , -ASTDP_EDID_READ_DATA_MASK ); - *(ediddata +3 ) =ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDB , -ASTDP_EDID_READ_DATA_MASK ); + ediddata[0 ] =ast_get_index_reg (ast,AST_IO_VGACRI ,0xd8 ); + ediddata[1 ] =ast_get_index_reg (ast,AST_IO_VGACRI ,0xd9 ); + ediddata[2 ] =ast_get_index_reg (ast,AST_IO_VGACRI ,0xda ); + ediddata[3 ] =ast_get_index_reg (ast,AST_IO_VGACRI ,0xdb );if (i ==31 ) {/*
@@ -76,29 +77,19 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)* The Bytes-126 indicates the Number of extensions to * follow. 0 represents noextensions. */ - *(ediddata +3 ) = *(ediddata +3 ) + *(ediddata +2 ); - *(ediddata +2 ) =0 ; + ediddata[3 ] = ediddata[3 ] + ediddata[2 ]; + ediddata[2 ] =0 ; } ediddata +=4 ; } -ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK , -ASTDP_HOST_EDID_READ_DONE ); - -return 0 ; - -err_astdp_jump_out_loop_of_edid: -ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , - (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK , -ASTDP_HOST_EDID_READ_DONE ); -return (~(j+256 ) +1 ); - -err_astdp_edid_not_ready: -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK ))) -return (~0xE5 +1 ); +out: +/* Signal end of reading */ +ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xe5 , (u8 )~AST_IO_VGACRE5_EDID_READ_DONE , +AST_IO_VGACRE5_EDID_READ_DONE ); -return 0 ; +return ret; }/*
@@ -122,9 +113,9 @@ int ast_dp_launch(struct ast_device *ast)return -ENODEV ; } -ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , - (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK , -ASTDP_HOST_EDID_READ_DONE ); +ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xe5 , + (u8 ) ~AST_IO_VGACRE5_EDID_READ_DONE , +AST_IO_VGACRE5_EDID_READ_DONE );return 0 ; }
drivers/gpu/drm/ast/ast_reg.h +2 -10
@@ -38,8 +38,10 @@#define AST_IO_VGACRCB_HWC_ENABLED BIT(1)#define AST_IO_VGACRD1_MCU_FW_EXECUTING BIT(5) +#define AST_IO_VGACRD7_EDID_VALID_FLAG BIT(0)#define AST_IO_VGACRDC_LINK_SUCCESS BIT(0)#define AST_IO_VGACRDF_HPD BIT(0) +#define AST_IO_VGACRE5_EDID_READ_DONE BIT(0)#define AST_IO_VGAIR1_R (0x5A)#define AST_IO_VGAIR1_VREFRESH BIT(3)
@@ -70,12 +72,6 @@#define AST_DP_PHY_SLEEP BIT(4)#define AST_DP_VIDEO_ENABLE BIT(0) -/* -* CRE5[b0]: Host reading EDID process is done -*/ -#define ASTDP_HOST_EDID_READ_DONE BIT(0) -#define ASTDP_HOST_EDID_READ_DONE_MASK GENMASK(0, 0) -/* * CRDF[b4]: Mirror of AST_DP_VIDEO_ENABLE * Precondition: A. ~AST_DP_PHY_SLEEP &&
@@ -84,10 +80,6 @@*/ #define ASTDP_MIRROR_VIDEO_ENABLE BIT(4) -#define ASTDP_EDID_READ_POINTER_MASK GENMASK(7, 0) -#define ASTDP_EDID_VALID_FLAG_MASK GENMASK(0, 0) -#define ASTDP_EDID_READ_DATA_MASK GENMASK(7, 0) -/* * ASTDP setmode registers: * CRE0[7:0]: MISC0 ((0x00: 18-bpp) or (0x20: 24-bpp)
Signature · 1 line
2.45.2
Re: [PATCH 5/5] drm/ast: astdp: Clean up EDID reading
Quoted 3 lines · Thomas Zimmermann
Simplify
ast_astdp_read_edid(). Rename register constants. Drop unnecessary error handling. On success, the helper returns 0; an error code otherwise.
Thanks, it looks good to me.
Quoted 187 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/ast/ast_dp.c | 93 ++++++++++++++++------------------- drivers/gpu/drm/ast/ast_reg.h | 12 +---- 2 files changed, 44 insertions(+), 61 deletions(-)drivers/gpu/drm/ast/ast_dp.c +42
-51@@ -17,54 +17,55 @@ bool ast_astdp_is_connected(struct ast_device *ast)int ast_astdp_read_edid (struct drm_device *dev,u8 *ediddata) {struct ast_device *ast =to_ast_device (dev); -u8 i =0 , j =0 ; +int ret =0 ; +u8 i; -/* -* CRE5[b0]: Host reading EDID process is done -*/ -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK ))) - goto err_astdp_edid_not_ready; - -ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK , -0x00 ); +/* Start reading EDID data */ +ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xe5 , (u8 )~AST_IO_VGACRE5_EDID_READ_DONE ,0x00 );for (i =0 ; i <32 ; i++) { +unsigned int j; +/* * CRE4[7:0]: Read-Pointer for EDID (Unit: 4bytes); valid range: 0~64 */ -ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE4 , -ASTDP_AND_CLEAR_MASK , (u8 )i); - j =0 ; +ast_set_index_reg (ast,AST_IO_VGACRI ,0xe4 , i);/* * CRD7[b0]: valid flag for EDID * CRD6[b0]: mirror read pointer for EDID */ -while ((ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD7 , -ASTDP_EDID_VALID_FLAG_MASK ) !=0x01 ) || - (ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD6 , -ASTDP_EDID_READ_POINTER_MASK ) != i)) { +for (j =0 ; j <200 ; ++j) { +u8 vgacrd7, vgacrd6; +/* * Delay are getting longer with each retry. -* 1. The Delays are often 2 loops when users request "Display Settings" +* +* 1. No delay on first try +* 2. The Delays are often 2 loops when users request "Display Settings" * of right-click of mouse. -* 2. The Delays are often longer a lot when system resume from S3/S4. +* 3. The Delays are often longer a lot when system resume from S3/S4. */ -mdelay (j+1 ); - - j++; -if (j >200 ) - goto err_astdp_jump_out_loop_of_edid; +if (j) +mdelay (j +1 ); + +/* Wait for EDID offset to show up in mirror register */ + vgacrd7 =ast_get_index_reg (ast,AST_IO_VGACRI ,0xd7 ); +if (vgacrd7 &AST_IO_VGACRD7_EDID_VALID_FLAG ) { + vgacrd6 =ast_get_index_reg (ast,AST_IO_VGACRI ,0xd6 ); +if (vgacrd6 == i) +break ; + } + } +if (j ==200 ) { + ret = -EBUSY ; + goto out; } - *(ediddata) =ast_get_index_reg_mask (ast,AST_IO_VGACRI , -0xD8 ,ASTDP_EDID_READ_DATA_MASK ); - *(ediddata +1 ) =ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xD9 , -ASTDP_EDID_READ_DATA_MASK ); - *(ediddata +2 ) =ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDA , -ASTDP_EDID_READ_DATA_MASK ); - *(ediddata +3 ) =ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xDB , -ASTDP_EDID_READ_DATA_MASK ); + ediddata[0 ] =ast_get_index_reg (ast,AST_IO_VGACRI ,0xd8 ); + ediddata[1 ] =ast_get_index_reg (ast,AST_IO_VGACRI ,0xd9 ); + ediddata[2 ] =ast_get_index_reg (ast,AST_IO_VGACRI ,0xda ); + ediddata[3 ] =ast_get_index_reg (ast,AST_IO_VGACRI ,0xdb );if (i ==31 ) {/* @@ -76,29 +77,19 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)* The Bytes-126 indicates the Number of extensions to * follow. 0 represents noextensions. */ - *(ediddata +3 ) = *(ediddata +3 ) + *(ediddata +2 ); - *(ediddata +2 ) =0 ; + ediddata[3 ] = ediddata[3 ] + ediddata[2 ]; + ediddata[2 ] =0 ; } ediddata +=4 ; } -ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK , -ASTDP_HOST_EDID_READ_DONE ); - -return 0 ; - -err_astdp_jump_out_loop_of_edid: -ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , - (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK , -ASTDP_HOST_EDID_READ_DONE ); -return (~(j+256 ) +1 ); - -err_astdp_edid_not_ready: -if (!(ast_get_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 ,ASTDP_HOST_EDID_READ_DONE_MASK ))) -return (~0xE5 +1 ); +out: +/* Signal end of reading */ +ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xe5 , (u8 )~AST_IO_VGACRE5_EDID_READ_DONE , +AST_IO_VGACRE5_EDID_READ_DONE ); -return 0 ; +return ret; }/* @@ -122,9 +113,9 @@ int ast_dp_launch(struct ast_device *ast)return -ENODEV ; } -ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xE5 , - (u8 ) ~ASTDP_HOST_EDID_READ_DONE_MASK , -ASTDP_HOST_EDID_READ_DONE ); +ast_set_index_reg_mask (ast,AST_IO_VGACRI ,0xe5 , + (u8 ) ~AST_IO_VGACRE5_EDID_READ_DONE , +AST_IO_VGACRE5_EDID_READ_DONE );return 0 ; }drivers/gpu/drm/ast/ast_reg.h +2
-10@@ -38,8 +38,10 @@#define AST_IO_VGACRCB_HWC_ENABLED BIT(1)#define AST_IO_VGACRD1_MCU_FW_EXECUTING BIT(5) +#define AST_IO_VGACRD7_EDID_VALID_FLAG BIT(0)#define AST_IO_VGACRDC_LINK_SUCCESS BIT(0)#define AST_IO_VGACRDF_HPD BIT(0) +#define AST_IO_VGACRE5_EDID_READ_DONE BIT(0)#define AST_IO_VGAIR1_R (0x5A)#define AST_IO_VGAIR1_VREFRESH BIT(3)@@ -70,12 +72,6 @@#define AST_DP_PHY_SLEEP BIT(4)#define AST_DP_VIDEO_ENABLE BIT(0) -/* -* CRE5[b0]: Host reading EDID process is done -*/ -#define ASTDP_HOST_EDID_READ_DONE BIT(0) -#define ASTDP_HOST_EDID_READ_DONE_MASK GENMASK(0, 0) -/* * CRDF[b4]: Mirror of AST_DP_VIDEO_ENABLE * Precondition: A. ~AST_DP_PHY_SLEEP && @@ -84,10 +80,6 @@*/ #define ASTDP_MIRROR_VIDEO_ENABLE BIT(4) -#define ASTDP_EDID_READ_POINTER_MASK GENMASK(7, 0) -#define ASTDP_EDID_VALID_FLAG_MASK GENMASK(0, 0) -#define ASTDP_EDID_READ_DATA_MASK GENMASK(7, 0) -/* * ASTDP setmode registers: * CRE0[7:0]: MISC0 ((0x00: 18-bpp) or (0x20: 24-bpp)
Thomas Zimmermann
maintainerPing for review
Am 17.07.24 um 16:24 schrieb Thomas Zimmermann:
Quoted 34 lines
Here are a number of updates for ast's ASTDP transmitter code.
So far the ast driver required the DisplayPort to be connected at boot. Later detection was not supported. Re-connecting the cable was also not supported. Once
atomic_disablepowered off the physical ASTDP connector, there was no way of detecting a conencted display. Patch 1 makes Hot Plug Detection work. If ncesessary, the connector's detect helper powers up the physical connector to read the HPD status.That's a good oportunity to clean up ast's whole detection code for ASTDP transmitters. So patch 2 to 4 remove duplicated status tests throughout the ASTDP code.
Patch 5 simplified the code for reading the display's EDID data from the firmware.
Tested on AST2600 hardware with an ASTDP transmitter.
Thomas Zimmermann (5):
drm/ast: astdp: Wake up during connector status detection drm/ast: astdp: Test firmware status once during probing drm/ast: astdp: Only test HDP state inast_astdp_is_connected()drm/ast: astdp: Perform link training duringatomic_enabledrm/ast: astdp: Clean up EDID readingdrivers/gpu/drm/ast/ast_dp.c | 186 +++++++++++++++------------------ drivers/gpu/drm/ast/ast_drv.h | 4 +- drivers/gpu/drm/ast/ast_main.c | 6 +- drivers/gpu/drm/ast/ast_mode.c | 31 +++++- drivers/gpu/drm/ast/ast_post.c | 2 +- drivers/gpu/drm/ast/ast_reg.h | 22 ++-- 6 files changed, 126 insertions(+), 125 deletions(-)
Signature · 7 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)