Constify the first level of struct edid in detailed timing parsing. Also switch to struct edid instead of u8.
Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- drivers/gpu/drm/drm_edid.c | 48 ++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index c006b09066bb..fad792ef2c79 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2349,38 +2349,37 @@ static bool is_detailed_timing_descriptor(const u8 d[18]) typedef void detailed_cb(const struct detailed_timing *timing, void *closure);
static void -cea_for_each_detailed_block(u8 *ext, detailed_cb *cb, void *closure) +cea_for_each_detailed_block(const u8 *ext, detailed_cb *cb, void *closure) { int i, n; u8 d = ext[0x02]; - u8 *det_base = ext + d; + const u8 *det_base = ext + d;
if (d < 4 || d > 127) return;
n = (127 - d) / 18; for (i = 0; i < n; i++) - cb((struct detailed_timing *)(det_base + 18 * i), closure); + cb((const struct detailed_timing *)(det_base + 18 * i), closure); }
static void -vtb_for_each_detailed_block(u8 *ext, detailed_cb *cb, void *closure) +vtb_for_each_detailed_block(const u8 *ext, detailed_cb *cb, void *closure) { unsigned int i, n = min((int)ext[0x02], 6); - u8 *det_base = ext + 5; + const u8 *det_base = ext + 5;
if (ext[0x01] != 1) return; /* unknown version */
for (i = 0; i < n; i++) - cb((struct detailed_timing *)(det_base + 18 * i), closure); + cb((const struct detailed_timing *)(det_base + 18 * i), closure); }
static void -drm_for_each_detailed_block(u8 *raw_edid, detailed_cb *cb, void *closure) +drm_for_each_detailed_block(const struct edid *edid, detailed_cb *cb, void *closure) { int i; - struct edid *edid = (struct edid *)raw_edid;
if (edid == NULL) return; @@ -2388,8 +2387,8 @@ drm_for_each_detailed_block(u8 *raw_edid, detailed_cb *cb, void *closure) for (i = 0; i < EDID_DETAILED_TIMINGS; i++) cb(&(edid->detailed_timings[i]), closure);
- for (i = 1; i <= raw_edid[0x7e]; i++) { - u8 *ext = raw_edid + (i * EDID_LENGTH); + for (i = 1; i <= edid->extensions; i++) { + const u8 *ext = (const u8 *)edid + (i * EDID_LENGTH);
switch (*ext) { case CEA_EXT: @@ -2425,7 +2424,7 @@ drm_monitor_supports_rb(struct edid *edid) if (edid->revision >= 4) { bool ret = false;
- drm_for_each_detailed_block((u8 *)edid, is_rb, &ret); + drm_for_each_detailed_block(edid, is_rb, &ret); return ret; }
@@ -2452,7 +2451,7 @@ drm_gtf2_hbreak(struct edid *edid) { const struct detailed_timing *timing = NULL;
- drm_for_each_detailed_block((u8 *)edid, find_gtf2, &timing); + drm_for_each_detailed_block(edid, find_gtf2, &timing);
BUILD_BUG_ON(offsetof(typeof(*timing), data.other_data.data.range.formula.gtf2.hfreq_start_khz) != 12);
@@ -2464,7 +2463,7 @@ drm_gtf2_2c(struct edid *edid) { const struct detailed_timing *timing = NULL;
- drm_for_each_detailed_block((u8 *)edid, find_gtf2, &timing); + drm_for_each_detailed_block(edid, find_gtf2, &timing);
BUILD_BUG_ON(offsetof(typeof(*timing), data.other_data.data.range.formula.gtf2.c) != 13);
@@ -2476,7 +2475,7 @@ drm_gtf2_m(struct edid *edid) { const struct detailed_timing *timing = NULL;
- drm_for_each_detailed_block((u8 *)edid, find_gtf2, &timing); + drm_for_each_detailed_block(edid, find_gtf2, &timing);
BUILD_BUG_ON(offsetof(typeof(*timing), data.other_data.data.range.formula.gtf2.m) != 14);
@@ -2488,7 +2487,7 @@ drm_gtf2_k(struct edid *edid) { const struct detailed_timing *timing = NULL;
- drm_for_each_detailed_block((u8 *)edid, find_gtf2, &timing); + drm_for_each_detailed_block(edid, find_gtf2, &timing);
BUILD_BUG_ON(offsetof(typeof(*timing), data.other_data.data.range.formula.gtf2.k) != 16);
@@ -2500,7 +2499,7 @@ drm_gtf2_2j(struct edid *edid) { const struct detailed_timing *timing = NULL;
- drm_for_each_detailed_block((u8 *)edid, find_gtf2, &timing); + drm_for_each_detailed_block(edid, find_gtf2, &timing);
BUILD_BUG_ON(offsetof(typeof(*timing), data.other_data.data.range.formula.gtf2.j) != 17);
@@ -3050,8 +3049,7 @@ add_inferred_modes(struct drm_connector *connector, struct edid *edid) };
if (version_greater(edid, 1, 0)) - drm_for_each_detailed_block((u8 *)edid, do_inferred_modes, - &closure); + drm_for_each_detailed_block(edid, do_inferred_modes, &closure);
return closure.modes; } @@ -3130,8 +3128,8 @@ add_established_modes(struct drm_connector *connector, struct edid *edid) }
if (version_greater(edid, 1, 0)) - drm_for_each_detailed_block((u8 *)edid, - do_established_modes, &closure); + drm_for_each_detailed_block(edid, do_established_modes, + &closure);
return modes + closure.modes; } @@ -3189,7 +3187,7 @@ add_standard_modes(struct drm_connector *connector, struct edid *edid) }
if (version_greater(edid, 1, 0)) - drm_for_each_detailed_block((u8 *)edid, do_standard_modes, + drm_for_each_detailed_block(edid, do_standard_modes, &closure);
/* XXX should also look for standard codes in VTB blocks */ @@ -3269,7 +3267,7 @@ add_cvt_modes(struct drm_connector *connector, struct edid *edid) };
if (version_greater(edid, 1, 2)) - drm_for_each_detailed_block((u8 *)edid, do_cvt_mode, &closure); + drm_for_each_detailed_block(edid, do_cvt_mode, &closure);
/* XXX should also look for CVT codes in VTB blocks */
@@ -3329,7 +3327,7 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, closure.preferred = (edid->features & DRM_EDID_FEATURE_PREFERRED_TIMING);
- drm_for_each_detailed_block((u8 *)edid, do_detailed_mode, &closure); + drm_for_each_detailed_block(edid, do_detailed_mode, &closure);
return closure.modes; } @@ -4530,7 +4528,7 @@ static int get_monitor_name(struct edid *edid, char name[13]) if (!edid || !name) return 0;
- drm_for_each_detailed_block((u8 *)edid, monitor_name, &edid_name); + drm_for_each_detailed_block(edid, monitor_name, &edid_name); for (mnl = 0; edid_name && mnl < 13; mnl++) { if (edid_name[mnl] == 0x0a) break; @@ -5276,7 +5274,7 @@ void drm_get_monitor_range(struct drm_connector *connector, if (!version_greater(edid, 1, 1)) return;
- drm_for_each_detailed_block((u8 *)edid, get_monitor_range, + drm_for_each_detailed_block(edid, get_monitor_range, &info->monitor_range);
DRM_DEBUG_KMS("Supported Monitor Refresh rate range is %d Hz - %d Hz\n",