Skip to content

Commit d324c5b

Browse files
author
Ben Skeggs
committed
drm/nouveau/kms/nv50: use the correct state for base channel notifier setup
Fixes: 857263 ("drm/nouveau: Handle drm_atomic_helper_swap_state failure") Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Tested-by: Lyude Paul <lyude@redhat.com> Reviewed by: Lyude Paul <lyude@redhat.com>
1 parent 2cb3a34 commit d324c5b

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/gpu/drm/nouveau/nv50_display.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4099,7 +4099,7 @@ nv50_disp_atomic_commit(struct drm_device *dev,
40994099
{
41004100
struct nouveau_drm *drm = nouveau_drm(dev);
41014101
struct nv50_disp *disp = nv50_disp(dev);
4102-
struct drm_plane_state *old_plane_state;
4102+
struct drm_plane_state *new_plane_state;
41034103
struct drm_plane *plane;
41044104
struct drm_crtc *crtc;
41054105
bool active = false;
@@ -4129,8 +4129,8 @@ nv50_disp_atomic_commit(struct drm_device *dev,
41294129
if (ret)
41304130
goto err_cleanup;
41314131

4132-
for_each_old_plane_in_state(state, plane, old_plane_state, i) {
4133-
struct nv50_wndw_atom *asyw = nv50_wndw_atom(old_plane_state);
4132+
for_each_new_plane_in_state(state, plane, new_plane_state, i) {
4133+
struct nv50_wndw_atom *asyw = nv50_wndw_atom(new_plane_state);
41344134
struct nv50_wndw *wndw = nv50_wndw(plane);
41354135

41364136
if (asyw->set.image) {

0 commit comments

Comments
 (0)