diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2020-06-20 09:23:10 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2020-07-24 18:50:53 +1000 |
| commit | 8944d8b37ac9eecfff5706e9a11d5fcb3df64dbb (patch) | |
| tree | 2949f256d612b1e4e28ef0bfea02c2105d5a2883 /drivers/gpu/drm/nouveau/dispnv50/wndw.h | |
| parent | 6d6e11e2844015a5f6c3d0373966fd4a459add8b (diff) | |
| download | linux-stable-8944d8b37ac9eecfff5706e9a11d5fcb3df64dbb.tar.gz linux-stable-8944d8b37ac9eecfff5706e9a11d5fcb3df64dbb.tar.bz2 linux-stable-8944d8b37ac9eecfff5706e9a11d5fcb3df64dbb.zip | |
drm/nouveau/kms/nv50-: convert wndw image_clr() 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/wndw.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/wndw.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.h b/drivers/gpu/drm/nouveau/dispnv50/wndw.h index d6e1c29da379..41b418177646 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.h +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.h @@ -75,7 +75,7 @@ struct nv50_wndw_func { int (*xlut_set)(struct nv50_wndw *, struct nv50_wndw_atom *); int (*xlut_clr)(struct nv50_wndw *); int (*image_set)(struct nv50_wndw *, struct nv50_wndw_atom *); - void (*image_clr)(struct nv50_wndw *); + int (*image_clr)(struct nv50_wndw *); void (*scale_set)(struct nv50_wndw *, struct nv50_wndw_atom *); void (*blend_set)(struct nv50_wndw *, struct nv50_wndw_atom *); @@ -88,6 +88,7 @@ void base507c_ntfy_reset(struct nouveau_bo *, u32); int base507c_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *); int base507c_ntfy_clr(struct nv50_wndw *); int base507c_ntfy_wait_begun(struct nouveau_bo *, u32, struct nvif_device *); +int base507c_image_clr(struct nv50_wndw *); void base907c_csc(struct nv50_wndw *, struct nv50_wndw_atom *, const struct drm_color_ctm *); @@ -121,7 +122,7 @@ int wndwc37e_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *); int wndwc37e_sema_clr(struct nv50_wndw *); int wndwc37e_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *); int wndwc37e_ntfy_clr(struct nv50_wndw *); -void wndwc37e_image_clr(struct nv50_wndw *); +int wndwc37e_image_clr(struct nv50_wndw *); void wndwc37e_blend_set(struct nv50_wndw *, struct nv50_wndw_atom *); void wndwc37e_update(struct nv50_wndw *, u32 *); |