From: Ben Skeggs Date: Tue, 8 May 2018 20:39:47 +1000 Subject: drm/nouveau/kms/nv50-: simplify swap interval handling Git-commit: 45a2945a3759479c08a4aceaee181639c92f9d48 Patch-mainline: v4.18-rc1 References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166 This is just cleaning up some left-overs from when we needed a custom legacy page flip implementation. Signed-off-by: Ben Skeggs Acked-by: Petr Tesarik --- drivers/gpu/drm/nouveau/dispnv50/atom.h | 1 - drivers/gpu/drm/nouveau/dispnv50/wndw.c | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) --- a/drivers/gpu/drm/nouveau/dispnv50/atom.h +++ b/drivers/gpu/drm/nouveau/dispnv50/atom.h @@ -135,7 +135,6 @@ nv50_head_atom_get(struct drm_atomic_sta struct nv50_wndw_atom { struct drm_plane_state state; - u8 interval; struct { u32 handle; --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -208,11 +208,6 @@ nv50_wndw_atomic_check_acquire(struct nv if (ret) return ret; - if (asyh->state.pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC) - asyw->interval = 0; - else - asyw->interval = 1; - if (asyw->image.kind) { asyw->image.layout = 0; if (drm->client.device.info.chipset >= 0xc0) @@ -231,10 +226,11 @@ nv50_wndw_atomic_check_acquire(struct nv return ret; if (asyw->set.image) { - if (!(asyw->image.mode = asyw->interval ? 0 : 1)) - asyw->image.interval = asyw->interval; + if (!(asyh->state.pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC)) + asyw->image.interval = 1; else asyw->image.interval = 0; + asyw->image.mode = asyw->image.interval ? 0 : 1; } return 0; @@ -371,7 +367,6 @@ nv50_wndw_atomic_duplicate_state(struct if (!(asyw = kmalloc(sizeof(*asyw), GFP_KERNEL))) return NULL; __drm_atomic_helper_plane_duplicate_state(plane, &asyw->state); - asyw->interval = 1; asyw->sema = armw->sema; asyw->ntfy = armw->ntfy; asyw->image = armw->image;