diff options
| author |   Rob Clark <robdclark@chromium.org> | 2019-11-04 09:37:36 -0800 |
|---|---|---|
| committer |   Sean Paul <seanpaul@chromium.org> | 2019-11-06 13:00:21 -0500 |
| commit | 86de88cfeb7cf33c7bbd18360e041c7d4e651bba (patch) | |
| tree | e68b05d9f67df3c30ca92c041ba7cdea649bbab6 /include | |
| parent | fbdev: c2p: Fix link failure on non-inlining (diff) | |
| download | linux-dev-86de88cfeb7cf33c7bbd18360e041c7d4e651bba.tar.xz linux-dev-86de88cfeb7cf33c7bbd18360e041c7d4e651bba.zip | |
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.
Fixes: d4da4e33341c ("drm: Measure Self Refresh Entry/Exit times to avoid thrashing")
Cc: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
[seanpaul fixed up some checkpatch warns]
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191104173737.142558-1-robdclark@gmail.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_self_refresh_helper.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drm_self_refresh_helper.h b/include/drm/drm_self_refresh_helper.h index 5b79d253fb46..520235c20708 100644 --- a/include/drm/drm_self_refresh_helper.h +++ b/include/drm/drm_self_refresh_helper.h @@ -13,7 +13,8 @@ struct drm_crtc; void drm_self_refresh_helper_alter_state(struct drm_atomic_state *state); void drm_self_refresh_helper_update_avg_times(struct drm_atomic_state *state, - unsigned int commit_time_ms); + unsigned int commit_time_ms, + unsigned int new_self_refresh_mask); int drm_self_refresh_helper_init(struct drm_crtc *crtc); void drm_self_refresh_helper_cleanup(struct drm_crtc *crtc); |