On 2018-11-30 10:13 a.m., Deucher, Alexander wrote: > Acked-by: Alex Deucher <alexander.deucher@xxxxxxx> Reviewed-by: Leo Li <sunpeng.li@xxxxxxx> > > ------------------------------------------------------------------------ > *From:* amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> on behalf of > Nicholas Kazlauskas <nicholas.kazlauskas@xxxxxxx> > *Sent:* Friday, November 30, 2018 10:09:28 AM > *To:* amd-gfx@xxxxxxxxxxxxxxxxxxxxx > *Cc:* Li, Sun peng (Leo); Wentland, Harry; Kazlauskas, Nicholas > *Subject:* [PATCH] drm/amd/display: Fix NULL ptr deref for > commit_planes_to_stream > [Why] > With scaling, underscan and abm changes we can end up calling > commit_planes_to_stream in commit_tail. This call uses dm_state->context > which can be NULL if the commit was a fast update. > > [How] > Use dc_state instead since that can't be NULL unless the system ran > out of memory. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108912 > Fixes: e64abff2f133 ("drm/amd/display: Use private obj helpers for > dm_atomic_state") > > Cc: Leo Li <sunpeng.li@xxxxxxx> > Cc: Harry Wentland <harry.wentland@xxxxxxx> > Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@xxxxxxx> > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index 76b1aebdca0c..8ecd78657d43 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -5011,7 +5011,7 @@ static void amdgpu_dm_atomic_commit_tail(struct > drm_atomic_state *state) > status->plane_count, > dm_new_crtc_state, > to_dm_crtc_state(old_crtc_state), > - dm_state->context)) > + dc_state)) > dm_error("%s: Failed to update stream > scaling!\n", __func__); > } > > -- > 2.17.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
