Commit f4e558ec authored by Jani Nikula's avatar Jani Nikula

drm/edid: add more general struct edid constness in the interfaces

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@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c7156f22494b585c55a00a6732462bde0cc19dbf.1648477901.git.jani.nikula@intel.com
parent c14e7241
...@@ -2150,7 +2150,7 @@ static u32 edid_extract_panel_id(const struct edid *edid) ...@@ -2150,7 +2150,7 @@ static u32 edid_extract_panel_id(const struct edid *edid)
u32 drm_edid_get_panel_id(struct i2c_adapter *adapter) u32 drm_edid_get_panel_id(struct i2c_adapter *adapter)
{ {
struct edid *edid; const struct edid *edid;
u32 panel_id; u32 panel_id;
edid = drm_do_get_edid_base_block(NULL, drm_do_probe_ddc_edid, adapter); 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) ...@@ -3664,7 +3664,7 @@ static bool drm_valid_hdmi_vic(u8 vic)
} }
static int 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_device *dev = connector->dev;
struct drm_display_mode *mode, *tmp; struct drm_display_mode *mode, *tmp;
...@@ -4345,7 +4345,7 @@ static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector, ...@@ -4345,7 +4345,7 @@ static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector,
} }
static int 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 *cea = drm_find_cea_extension(edid);
const u8 *db, *hdmi = NULL, *video = NULL; const u8 *db, *hdmi = NULL, *video = NULL;
...@@ -4551,7 +4551,7 @@ static int get_monitor_name(const struct edid *edid, char name[13]) ...@@ -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.) * @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; int name_length;
char buf[13]; char buf[13];
...@@ -4585,7 +4585,8 @@ static void clear_eld(struct drm_connector *connector) ...@@ -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 * 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. * 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; uint8_t *eld = connector->eld;
const u8 *cea; const u8 *cea;
...@@ -4681,7 +4682,7 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid) ...@@ -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. * 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 count = 0;
int i, start, end, dbl; int i, start, end, dbl;
...@@ -4743,7 +4744,7 @@ EXPORT_SYMBOL(drm_edid_to_sad); ...@@ -4743,7 +4744,7 @@ EXPORT_SYMBOL(drm_edid_to_sad);
* Return: The number of found Speaker Allocation Blocks or negative number on * Return: The number of found Speaker Allocation Blocks or negative number on
* error. * 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 count = 0;
int i, start, end, dbl; int i, start, end, dbl;
...@@ -4838,7 +4839,7 @@ EXPORT_SYMBOL(drm_av_sync_delay); ...@@ -4838,7 +4839,7 @@ EXPORT_SYMBOL(drm_av_sync_delay);
* *
* Return: True if the monitor is HDMI, false if not or unknown. * 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; const u8 *edid_ext;
int i; int i;
...@@ -4876,7 +4877,7 @@ EXPORT_SYMBOL(drm_detect_hdmi_monitor); ...@@ -4876,7 +4877,7 @@ EXPORT_SYMBOL(drm_detect_hdmi_monitor);
* *
* Return: True if the monitor supports audio, false otherwise. * 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; const u8 *edid_ext;
int i, j; int i, j;
...@@ -5538,7 +5539,7 @@ static int add_displayid_detailed_1_modes(struct drm_connector *connector, ...@@ -5538,7 +5539,7 @@ static int add_displayid_detailed_1_modes(struct drm_connector *connector,
} }
static int add_displayid_detailed_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; const struct displayid_block *block;
struct displayid_iter iter; struct displayid_iter iter;
......
...@@ -372,8 +372,8 @@ struct drm_connector; ...@@ -372,8 +372,8 @@ struct drm_connector;
struct drm_connector_state; struct drm_connector_state;
struct drm_display_mode; struct drm_display_mode;
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 drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb); int drm_edid_to_speaker_allocation(const struct edid *edid, u8 **sadb);
int drm_av_sync_delay(struct drm_connector *connector, int drm_av_sync_delay(struct drm_connector *connector,
const struct drm_display_mode *mode); const struct drm_display_mode *mode);
...@@ -569,8 +569,8 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid); ...@@ -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); int drm_add_override_edid_modes(struct drm_connector *connector);
u8 drm_match_cea_mode(const struct drm_display_mode *to_match); u8 drm_match_cea_mode(const struct drm_display_mode *to_match);
bool drm_detect_hdmi_monitor(struct edid *edid); bool drm_detect_hdmi_monitor(const struct edid *edid);
bool drm_detect_monitor_audio(struct edid *edid); bool drm_detect_monitor_audio(const struct edid *edid);
enum hdmi_quantization_range enum hdmi_quantization_range
drm_default_rgb_quant_range(const struct drm_display_mode *mode); drm_default_rgb_quant_range(const struct drm_display_mode *mode);
int drm_add_modes_noedid(struct drm_connector *connector, int drm_add_modes_noedid(struct drm_connector *connector,
...@@ -582,7 +582,7 @@ int drm_edid_header_is_valid(const u8 *raw_edid); ...@@ -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 drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,
bool *edid_corrupt); bool *edid_corrupt);
bool drm_edid_is_valid(struct edid *edid); 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); int buflen);
struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev, struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev,
int hsize, int vsize, int fresh, int hsize, int vsize, int fresh,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment