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-: convert wndw ntfy_clr() to new push macros 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
This commit is contained in:
Ben Skeggs 2020-06-20 08:32:28 +10:00
parent fe8a2eec7d
commit bcae99c282
8 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,6 @@ void base507c_release(struct nv50_wndw *, struct nv50_wndw_atom *,
struct nv50_head_atom *); struct nv50_head_atom *);
int base507c_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *); int base507c_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *);
int base507c_sema_clr(struct nv50_wndw *); int base507c_sema_clr(struct nv50_wndw *);
void base507c_ntfy_clr(struct nv50_wndw *);
void base507c_xlut_set(struct nv50_wndw *, struct nv50_wndw_atom *); void base507c_xlut_set(struct nv50_wndw *, struct nv50_wndw_atom *);
void base507c_xlut_clr(struct nv50_wndw *); void base507c_xlut_clr(struct nv50_wndw *);
void base507c_image_clr(struct nv50_wndw *); void base507c_image_clr(struct nv50_wndw *);

16
drivers/gpu/drm/nouveau/dispnv50/base507c.c
View File

@ -124,15 +124,17 @@ base507c_ntfy_wait_begun(struct nouveau_bo *bo, u32 offset,
return time < 0 ? time : 0; return time < 0 ? time : 0;
} }
void int
base507c_ntfy_clr(struct nv50_wndw *wndw) base507c_ntfy_clr(struct nv50_wndw *wndw)
{ {
u32 *push; struct nvif_push *push = wndw->wndw.push;
if ((push = evo_wait(&wndw->wndw, 2))) { int ret;
evo_mthd(push, 0x00a4, 1);
evo_data(push, 0x00000000); if ((ret = PUSH_WAIT(push, 2)))
evo_kick(push, &wndw->wndw); return ret;
}
PUSH_NVSQ(push, NV507C, 0x00a4, 0x00000000);
return 0;
} }
int int

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

@ -10,7 +10,6 @@ int ovly507e_acquire(struct nv50_wndw *, struct nv50_wndw_atom *,
struct nv50_head_atom *); struct nv50_head_atom *);
void ovly507e_release(struct nv50_wndw *, struct nv50_wndw_atom *, void ovly507e_release(struct nv50_wndw *, struct nv50_wndw_atom *,
struct nv50_head_atom *); struct nv50_head_atom *);
void ovly507e_ntfy_clr(struct nv50_wndw *);
void ovly507e_image_clr(struct nv50_wndw *); void ovly507e_image_clr(struct nv50_wndw *);
void ovly507e_scale_set(struct nv50_wndw *, struct nv50_wndw_atom *); void ovly507e_scale_set(struct nv50_wndw *, struct nv50_wndw_atom *);
void ovly507e_update(struct nv50_wndw *, u32 *); void ovly507e_update(struct nv50_wndw *, u32 *);

13
drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
View File

