On Mon, Mar 28, 2022 at 05:34:32PM +0300, Jani Nikula wrote:
> With this, the remaining non-const parts are the ones that actually
> modify the EDID, for example to fix corrupt EDID.
>
> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/drm_edid.c | 21 +++++++++++----------
> include/drm/drm_edid.h | 10 +++++-----
> 2 files changed, 16 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 625fa6a4a93a..d1abaa517867 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -2150,7 +2150,7 @@ static u32 edid_extract_panel_id(const struct edid *edid)
>
> u32 drm_edid_get_panel_id(struct i2c_adapter *adapter)
> {
> - struct edid *edid;
> + const struct edid *edid;
> u32 panel_id;
>
> edid = drm_do_get_edid_base_block(NULL, drm_do_probe_ddc_edid, adapter);
> @@ -3664,7 +3664,7 @@ static bool drm_valid_hdmi_vic(u8 vic)
> }
>
> static int
> -add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid)
> +add_alternate_cea_modes(struct drm_connector *connector, const struct edid *edid)
> {
> struct drm_device *dev = connector->dev;
> struct drm_display_mode *mode, *tmp;
> @@ -4345,7 +4345,7 @@ static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector,
> }
>
> static int
> -add_cea_modes(struct drm_connector *connector, struct edid *edid)
> +add_cea_modes(struct drm_connector *connector, const struct edid *edid)
> {
> const u8 *cea = drm_find_cea_extension(edid);
> const u8 *db, *hdmi = NULL, *video = NULL;
> @@ -4551,7 +4551,7 @@ static int get_monitor_name(const struct edid *edid, char name[13])
> * @bufsize: The size of the name buffer (should be at least 14 chars.)
> *
> */
> -void drm_edid_get_monitor_name(struct edid *edid, char *name, int bufsize)
> +void drm_edid_get_monitor_name(const struct edid *edid, char *name, int bufsize)
> {
> int name_length;
> char buf[13];
> @@ -4585,7 +4585,8 @@ static void clear_eld(struct drm_connector *connector)
> * Fill the ELD (EDID-Like Data) buffer for passing to the audio driver. The
> * HDCP and Port_ID ELD fields are left for the graphics driver to fill in.
> */
> -static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)
> +static void drm_edid_to_eld(struct drm_connector *connector,
> + const struct edid *edid)
> {
> uint8_t *eld = connector->eld;
> const u8 *cea;
> @@ -4681,7 +4682,7 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)
> *
> * Return: The number of found SADs or negative number on error.
> */
> -int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads)
> +int drm_edid_to_sad(const struct edid *edid, struct cea_sad **sads)
> {
> int count = 0;
> int i, start, end, dbl;
> @@ -4743,7 +4744,7 @@ EXPORT_SYMBOL(drm_edid_to_sad);
> * Return: The number of found Speaker Allocation Blocks or negative number on
> * error.
> */
> -int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)
> +int drm_edid_to_speaker_allocation(const struct edid *edid, u8 **sadb)
> {
> int count = 0;
> int i, start, end, dbl;
> @@ -4838,7 +4839,7 @@ EXPORT_SYMBOL(drm_av_sync_delay);
> *
> * Return: True if the monitor is HDMI, false if not or unknown.
> */
> -bool drm_detect_hdmi_monitor(struct edid *edid)
> +bool drm_detect_hdmi_monitor(const struct edid *edid)
> {
> const u8 *edid_ext;
> int i;
> @@ -4876,7 +4877,7 @@ EXPORT_SYMBOL(drm_detect_hdmi_monitor);
> *
> * Return: True if the monitor supports audio, false otherwise.
> */
> -bool drm_detect_monitor_audio(struct edid *edid)
> +bool drm_detect_monitor_audio(const struct edid *edid)
> {
> const u8 *edid_ext;
> int i, j;
> @@ -5543,7 +5544,7 @@ static int add_displayid_detailed_1_modes(struct drm_connector *connector,
> }
>
> static int add_displayid_detailed_modes(struct drm_connector *connector,
> - struct edid *edid)
> + const struct edid *edid)
> {
> const struct displayid_block *block;
> struct displayid_iter iter;
> diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
> index 144c495b99c4..48b1bf9c315a 100644
> --- a/include/drm/drm_edid.h
> +++ b/include/drm/drm_edid.h
> @@ -372,8 +372,8 @@ struct drm_connector;
> struct drm_connector_state;
> struct drm_display_mode;
>
> -int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads);
> -int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb);
> +int drm_edid_to_sad(const struct edid *edid, struct cea_sad **sads);
> +int drm_edid_to_speaker_allocation(const struct edid *edid, u8 **sadb);
> int drm_av_sync_delay(struct drm_connector *connector,
> const struct drm_display_mode *mode);
>
> @@ -569,8 +569,8 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);
> int drm_add_override_edid_modes(struct drm_connector *connector);
>
> u8 drm_match_cea_mode(const struct drm_display_mode *to_match);
> -bool drm_detect_hdmi_monitor(struct edid *edid);
> -bool drm_detect_monitor_audio(struct edid *edid);
> +bool drm_detect_hdmi_monitor(const struct edid *edid);
> +bool drm_detect_monitor_audio(const struct edid *edid);
> enum hdmi_quantization_range
> drm_default_rgb_quant_range(const struct drm_display_mode *mode);
> int drm_add_modes_noedid(struct drm_connector *connector,
> @@ -582,7 +582,7 @@ int drm_edid_header_is_valid(const u8 *raw_edid);
> bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,
> bool *edid_corrupt);
> bool drm_edid_is_valid(struct edid *edid);
> -void drm_edid_get_monitor_name(struct edid *edid, char *name,
> +void drm_edid_get_monitor_name(const struct edid *edid, char *name,
> int buflen);
> struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev,
> int hsize, int vsize, int fresh,
> --
> 2.30.2
--
Ville Syrjälä
Intel
