| Message ID | 20240911115347.899148-4-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/ast: Various cleanups | expand |
On 11/09/2024 13:51, Thomas Zimmermann wrote: > Replace the helper for controlling power on the physical connector, > ast_dp_power_on_off(), with ast_dp_set_phy_sleep(). The new name > reflects the effect of the operation. Simplify the implementation. > The call now controls sleeping, hence semantics are inversed. Each > 'on' becomes an 'off' operation and vice versa. > > Do the same for ast_dp_power_is_on() and also align naming of the > register constant with the rest of the code. Thanks, it looks good to me. Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com> > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/ast/ast_dp.c | 39 +++++++++++++++-------------------- > drivers/gpu/drm/ast/ast_drv.h | 3 --- > drivers/gpu/drm/ast/ast_reg.h | 2 +- > 3 files changed, 18 insertions(+), 26 deletions(-) > > diff --git a/drivers/gpu/drm/ast/ast_dp.c b/drivers/gpu/drm/ast/ast_dp.c > index 2b5129c6f8b0..d4362807d777 100644 > --- a/drivers/gpu/drm/ast/ast_dp.c > +++ b/drivers/gpu/drm/ast/ast_dp.c > @@ -149,27 +149,22 @@ int ast_dp_launch(struct ast_device *ast) > return 0; > } > > -static bool ast_dp_power_is_on(struct ast_device *ast) > +static bool ast_dp_get_phy_sleep(struct ast_device *ast) > { > - u8 vgacre3; > + u8 vgacre3 = ast_get_index_reg(ast, AST_IO_VGACRI, 0xe3); > > - vgacre3 = ast_get_index_reg(ast, AST_IO_VGACRI, 0xe3); > - > - return !(vgacre3 & AST_DP_PHY_SLEEP); > + return (vgacre3 & AST_IO_VGACRE3_DP_PHY_SLEEP); > } > > -static void ast_dp_power_on_off(struct ast_device *ast, bool on) > +static void ast_dp_set_phy_sleep(struct ast_device *ast, bool sleep) > { > - // Read and Turn off DP PHY sleep > - u8 bE3 = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xE3, AST_DP_VIDEO_ENABLE); > - > - // Turn on DP PHY sleep > - if (!on) > - bE3 |= AST_DP_PHY_SLEEP; > + u8 vgacre3 = 0x00; > > - // DP Power on/off > - ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xE3, (u8) ~AST_DP_PHY_SLEEP, bE3); > + if (sleep) > + vgacre3 |= AST_IO_VGACRE3_DP_PHY_SLEEP; > > + ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xe3, (u8)~AST_IO_VGACRE3_DP_PHY_SLEEP, > + vgacre3); > msleep(50); > } > > @@ -319,7 +314,7 @@ static void ast_astdp_encoder_helper_atomic_enable(struct drm_encoder *encoder, > struct ast_connector *ast_connector = &ast->output.astdp.connector; > > if (ast_connector->physical_status == connector_status_connected) { > - ast_dp_power_on_off(ast, AST_DP_POWER_ON); > + ast_dp_set_phy_sleep(ast, false); > ast_dp_link_training(ast); > > ast_wait_for_vretrace(ast); > @@ -333,7 +328,7 @@ static void ast_astdp_encoder_helper_atomic_disable(struct drm_encoder *encoder, > struct ast_device *ast = to_ast_device(encoder->dev); > > ast_dp_set_on_off(ast, 0); > - ast_dp_power_on_off(ast, AST_DP_POWER_OFF); > + ast_dp_set_phy_sleep(ast, true); > } > > static const struct drm_encoder_helper_funcs ast_astdp_encoder_helper_funcs = { > @@ -382,19 +377,19 @@ static int ast_astdp_connector_helper_detect_ctx(struct drm_connector *connector > struct ast_connector *ast_connector = to_ast_connector(connector); > struct ast_device *ast = to_ast_device(connector->dev); > enum drm_connector_status status = connector_status_disconnected; > - bool power_is_on; > + bool phy_sleep; > > mutex_lock(&ast->modeset_lock); > > - power_is_on = ast_dp_power_is_on(ast); > - if (!power_is_on) > - ast_dp_power_on_off(ast, true); > + phy_sleep = ast_dp_get_phy_sleep(ast); > + if (phy_sleep) > + ast_dp_set_phy_sleep(ast, false); > > if (ast_astdp_is_connected(ast)) > status = connector_status_connected; > > - if (!power_is_on && status == connector_status_disconnected) > - ast_dp_power_on_off(ast, false); > + if (phy_sleep && status == connector_status_disconnected) > + ast_dp_set_phy_sleep(ast, true); > > mutex_unlock(&ast->modeset_lock); > > diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h > index b6ca14a3b967..cafc4234e839 100644 > --- a/drivers/gpu/drm/ast/ast_drv.h > +++ b/drivers/gpu/drm/ast/ast_drv.h > @@ -403,9 +403,6 @@ int ast_mode_config_init(struct ast_device *ast); > #define AST_DP501_LINKRATE 0xf014 > #define AST_DP501_EDID_DATA 0xf020 > > -#define AST_DP_POWER_ON true > -#define AST_DP_POWER_OFF false > - > /* > * ASTDP resoultion table: > * EX: ASTDP_A_B_C: > diff --git a/drivers/gpu/drm/ast/ast_reg.h b/drivers/gpu/drm/ast/ast_reg.h > index 040961cc1a19..d7a22cea8271 100644 > --- a/drivers/gpu/drm/ast/ast_reg.h > +++ b/drivers/gpu/drm/ast/ast_reg.h > @@ -41,6 +41,7 @@ > #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_VGACRE3_DP_PHY_SLEEP BIT(4) > #define AST_IO_VGACRE5_EDID_READ_DONE BIT(0) > > #define AST_IO_VGAIR1_R (0x5A) > @@ -69,7 +70,6 @@ > */ > > /* Define for Soc scratched reg used on ASTDP */ > -#define AST_DP_PHY_SLEEP BIT(4) > #define AST_DP_VIDEO_ENABLE BIT(0) > > /*
diff --git a/drivers/gpu/drm/ast/ast_dp.c b/drivers/gpu/drm/ast/ast_dp.c index 2b5129c6f8b0..d4362807d777 100644 --- a/drivers/gpu/drm/ast/ast_dp.c +++ b/drivers/gpu/drm/ast/ast_dp.c @@ -149,27 +149,22 @@ int ast_dp_launch(struct ast_device *ast) return 0; } -static bool ast_dp_power_is_on(struct ast_device *ast) +static bool ast_dp_get_phy_sleep(struct ast_device *ast) { - u8 vgacre3; + u8 vgacre3 = ast_get_index_reg(ast, AST_IO_VGACRI, 0xe3); - vgacre3 = ast_get_index_reg(ast, AST_IO_VGACRI, 0xe3); - - return !(vgacre3 & AST_DP_PHY_SLEEP); + return (vgacre3 & AST_IO_VGACRE3_DP_PHY_SLEEP); } -static void ast_dp_power_on_off(struct ast_device *ast, bool on) +static void ast_dp_set_phy_sleep(struct ast_device *ast, bool sleep) { - // Read and Turn off DP PHY sleep - u8 bE3 = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xE3, AST_DP_VIDEO_ENABLE); - - // Turn on DP PHY sleep - if (!on) - bE3 |= AST_DP_PHY_SLEEP; + u8 vgacre3 = 0x00; - // DP Power on/off - ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xE3, (u8) ~AST_DP_PHY_SLEEP, bE3); + if (sleep) + vgacre3 |= AST_IO_VGACRE3_DP_PHY_SLEEP; + ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xe3, (u8)~AST_IO_VGACRE3_DP_PHY_SLEEP, + vgacre3); msleep(50); } @@ -319,7 +314,7 @@ static void ast_astdp_encoder_helper_atomic_enable(struct drm_encoder *encoder, struct ast_connector *ast_connector = &ast->output.astdp.connector; if (ast_connector->physical_status == connector_status_connected) { - ast_dp_power_on_off(ast, AST_DP_POWER_ON); + ast_dp_set_phy_sleep(ast, false); ast_dp_link_training(ast); ast_wait_for_vretrace(ast); @@ -333,7 +328,7 @@ static void ast_astdp_encoder_helper_atomic_disable(struct drm_encoder *encoder, struct ast_device *ast = to_ast_device(encoder->dev); ast_dp_set_on_off(ast, 0); - ast_dp_power_on_off(ast, AST_DP_POWER_OFF); + ast_dp_set_phy_sleep(ast, true); } static const struct drm_encoder_helper_funcs ast_astdp_encoder_helper_funcs = { @@ -382,19 +377,19 @@ static int ast_astdp_connector_helper_detect_ctx(struct drm_connector *connector struct ast_connector *ast_connector = to_ast_connector(connector); struct ast_device *ast = to_ast_device(connector->dev); enum drm_connector_status status = connector_status_disconnected; - bool power_is_on; + bool phy_sleep; mutex_lock(&ast->modeset_lock); - power_is_on = ast_dp_power_is_on(ast); - if (!power_is_on) - ast_dp_power_on_off(ast, true); + phy_sleep = ast_dp_get_phy_sleep(ast); + if (phy_sleep) + ast_dp_set_phy_sleep(ast, false); if (ast_astdp_is_connected(ast)) status = connector_status_connected; - if (!power_is_on && status == connector_status_disconnected) - ast_dp_power_on_off(ast, false); + if (phy_sleep && status == connector_status_disconnected) + ast_dp_set_phy_sleep(ast, true); mutex_unlock(&ast->modeset_lock); diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index b6ca14a3b967..cafc4234e839 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -403,9 +403,6 @@ int ast_mode_config_init(struct ast_device *ast); #define AST_DP501_LINKRATE 0xf014 #define AST_DP501_EDID_DATA 0xf020 -#define AST_DP_POWER_ON true -#define AST_DP_POWER_OFF false - /* * ASTDP resoultion table: * EX: ASTDP_A_B_C: diff --git a/drivers/gpu/drm/ast/ast_reg.h b/drivers/gpu/drm/ast/ast_reg.h index 040961cc1a19..d7a22cea8271 100644 --- a/drivers/gpu/drm/ast/ast_reg.h +++ b/drivers/gpu/drm/ast/ast_reg.h @@ -41,6 +41,7 @@ #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_VGACRE3_DP_PHY_SLEEP BIT(4) #define AST_IO_VGACRE5_EDID_READ_DONE BIT(0) #define AST_IO_VGAIR1_R (0x5A) @@ -69,7 +70,6 @@ */ /* Define for Soc scratched reg used on ASTDP */ -#define AST_DP_PHY_SLEEP BIT(4) #define AST_DP_VIDEO_ENABLE BIT(0) /*
Replace the helper for controlling power on the physical connector, ast_dp_power_on_off(), with ast_dp_set_phy_sleep(). The new name reflects the effect of the operation. Simplify the implementation. The call now controls sleeping, hence semantics are inversed. Each 'on' becomes an 'off' operation and vice versa. Do the same for ast_dp_power_is_on() and also align naming of the register constant with the rest of the code. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/gpu/drm/ast/ast_dp.c | 39 +++++++++++++++-------------------- drivers/gpu/drm/ast/ast_drv.h | 3 --- drivers/gpu/drm/ast/ast_reg.h | 2 +- 3 files changed, 18 insertions(+), 26 deletions(-)