On Tue, May 31, 2022 at 1:15 PM Thomas Zimmermann <tzimmermann@xxxxxxx> wrote:
>
> Systems with AST graphics can have multiple output; typically VGA
> plus some other port. Record detected output chips in a bitmask and
> initialize each output on its own.
>
> Assume a VGA output by default and use SIL164 and DP501 if available.
> For ASTDP assume that it can run in parallel with VGA.
>
> Tested on AST2100.
>
> v2:
> * make VGA/SIL164/DP501 mutually exclusive
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
> Fixes: a59b026419f3 ("drm/ast: Initialize encoder and connector for VGA in helper function")
> Cc: Thomas Zimmermann <tzimmermann@xxxxxxx>
> Cc: Javier Martinez Canillas <javierm@xxxxxxxxxx>
> Cc: Dave Airlie <airlied@xxxxxxxxxx>
> Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
> ---
> drivers/gpu/drm/ast/ast_dp.c | 5 ++---
> drivers/gpu/drm/ast/ast_dp501.c | 2 +-
> drivers/gpu/drm/ast/ast_drv.h | 4 ++--
> drivers/gpu/drm/ast/ast_main.c | 21 ++++++++----------
> drivers/gpu/drm/ast/ast_mode.c | 38 ++++++++++++++++++---------------
> drivers/gpu/drm/ast/ast_post.c | 2 +-
> 6 files changed, 36 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/ast/ast_dp.c b/drivers/gpu/drm/ast/ast_dp.c
> index 4551bc8a3ecf..f573d582407e 100644
> --- a/drivers/gpu/drm/ast/ast_dp.c
> +++ b/drivers/gpu/drm/ast/ast_dp.c
> @@ -160,13 +160,12 @@ void ast_dp_launch(struct drm_device *dev, u8 bPower)
> }
>
> if (bDPExecute)
> - ast->tx_chip_type = AST_TX_ASTDP;
> + ast->tx_chip_types |= BIT(AST_TX_ASTDP);
Hi Thomas,
Just a matter of taste but an alternative to using the BIT macro
everywhere is to just define all the AST_TX_* as bits directly and get
rid of the enum ast_tx_chip.
Either way is fine with me.
Reviewed-by: Patrik Jakobsson <patrik.r.jakobsson@xxxxxxxxx>
>
> ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xE5,
> (u8) ~ASTDP_HOST_EDID_READ_DONE_MASK,
> ASTDP_HOST_EDID_READ_DONE);
> - } else
> - ast->tx_chip_type = AST_TX_NONE;
> + }
> }
>
>
> diff --git a/drivers/gpu/drm/ast/ast_dp501.c b/drivers/gpu/drm/ast/ast_dp501.c
> index 204c926a18ea..4f75a9efb610 100644
> --- a/drivers/gpu/drm/ast/ast_dp501.c
> +++ b/drivers/gpu/drm/ast/ast_dp501.c
> @@ -450,7 +450,7 @@ void ast_init_3rdtx(struct drm_device *dev)
> ast_init_dvo(dev);
> break;
> default:
> - if (ast->tx_chip_type == AST_TX_SIL164)
> + if (ast->tx_chip_types & BIT(AST_TX_SIL164))
> ast_init_dvo(dev);
> else
> ast_init_analog(dev);
> diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
> index afebe35f205e..3055b0be7b67 100644
> --- a/drivers/gpu/drm/ast/ast_drv.h
> +++ b/drivers/gpu/drm/ast/ast_drv.h
> @@ -173,7 +173,7 @@ struct ast_private {
> struct drm_plane primary_plane;
> struct ast_cursor_plane cursor_plane;
> struct drm_crtc crtc;
> - union {
> + struct {
> struct {
> struct drm_encoder encoder;
> struct ast_vga_connector vga_connector;
> @@ -199,7 +199,7 @@ struct ast_private {
> ast_use_defaults
> } config_mode;
>
> - enum ast_tx_chip tx_chip_type;
> + unsigned long tx_chip_types; /* bitfield of enum ast_chip_type */
> u8 *dp501_fw_addr;
> const struct firmware *dp501_fw; /* dp501 fw */
> };
> diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
> index d770d5a23c1a..50b8d51382c7 100644
> --- a/drivers/gpu/drm/ast/ast_main.c
> +++ b/drivers/gpu/drm/ast/ast_main.c
> @@ -216,7 +216,7 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)
> }
>
> /* Check 3rd Tx option (digital output afaik) */
> - ast->tx_chip_type = AST_TX_NONE;
> + ast->tx_chip_types |= BIT(AST_TX_NONE);
>
> /*
> * VGACRA3 Enhanced Color Mode Register, check if DVO is already
> @@ -229,7 +229,7 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)
> if (!*need_post) {
> jreg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa3, 0xff);
> if (jreg & 0x80)
> - ast->tx_chip_type = AST_TX_SIL164;
> + ast->tx_chip_types = BIT(AST_TX_SIL164);
> }
>
> if ((ast->chip == AST2300) || (ast->chip == AST2400) || (ast->chip == AST2500)) {
> @@ -241,7 +241,7 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)
> jreg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd1, 0xff);
> switch (jreg) {
> case 0x04:
> - ast->tx_chip_type = AST_TX_SIL164;
> + ast->tx_chip_types = BIT(AST_TX_SIL164);
> break;
> case 0x08:
> ast->dp501_fw_addr = drmm_kzalloc(dev, 32*1024, GFP_KERNEL);
> @@ -254,22 +254,19 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)
> }
> fallthrough;
> case 0x0c:
> - ast->tx_chip_type = AST_TX_DP501;
> + ast->tx_chip_types = BIT(AST_TX_DP501);
> }
> } else if (ast->chip == AST2600)
> ast_dp_launch(&ast->base, 0);
>
> /* Print stuff for diagnostic purposes */
> - switch(ast->tx_chip_type) {
> - case AST_TX_SIL164:
> + if (ast->tx_chip_types & BIT(AST_TX_NONE))
> + drm_info(dev, "Using analog VGA\n");
> + if (ast->tx_chip_types & BIT(AST_TX_SIL164))
> drm_info(dev, "Using Sil164 TMDS transmitter\n");
> - break;
> - case AST_TX_DP501:
> + if (ast->tx_chip_types & BIT(AST_TX_DP501))
> drm_info(dev, "Using DP501 DisplayPort transmitter\n");
> - break;
> - default:
> - drm_info(dev, "Analog VGA only\n");
> - }
> +
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
> index 323af2746aa9..e19dd2f9b3ce 100644
> --- a/drivers/gpu/drm/ast/ast_mode.c
> +++ b/drivers/gpu/drm/ast/ast_mode.c
> @@ -997,10 +997,10 @@ static void ast_crtc_dpms(struct drm_crtc *crtc, int mode)
> case DRM_MODE_DPMS_ON:
> ast_set_index_reg_mask(ast, AST_IO_SEQ_PORT, 0x01, 0xdf, 0);
> ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0xfc, 0);
> - if (ast->tx_chip_type == AST_TX_DP501)
> + if (ast->tx_chip_types & BIT(AST_TX_DP501))
> ast_set_dp501_video_output(crtc->dev, 1);
>
> - if (ast->tx_chip_type == AST_TX_ASTDP) {
> + if (ast->tx_chip_types & BIT(AST_TX_ASTDP)) {
> ast_dp_power_on_off(crtc->dev, AST_DP_POWER_ON);
> ast_wait_for_vretrace(ast);
> ast_dp_set_on_off(crtc->dev, 1);
> @@ -1012,17 +1012,17 @@ static void ast_crtc_dpms(struct drm_crtc *crtc, int mode)
> case DRM_MODE_DPMS_SUSPEND:
> case DRM_MODE_DPMS_OFF:
> ch = mode;
> - if (ast->tx_chip_type == AST_TX_DP501)
> + if (ast->tx_chip_types & BIT(AST_TX_DP501))
> ast_set_dp501_video_output(crtc->dev, 0);
> - break;
>
> - if (ast->tx_chip_type == AST_TX_ASTDP) {
> + if (ast->tx_chip_types & BIT(AST_TX_ASTDP)) {
> ast_dp_set_on_off(crtc->dev, 0);
> ast_dp_power_on_off(crtc->dev, AST_DP_POWER_OFF);
> }
>
> ast_set_index_reg_mask(ast, AST_IO_SEQ_PORT, 0x01, 0xdf, 0x20);
> ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0xfc, ch);
> + break;
> }
> }
>
> @@ -1155,7 +1155,7 @@ ast_crtc_helper_atomic_flush(struct drm_crtc *crtc,
> ast_crtc_load_lut(ast, crtc);
>
> //Set Aspeed Display-Port
> - if (ast->tx_chip_type == AST_TX_ASTDP)
> + if (ast->tx_chip_types & BIT(AST_TX_ASTDP))
> ast_dp_set_mode(crtc, vbios_mode_info);
>
> mutex_unlock(&ast->ioregs_lock);
> @@ -1739,22 +1739,26 @@ int ast_mode_config_init(struct ast_private *ast)
>
> ast_crtc_init(dev);
>
> - switch (ast->tx_chip_type) {
> - case AST_TX_NONE:
> + if (ast->tx_chip_types & BIT(AST_TX_NONE)) {
> ret = ast_vga_output_init(ast);
> - break;
> - case AST_TX_SIL164:
> + if (ret)
> + return ret;
> + }
> + if (ast->tx_chip_types & BIT(AST_TX_SIL164)) {
> ret = ast_sil164_output_init(ast);
> - break;
> - case AST_TX_DP501:
> + if (ret)
> + return ret;
> + }
> + if (ast->tx_chip_types & BIT(AST_TX_DP501)) {
> ret = ast_dp501_output_init(ast);
> - break;
> - case AST_TX_ASTDP:
> + if (ret)
> + return ret;
> + }
> + if (ast->tx_chip_types & BIT(AST_TX_ASTDP)) {
> ret = ast_astdp_output_init(ast);
> - break;
> + if (ret)
> + return ret;
> }
> - if (ret)
> - return ret;
>
> drm_mode_config_reset(dev);
>
> diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
> index 0aa9cf0fb5c3..2e1c343b70a3 100644
> --- a/drivers/gpu/drm/ast/ast_post.c
> +++ b/drivers/gpu/drm/ast/ast_post.c
> @@ -391,7 +391,7 @@ void ast_post_gpu(struct drm_device *dev)
>
> ast_init_3rdtx(dev);
> } else {
> - if (ast->tx_chip_type != AST_TX_NONE)
> + if (ast->tx_chip_types & BIT(AST_TX_SIL164))
> ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa3, 0xcf, 0x80); /* Enable DVO */
> }
> }
> --
> 2.36.1
>
