diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-11-01 00:12:25 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-11-01 00:18:33 +0100 |
| commit | d324c5bc462d354d337dcf3a14ffd0eb17b4fa38 (patch) | |
| tree | b87272d0311f5d3114b5d957b39bca5c99a7ee92 /drivers | |
| parent | Merge tag 'drm-intel-fixes-2017-10-18-1' of git://anongit.freedesktop.org/drm... (diff) | |
| download | linux-d324c5bc462d354d337dcf3a14ffd0eb17b4fa38.tar.xz linux-d324c5bc462d354d337dcf3a14ffd0eb17b4fa38.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index e4751f92b342..fb47d46050ec 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -4099,7 +4099,7 @@ nv50_disp_atomic_commit(struct drm_device *dev, { struct nouveau_drm *drm = nouveau_drm(dev); struct nv50_disp *disp = nv50_disp(dev); - struct drm_plane_state *old_plane_state; + struct drm_plane_state *new_plane_state; struct drm_plane *plane; struct drm_crtc *crtc; bool active = false; @@ -4129,8 +4129,8 @@ nv50_disp_atomic_commit(struct drm_device *dev, if (ret) goto err_cleanup; - for_each_old_plane_in_state(state, plane, old_plane_state, i) { - struct nv50_wndw_atom *asyw = nv50_wndw_atom(old_plane_state); + for_each_new_plane_in_state(state, plane, new_plane_state, i) { + struct nv50_wndw_atom *asyw = nv50_wndw_atom(new_plane_state); struct nv50_wndw *wndw = nv50_wndw(plane); if (asyw->set.image) { |