Skip to content

Commit 90170b1

Browse files
committed
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 <tzimmermann@suse.de> Reviewed-by: Sui Jingfeng <sui.jingfeng@linux.dev> Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240325200855.21150-12-tzimmermann@suse.de
1 parent dfff99c commit 90170b1

1 file changed

Lines changed: 2 additions & 40 deletions

File tree

drivers/gpu/drm/ast/ast_mode.c

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,27 +1344,8 @@ static int ast_crtc_init(struct drm_device *dev)
13441344
* VGA Connector
13451345
*/
13461346

1347-
static int ast_vga_connector_helper_get_modes(struct drm_connector *connector)
1348-
{
1349-
struct edid *edid;
1350-
int count;
1351-
1352-
edid = drm_get_edid(connector, connector->ddc);
1353-
if (!edid)
1354-
goto err_drm_get_edid;
1355-
1356-
count = drm_add_edid_modes(connector, edid);
1357-
kfree(edid);
1358-
1359-
return count;
1360-
1361-
err_drm_get_edid:
1362-
drm_connector_update_edid_property(connector, NULL);
1363-
return 0;
1364-
}
1365-
13661347
static const struct drm_connector_helper_funcs ast_vga_connector_helper_funcs = {
1367-
.get_modes = ast_vga_connector_helper_get_modes,
1348+
.get_modes = drm_connector_helper_get_modes,
13681349
};
13691350

13701351
static const struct drm_connector_funcs ast_vga_connector_funcs = {
@@ -1431,27 +1412,8 @@ static int ast_vga_output_init(struct ast_device *ast)
14311412
* SIL164 Connector
14321413
*/
14331414

1434-
static int ast_sil164_connector_helper_get_modes(struct drm_connector *connector)
1435-
{
1436-
struct edid *edid;
1437-
int count;
1438-
1439-
edid = drm_get_edid(connector, connector->ddc);
1440-
if (!edid)
1441-
goto err_drm_get_edid;
1442-
1443-
count = drm_add_edid_modes(connector, edid);
1444-
kfree(edid);
1445-
1446-
return count;
1447-
1448-
err_drm_get_edid:
1449-
drm_connector_update_edid_property(connector, NULL);
1450-
return 0;
1451-
}
1452-
14531415
static const struct drm_connector_helper_funcs ast_sil164_connector_helper_funcs = {
1454-
.get_modes = ast_sil164_connector_helper_get_modes,
1416+
.get_modes = drm_connector_helper_get_modes,
14551417
};
14561418

14571419
static const struct drm_connector_funcs ast_sil164_connector_funcs = {

0 commit comments

Comments
 (0)