Skip to content

Commit 426c89a

Browse files
vsyrjalaalexdeucher
authored andcommitted
drm/amdgpu: Use drm_mode_copy()
struct drm_display_mode embeds a list head, so overwriting the full struct with another one will corrupt the list (if the destination mode is on a list). Use drm_mode_copy() instead which explicitly preserves the list head of the destination mode. Even if we know the destination mode is not on any list using drm_mode_copy() seems decent as it sets a good example. Bad examples of not using it might eventually get copied into code where preserving the list head actually matters. Obviously one case not covered here is when the mode itself is embedded in a larger structure and the whole structure is copied. But if we are careful when copying into modes embedded in structures I think we can be a little more reassured that bogus list heads haven't been propagated in. @is_mode_copy@ @@ drm_mode_copy(...) { ... } @Depends on !is_mode_copy@ struct drm_display_mode *mode; expression E, S; @@ ( - *mode = E + drm_mode_copy(mode, &E) | - memcpy(mode, E, S) + drm_mode_copy(mode, E) ) @Depends on !is_mode_copy@ struct drm_display_mode mode; expression E; @@ ( - mode = E + drm_mode_copy(&mode, &E) | - memcpy(&mode, E, S) + drm_mode_copy(&mode, E) ) @@ struct drm_display_mode *mode; @@ - &*mode + mode Cc: Alex Deucher <[email protected]> Cc: Harry Wentland <[email protected]> Cc: Leo Li <[email protected]> Cc: Rodrigo Siqueira <[email protected]> Cc: [email protected] Reviewed-by: Harry Wentland <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 606d587 commit 426c89a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ amdgpu_connector_fixup_lcd_native_mode(struct drm_encoder *encoder,
626626
if (mode->type & DRM_MODE_TYPE_PREFERRED) {
627627
if (mode->hdisplay != native_mode->hdisplay ||
628628
mode->vdisplay != native_mode->vdisplay)
629-
memcpy(native_mode, mode, sizeof(*mode));
629+
drm_mode_copy(native_mode, mode);
630630
}
631631
}
632632

@@ -635,7 +635,7 @@ amdgpu_connector_fixup_lcd_native_mode(struct drm_encoder *encoder,
635635
list_for_each_entry_safe(mode, t, &connector->probed_modes, head) {
636636
if (mode->hdisplay == native_mode->hdisplay &&
637637
mode->vdisplay == native_mode->vdisplay) {
638-
*native_mode = *mode;
638+
drm_mode_copy(native_mode, mode);
639639
drm_mode_set_crtcinfo(native_mode, CRTC_INTERLACE_HALVE_V);
640640
DRM_DEBUG_KMS("Determined LVDS native mode details from EDID\n");
641641
break;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6360,7 +6360,7 @@ get_highest_refresh_rate_mode(struct amdgpu_dm_connector *aconnector,
63606360
}
63616361
}
63626362

6363-
aconnector->freesync_vid_base = *m_pref;
6363+
drm_mode_copy(&aconnector->freesync_vid_base, m_pref);
63646364
return m_pref;
63656365
}
63666366

@@ -6473,8 +6473,8 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
64736473
recalculate_timing = is_freesync_video_mode(&mode, aconnector);
64746474
if (recalculate_timing) {
64756475
freesync_mode = get_highest_refresh_rate_mode(aconnector, false);
6476-
saved_mode = mode;
6477-
mode = *freesync_mode;
6476+
drm_mode_copy(&saved_mode, &mode);
6477+
drm_mode_copy(&mode, freesync_mode);
64786478
} else {
64796479
decide_crtc_timing_for_drm_display_mode(
64806480
&mode, preferred_mode, scale);

0 commit comments

Comments
 (0)