@ -92,17 +92,6 @@ ovly507e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
} }
} }
void
ovly507e_ntfy_clr(struct nv50_wndw *wndw)
{
u32 *push;
if ((push = evo_wait(&wndw->wndw, 2))) {
evo_mthd(push, 0x00a4, 1);
evo_data(push, 0x00000000);
evo_kick(push, &wndw->wndw);
}
}
void void
ovly507e_release(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw, ovly507e_release(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
struct nv50_head_atom *asyh) struct nv50_head_atom *asyh)
@ -135,7 +124,7 @@ ovly507e = {
.acquire = ovly507e_acquire, .acquire = ovly507e_acquire,
.release = ovly507e_release, .release = ovly507e_release,
.ntfy_set = base507c_ntfy_set, .ntfy_set = base507c_ntfy_set,
.ntfy_clr = ovly507e_ntfy_clr, .ntfy_clr = base507c_ntfy_clr,
.ntfy_reset = base507c_ntfy_reset, .ntfy_reset = base507c_ntfy_reset,
.ntfy_wait_begun = base507c_ntfy_wait_begun, .ntfy_wait_begun = base507c_ntfy_wait_begun,
.image_set = ovly507e_image_set, .image_set = ovly507e_image_set,

2
drivers/gpu/drm/nouveau/dispnv50/ovly827e.c
View File

@ -78,7 +78,7 @@ ovly827e = {
.acquire = ovly507e_acquire, .acquire = ovly507e_acquire,
.release = ovly507e_release, .release = ovly507e_release,
.ntfy_set = base507c_ntfy_set, .ntfy_set = base507c_ntfy_set,
.ntfy_clr = ovly507e_ntfy_clr, .ntfy_clr = base507c_ntfy_clr,
.ntfy_reset = ovly827e_ntfy_reset, .ntfy_reset = ovly827e_ntfy_reset,
.ntfy_wait_begun = ovly827e_ntfy_wait_begun, .ntfy_wait_begun = ovly827e_ntfy_wait_begun,
.image_set = ovly827e_image_set, .image_set = ovly827e_image_set,

2
drivers/gpu/drm/nouveau/dispnv50/ovly907e.c
View File

@ -52,7 +52,7 @@ ovly907e = {
.acquire = ovly507e_acquire, .acquire = ovly507e_acquire,
.release = ovly507e_release, .release = ovly507e_release,
.ntfy_set = base507c_ntfy_set, .ntfy_set = base507c_ntfy_set,
.ntfy_clr = ovly507e_ntfy_clr, .ntfy_clr = base507c_ntfy_clr,
.ntfy_reset = ovly827e_ntfy_reset, .ntfy_reset = ovly827e_ntfy_reset,
.ntfy_wait_begun = ovly827e_ntfy_wait_begun, .ntfy_wait_begun = ovly827e_ntfy_wait_begun,
.image_set = ovly907e_image_set, .image_set = ovly907e_image_set,

5
drivers/gpu/drm/nouveau/dispnv50/wndw.h
View File

@ -61,7 +61,7 @@ struct nv50_wndw_func {
int (*sema_clr)(struct nv50_wndw *); int (*sema_clr)(struct nv50_wndw *);
void (*ntfy_reset)(struct nouveau_bo *, u32 offset); void (*ntfy_reset)(struct nouveau_bo *, u32 offset);
int (*ntfy_set)(struct nv50_wndw *, struct nv50_wndw_atom *); int (*ntfy_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
void (*ntfy_clr)(struct nv50_wndw *); int (*ntfy_clr)(struct nv50_wndw *);
int (*ntfy_wait_begun)(struct nouveau_bo *, u32 offset, int (*ntfy_wait_begun)(struct nouveau_bo *, u32 offset,
struct nvif_device *); struct nvif_device *);
bool (*ilut)(struct nv50_wndw *, struct nv50_wndw_atom *, int); bool (*ilut)(struct nv50_wndw *, struct nv50_wndw_atom *, int);
@ -86,6 +86,7 @@ extern const struct drm_plane_funcs nv50_wndw;
void base507c_ntfy_reset(struct nouveau_bo *, u32); void base507c_ntfy_reset(struct nouveau_bo *, u32);
int base507c_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *); 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_ntfy_wait_begun(struct nouveau_bo *, u32, struct nvif_device *);
void base907c_csc(struct nv50_wndw *, struct nv50_wndw_atom *, void base907c_csc(struct nv50_wndw *, struct nv50_wndw_atom *,
@ -119,7 +120,7 @@ void wndwc37e_release(struct nv50_wndw *, struct nv50_wndw_atom *,
int wndwc37e_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *); int wndwc37e_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *);
int wndwc37e_sema_clr(struct nv50_wndw *); int wndwc37e_sema_clr(struct nv50_wndw *);
int wndwc37e_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *); int wndwc37e_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *);
void wndwc37e_ntfy_clr(struct nv50_wndw *); int wndwc37e_ntfy_clr(struct nv50_wndw *);
void wndwc37e_image_clr(struct nv50_wndw *); void wndwc37e_image_clr(struct nv50_wndw *);
void wndwc37e_blend_set(struct nv50_wndw *, struct nv50_wndw_atom *); void wndwc37e_blend_set(struct nv50_wndw *, struct nv50_wndw_atom *);
void wndwc37e_update(struct nv50_wndw *, u32 *); void wndwc37e_update(struct nv50_wndw *, u32 *);

16
drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
View File

@ -152,15 +152,17 @@ wndwc37e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
evo_kick(push, &wndw->wndw); evo_kick(push, &wndw->wndw);
} }
void int
wndwc37e_ntfy_clr(struct nv50_wndw *wndw) wndwc37e_ntfy_clr(struct nv50_wndw *wndw)
{ {
u32 *push; struct nvif_push *push = wndw->wndw.push;
if ((push = evo_wait(&wndw->wndw, 2))) { int ret;
evo_mthd(push, 0x021c, 1);
evo_data(push, 0x00000000); if ((ret = PUSH_WAIT(push, 2)))
evo_kick(push, &wndw->wndw); return ret;
}
PUSH_NVSQ(push, NVC37E, 0x021c, 0x00000000);
return 0;
} }
int int