| Message ID | 20240513202723.261440-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/edid: remove drm_do_get_edid() | expand |
Am 13.05.24 um 22:27 schrieb Jani Nikula: > All users of drm_do_get_edid() have been converted to > drm_edid_read_custom(). Remove the unused function to prevent new users > from creeping in. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> > > --- > > Cc: Robert Foss <rfoss@kernel.org> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/drm_edid.c | 28 ---------------------------- > include/drm/drm_edid.h | 4 ---- > 2 files changed, 32 deletions(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index 4f54c91b31b2..0f7c4c5b14b9 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -2464,34 +2464,6 @@ static struct edid *_drm_do_get_edid(struct drm_connector *connector, > return NULL; > } > > -/** > - * drm_do_get_edid - get EDID data using a custom EDID block read function > - * @connector: connector we're probing > - * @read_block: EDID block read function > - * @context: private data passed to the block read function > - * > - * When the I2C adapter connected to the DDC bus is hidden behind a device that > - * exposes a different interface to read EDID blocks this function can be used > - * to get EDID data using a custom block read function. > - * > - * As in the general case the DDC bus is accessible by the kernel at the I2C > - * level, drivers must make all reasonable efforts to expose it as an I2C > - * adapter and use drm_get_edid() instead of abusing this function. > - * > - * The EDID may be overridden using debugfs override_edid or firmware EDID > - * (drm_edid_load_firmware() and drm.edid_firmware parameter), in this priority > - * order. Having either of them bypasses actual EDID reads. > - * > - * Return: Pointer to valid EDID or NULL if we couldn't find any. > - */ > -struct edid *drm_do_get_edid(struct drm_connector *connector, > - read_block_fn read_block, > - void *context) > -{ > - return _drm_do_get_edid(connector, read_block, context, NULL); > -} > -EXPORT_SYMBOL_GPL(drm_do_get_edid); > - > /** > * drm_edid_raw - Get a pointer to the raw EDID data. > * @drm_edid: drm_edid container > diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h > index b085525e53e2..6bdfa254a1c1 100644 > --- a/include/drm/drm_edid.h > +++ b/include/drm/drm_edid.h > @@ -423,10 +423,6 @@ static inline void drm_edid_decode_panel_id(u32 panel_id, char vend[4], u16 *pro > } > > bool drm_probe_ddc(struct i2c_adapter *adapter); > -struct edid *drm_do_get_edid(struct drm_connector *connector, > - int (*get_edid_block)(void *data, u8 *buf, unsigned int block, > - size_t len), > - void *data); > struct edid *drm_get_edid(struct drm_connector *connector, > struct i2c_adapter *adapter); > struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,
On Tue, 14 May 2024, Thomas Zimmermann <tzimmermann@suse.de> wrote: > Am 13.05.24 um 22:27 schrieb Jani Nikula: >> All users of drm_do_get_edid() have been converted to >> drm_edid_read_custom(). Remove the unused function to prevent new users >> from creeping in. >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Thanks, pushed to drm-misc-next. BR, Jani.
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 4f54c91b31b2..0f7c4c5b14b9 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2464,34 +2464,6 @@ static struct edid *_drm_do_get_edid(struct drm_connector *connector, return NULL; } -/** - * drm_do_get_edid - get EDID data using a custom EDID block read function - * @connector: connector we're probing - * @read_block: EDID block read function - * @context: private data passed to the block read function - * - * When the I2C adapter connected to the DDC bus is hidden behind a device that - * exposes a different interface to read EDID blocks this function can be used - * to get EDID data using a custom block read function. - * - * As in the general case the DDC bus is accessible by the kernel at the I2C - * level, drivers must make all reasonable efforts to expose it as an I2C - * adapter and use drm_get_edid() instead of abusing this function. - * - * The EDID may be overridden using debugfs override_edid or firmware EDID - * (drm_edid_load_firmware() and drm.edid_firmware parameter), in this priority - * order. Having either of them bypasses actual EDID reads. - * - * Return: Pointer to valid EDID or NULL if we couldn't find any. - */ -struct edid *drm_do_get_edid(struct drm_connector *connector, - read_block_fn read_block, - void *context) -{ - return _drm_do_get_edid(connector, read_block, context, NULL); -} -EXPORT_SYMBOL_GPL(drm_do_get_edid); - /** * drm_edid_raw - Get a pointer to the raw EDID data. * @drm_edid: drm_edid container diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index b085525e53e2..6bdfa254a1c1 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -423,10 +423,6 @@ static inline void drm_edid_decode_panel_id(u32 panel_id, char vend[4], u16 *pro } bool drm_probe_ddc(struct i2c_adapter *adapter); -struct edid *drm_do_get_edid(struct drm_connector *connector, - int (*get_edid_block)(void *data, u8 *buf, unsigned int block, - size_t len), - void *data); struct edid *drm_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter); struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,
All users of drm_do_get_edid() have been converted to drm_edid_read_custom(). Remove the unused function to prevent new users from creeping in. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- Cc: Robert Foss <rfoss@kernel.org> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/gpu/drm/drm_edid.c | 28 ---------------------------- include/drm/drm_edid.h | 4 ---- 2 files changed, 32 deletions(-)