diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2020-06-21 09:28:36 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2020-07-24 18:50:55 +1000 |
| commit | ff37116ea421ed62e99e310b793214f95f1f8eb0 (patch) | |
| tree | 0deb943362bea27a7f97af097191a606532457fe /drivers/gpu/drm/nouveau/dispnv50/head.h | |
| parent | 246db5fd38b934fb6aefc31172e3afc3e613d20d (diff) | |
| download | linux-stable-ff37116ea421ed62e99e310b793214f95f1f8eb0.tar.gz linux-stable-ff37116ea421ed62e99e310b793214f95f1f8eb0.tar.bz2 linux-stable-ff37116ea421ed62e99e310b793214f95f1f8eb0.zip | |
drm/nouveau/kms/nv50-: convert core head_or() to new push macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv50/head.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/head.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.h b/drivers/gpu/drm/nouveau/dispnv50/head.h index 5fca0b725fe4..dae841dc05fd 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/head.h +++ b/drivers/gpu/drm/nouveau/dispnv50/head.h @@ -45,7 +45,7 @@ struct nv50_head_func { int (*ovly)(struct nv50_head *, struct nv50_head_atom *); int (*dither)(struct nv50_head *, struct nv50_head_atom *); int (*procamp)(struct nv50_head *, struct nv50_head_atom *); - void (*or)(struct nv50_head *, struct nv50_head_atom *); + int (*or)(struct nv50_head *, struct nv50_head_atom *); void (*static_wndw_map)(struct nv50_head *, struct nv50_head_atom *); }; @@ -78,7 +78,7 @@ int head907d_curs_set(struct nv50_head *, struct nv50_head_atom *); int head907d_curs_clr(struct nv50_head *); int head907d_ovly(struct nv50_head *, struct nv50_head_atom *); int head907d_procamp(struct nv50_head *, struct nv50_head_atom *); -void head907d_or(struct nv50_head *, struct nv50_head_atom *); +int head907d_or(struct nv50_head *, struct nv50_head_atom *); extern const struct nv50_head_func head917d; int head917d_curs_layout(struct nv50_head *, struct nv50_wndw_atom *, |