UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/kms/nv50-: simplify swap interval handling 

This is just cleaning up some left-overs from when we needed a custom
legacy page flip implementation.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2018-05-08 20:39:47 +10:00
parent 04fc14be77
commit 45a2945a37
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/dispnv50/atom.h
View File

@ -135,7 +135,6 @@ nv50_head_atom_get(struct drm_atomic_state *state, struct drm_crtc *crtc)
struct nv50_wndw_atom { struct nv50_wndw_atom {
struct drm_plane_state state; struct drm_plane_state state;
u8 interval;
struct { struct {
u32 handle; u32 handle;

11
drivers/gpu/drm/nouveau/dispnv50/wndw.c
View File

@ -208,11 +208,6 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw,
if (ret) if (ret)
return ret; return ret;
if (asyh->state.pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC)
asyw->interval = 0;
else
asyw->interval = 1;
if (asyw->image.kind) { if (asyw->image.kind) {
asyw->image.layout = 0; asyw->image.layout = 0;
if (drm->client.device.info.chipset >= 0xc0) if (drm->client.device.info.chipset >= 0xc0)
@ -231,10 +226,11 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw,
return ret; return ret;
if (asyw->set.image) { if (asyw->set.image) {
if (!(asyw->image.mode = asyw->interval ? 0 : 1)) if (!(asyh->state.pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC))
asyw->image.interval = asyw->interval; asyw->image.interval = 1;
else else
asyw->image.interval = 0; asyw->image.interval = 0;
asyw->image.mode = asyw->image.interval ? 0 : 1;
} }
return 0; return 0;
@ -371,7 +367,6 @@ nv50_wndw_atomic_duplicate_state(struct drm_plane *plane)
if (!(asyw = kmalloc(sizeof(*asyw), GFP_KERNEL))) if (!(asyw = kmalloc(sizeof(*asyw), GFP_KERNEL)))
return NULL; return NULL;
__drm_atomic_helper_plane_duplicate_state(plane, &asyw->state); __drm_atomic_helper_plane_duplicate_state(plane, &asyw->state);
asyw->interval = 1;
asyw->sema = armw->sema; asyw->sema = armw->sema;
asyw->ntfy = armw->ntfy; asyw->ntfy = armw->ntfy;
asyw->image = armw->image; asyw->image = armw->image;