History

drm/atomic: fix self-refresh helpers crtc state dereference

drm_self_refresh_helper_update_avg_times() was incorrectly accessing the new incoming state after drm_atomic_helper_commit_hw_done(). But this state might have already been superceeded by an !nonblock atomic update resulting in dereferencing an already free'd crtc_state. TODO I *think* this will more or less do the right thing.. althought I'm not 100% sure if, for example, we enter psr in a nonblock commit, and then leave psr in a !nonblock commit that overtakes the completion of the nonblock commit. Not sure if this sort of scenario can happen in practice. But not crashing is better than crashing, so I guess we should either take this patch or rever the self-refresh helpers until Sean can figure out a better solution.

Rob Clark committed 7 years ago

Commit 86de88c1 parent b330f393 files · +27 −9Browse files

Unified · Split

3 files
  1. drivers/gpu/drm/drm_atomic_helper.c +14 −1
  2. drivers/gpu/drm/drm_self_refresh_helper.c +11 −7
  3. include/drm/drm_self_refresh_helper.h +2 −1
drivers/gpu/drm/drm_atomic_helper.c+14−1
@@ -1581,8 +1581,11 @@ static void commit_tail(struct drm_atomic_state *old_state) · 1580 unmodified lines
15811581 {
15821582 struct drm_device *dev = old_state->dev;
15831583 const struct drm_mode_config_helper_funcs *funcs;
1584+ struct drm_crtc_state *new_crtc_state;
1585+ struct drm_crtc *crtc;
15841586 ktime_t start;
15851587 s64 commit_time_ms;
1588+ unsigned int i, new_self_refresh_mask = 0;
15861589
15871590 funcs = dev->mode_config.helper_private;
15881591
@@ -1602,6 +1605,15 @@ static void commit_tail(struct drm_atomic_state *old_state) · 13 unmodified lines
16021605
16031606 drm_atomic_helper_wait_for_dependencies(old_state);
16041607
1608+ /*
1609+ * We cannot safely access new_crtc_state after
1610+ * drm_atomic_helper_commit_hw_done() so figure out which crtc's have
1611+ * self-refresh active beforehand:
1612+ */
1613+ for_each_new_crtc_in_state(old_state, crtc, new_crtc_state, i)
1614+ if (new_crtc_state->self_refresh_active)
1615+ new_self_refresh_mask |= BIT(i);
1616+
16051617 if (funcs && funcs->atomic_commit_tail)
16061618 funcs->atomic_commit_tail(old_state);
16071619 else
@@ -1610,7 +1622,8 @@ static void commit_tail(struct drm_atomic_state *old_state) · 2 unmodified lines
16101622 commit_time_ms = ktime_ms_delta(ktime_get(), start);
16111623 if (commit_time_ms > 0)
16121624 drm_self_refresh_helper_update_avg_times(old_state,
1613− (unsigned long)commit_time_ms);
1625+ (unsigned long)commit_time_ms,
1626+ new_self_refresh_mask);
16141627
16151628 drm_atomic_helper_commit_cleanup_done(old_state);
16161629
drivers/gpu/drm/drm_self_refresh_helper.c+11−7
@@ -133,29 +133,33 @@ out_drop_locks: · 132 unmodified lines
133133 * drm_self_refresh_helper_update_avg_times - Updates a crtc's SR time averages
134134 * @state: the state which has just been applied to hardware
135135 * @commit_time_ms: the amount of time in ms that this commit took to complete
136+ * @new_self_refresh_mask: bitmask of crtc's that have self_refresh_active in
137+ * new state
136138 *
137139 * Called after &drm_mode_config_funcs.atomic_commit_tail, this function will
138140 * update the average entry/exit self refresh times on self refresh transitions.
139141 * These averages will be used when calculating how long to delay before
140142 * entering self refresh mode after activity.
141143 */
142−void drm_self_refresh_helper_update_avg_times(struct drm_atomic_state *state,
143− unsigned int commit_time_ms)
144+void
145+drm_self_refresh_helper_update_avg_times(struct drm_atomic_state *state,
146+ unsigned int commit_time_ms,
147+ unsigned int new_self_refresh_mask)
144148 {
145149 struct drm_crtc *crtc;
146− struct drm_crtc_state *old_crtc_state, *new_crtc_state;
150+ struct drm_crtc_state *old_crtc_state;
147151 int i;
148152
149− for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
150− new_crtc_state, i) {
153+ for_each_old_crtc_in_state(state, crtc, old_crtc_state, i) {
154+ bool new_self_refresh_active = new_self_refresh_mask & BIT(i);
151155 struct drm_self_refresh_data *sr_data = crtc->self_refresh_data;
152156 struct ewma_psr_time *time;
153157
154158 if (old_crtc_state->self_refresh_active ==
155− new_crtc_state->self_refresh_active)
159+ new_self_refresh_active)
156160 continue;
157161
158− if (new_crtc_state->self_refresh_active)
162+ if (new_self_refresh_active)
159163 time = &sr_data->entry_avg_ms;
160164 else
161165 time = &sr_data->exit_avg_ms;
include/drm/drm_self_refresh_helper.h+2−1
@@ -13,7 +13,8 @@ struct drm_crtc; · 12 unmodified lines
1313
1414 void drm_self_refresh_helper_alter_state(struct drm_atomic_state *state);
1515 void drm_self_refresh_helper_update_avg_times(struct drm_atomic_state *state,
16− unsigned int commit_time_ms);
16+ unsigned int commit_time_ms,
17+ unsigned int new_self_refresh_mask);
1718
1819 int drm_self_refresh_helper_init(struct drm_crtc *crtc);
1920 void drm_self_refresh_helper_cleanup(struct drm_crtc *crtc);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t