drm: Rename plane atomic_check state names

[sfrench/cifs-2.6.git] / drivers / gpu / drm / nouveau / dispnv50 / wndw.c

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
index 0356474ad6f6afcd37e5c9540968d406fb5b41bc..f83bfc0794ab05d6695e5dc2bf6474cfc5f5c493 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
@@ -434,12 +434,13 @@ nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw,
 }
 
 static int
-nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state)
+nv50_wndw_atomic_check(struct drm_plane *plane,
+                      struct drm_plane_state *new_plane_state)
 {
        struct nouveau_drm *drm = nouveau_drm(plane->dev);
        struct nv50_wndw *wndw = nv50_wndw(plane);
        struct nv50_wndw_atom *armw = nv50_wndw_atom(wndw->plane.state);
-       struct nv50_wndw_atom *asyw = nv50_wndw_atom(state);
+       struct nv50_wndw_atom *asyw = nv50_wndw_atom(new_plane_state);
        struct nv50_head_atom *harm = NULL, *asyh = NULL;
        bool modeset = false;
        int ret;