drm: remove drm_connector_helper_get_modes_from_ddc()
Subsystems (3)
cover drm: remove drm_connector_helper_get_modes_from_ddc()
Convert mgag200 to use struct drm_edid directly, and drop drm_connector_helper_get_modes_from_ddc(), as suggested by Thomas.
This supersedes [1].
BR,
Jani.
[1] https://lore.kernel.org/all/[email protected]/
Jani Nikula (2):
drm/mgag200: convert get modes to struct drm_edid drm/probe-helper: remove unused
drm_connector_helper_get_modes_from_ddc()
drivers/gpu/drm/drm_probe_helper.c | 36 -------------------------- drivers/gpu/drm/mgag200/mgag200_mode.c | 14 +++++++--- include/drm/drm_probe_helper.h | 1 - 3 files changed, 10 insertions(+), 41 deletions(-)
Signature · 1 line
2.39.2
PATCH 1/2 drm/mgag200: convert get modes to struct drm_edid
Convert mgag200_vga_connector_helper_get_modes() to use struct drm_edid based functions directly.
--- drivers/gpu/drm/mgag200/mgag200_mode.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/gpu/drm/mgag200/mgag200_mode.c +10 -4
@@ -14,13 +14,13 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_damage_helper.h> +#include <drm/drm_edid.h> #include <drm/drm_format_helper.h> #include <drm/drm_fourcc.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_print.h> -#include <drm/drm_probe_helper.h> #include "mgag200_drv.h"
@@ -717,17 +717,23 @@ void mgag200_crtc_atomic_destroy_state(struct drm_crtc *crtc, struct drm_crtc_stint mgag200_vga_connector_helper_get_modes (struct drm_connector *connector) {struct mga_device *mdev =to_mga_device (connector->dev); -int ret; +const struct drm_edid *drm_edid; +int count;/* * Protect access to I/O registers from concurrent modesetting * by acquiring the I/O-register lock. */ mutex_lock (&mdev->rmmio_lock); - ret =drm_connector_helper_get_modes_from_ddc (connector); + + drm_edid =drm_edid_read (connector); +drm_edid_connector_update (connector, drm_edid); + count =drm_edid_connector_add_modes (connector); +drm_edid_free (drm_edid); +mutex_unlock (&mdev->rmmio_lock); -return ret; +return count; }/*
Signature · 1 line
2.39.2
PATCH 2/2 drm/probe-helper: remove unused drm_connector_helper_get_modes_from_ddc()
In reply to Jani NikulaRemove the unused drm_connector_helper_get_modes_from_ddc() function. Most drivers should probably have this functionality split to detect and get modes parts, so the helper is not the best abstraction.
--- drivers/gpu/drm/drm_probe_helper.c | 36 ------------------------------ include/drm/drm_probe_helper.h | 1 - 2 files changed, 37 deletions(-)
drivers/gpu/drm/drm_probe_helper.c +0 -36
@@ -1100,42 +1100,6 @@ enum drm_mode_status drm_crtc_helper_mode_valid_fixed(struct drm_crtc *crtc, }EXPORT_SYMBOL (drm_crtc_helper_mode_valid_fixed); -/** -* drm_connector_helper_get_modes_from_ddc - Updates the connector's EDID -* property from the connector's -* DDC channel -* @connector: The connector -* -* Returns: -* The number of detected display modes. -* -* Uses a connector's DDC channel to retrieve EDID data and update the -* connector's EDID property and display modes. Drivers can use this -* function to implement struct &drm_connector_helper_funcs.get_modes -* for connectors with a DDC channel. -*/ -int drm_connector_helper_get_modes_from_ddc (struct drm_connector *connector) -{ -struct edid *edid; -int count =0 ; - -if (!connector->ddc) -return 0 ; - - edid =drm_get_edid (connector, connector->ddc); - -// clears property if EDID is NULL -drm_connector_update_edid_property (connector, edid); - -if (edid) { - count =drm_add_edid_modes (connector, edid); -kfree (edid); - } - -return count; -} -EXPORT_SYMBOL (drm_connector_helper_get_modes_from_ddc); -/** * drm_connector_helper_get_modes_fixed - Duplicates a display mode for a connector * @connector: the connector
include/drm/drm_probe_helper.h +0 -1
@@ -32,7 +32,6 @@ enum drm_mode_status drm_crtc_helper_mode_valid_fixed(struct drm_crtc *crtc,const struct drm_display_mode *mode, const struct drm_display_mode *fixed_mode); -int drm_connector_helper_get_modes_from_ddc (struct drm_connector *connector);int drm_connector_helper_get_modes_fixed (struct drm_connector *connector,const struct drm_display_mode *fixed_mode);int drm_connector_helper_get_modes (struct drm_connector *connector);
Signature · 1 line
2.39.2
Hi,
for the series:
Thanks for cleaning up.
Best regards
Thomas
Am 05.01.24 um 17:57 schrieb Jani Nikula:
Quoted 21 lines
Convert mgag200 to use struct
drm_ediddirectly, and dropdrm_connector_helper_get_modes_from_ddc(), as suggested by Thomas.This supersedes [1].
BR,
Jani.[1] https://lore.kernel.org/all/[email protected]/
Jani Nikula (2):
drm/mgag200: convert get modes to structdrm_ediddrm/probe-helper: remove unused
drm_connector_helper_get_modes_from_ddc()drivers/gpu/drm/drm_probe_helper.c | 36 -------------------------- drivers/gpu/drm/mgag200/mgag200_mode.c | 14 +++++++--- include/drm/drm_probe_helper.h | 1 - 3 files changed, 10 insertions(+), 41 deletions(-)
Signature · 6 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)
Quoted 7 lines · Thomas Zimmermann
Hi,
for the series:
Reviewed-by Thomas Zimmermann <[email protected]>Thanks for cleaning up.
Thanks for the review, pushed to drm-misc-next.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel