From 90170b186ff552ec080ede18b7c3c2aeb6d5b993 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Mon, 25 Mar 2024 21:06:56 +0100 Subject: drm/ast: Use drm_connector_helper_get_modes() The .get_modes() code for VGA and SIL164 connectors does not depend on either type of connector. Replace the driver code with the common helper drm_connector_helper_get_modes(). It reads EDID data via DDC and updates the connector's EDID property. Signed-off-by: Thomas Zimmermann Reviewed-by: Sui Jingfeng Reviewed-by: Jocelyn Falempe Link: https://patchwork.freedesktop.org/patch/msgid/20240325200855.21150-12-tzimmermann@suse.de --- drivers/gpu/drm/ast/ast_mode.c | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) (limited to 'drivers/gpu/drm/ast/ast_mode.c') diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 8766a0f2eb3c..71cc681d6188 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -1344,27 +1344,8 @@ static int ast_crtc_init(struct drm_device *dev) * VGA Connector */ -static int ast_vga_connector_helper_get_modes(struct drm_connector *connector) -{ - struct edid *edid; - int count; - - edid = drm_get_edid(connector, connector->ddc); - if (!edid) - goto err_drm_get_edid; - - count = drm_add_edid_modes(connector, edid); - kfree(edid); - - return count; - -err_drm_get_edid: - drm_connector_update_edid_property(connector, NULL); - return 0; -} - static const struct drm_connector_helper_funcs ast_vga_connector_helper_funcs = { - .get_modes = ast_vga_connector_helper_get_modes, + .get_modes = drm_connector_helper_get_modes, }; static const struct drm_connector_funcs ast_vga_connector_funcs = { @@ -1431,27 +1412,8 @@ static int ast_vga_output_init(struct ast_device *ast) * SIL164 Connector */ -static int ast_sil164_connector_helper_get_modes(struct drm_connector *connector) -{ - struct edid *edid; - int count; - - edid = drm_get_edid(connector, connector->ddc); - if (!edid) - goto err_drm_get_edid; - - count = drm_add_edid_modes(connector, edid); - kfree(edid); - - return count; - -err_drm_get_edid: - drm_connector_update_edid_property(connector, NULL); - return 0; -} - static const struct drm_connector_helper_funcs ast_sil164_connector_helper_funcs = { - .get_modes = ast_sil164_connector_helper_get_modes, + .get_modes = drm_connector_helper_get_modes, }; static const struct drm_connector_funcs ast_sil164_connector_funcs = { -- cgit v1.2.3