Commit 61671d85 authored by Ben Skeggs's avatar Ben Skeggs Committed by Danilo Krummrich
Browse files

drm/nouveau/kms: remove push pointer from nv50_dmac 



The struct itself lives in nv50_dmac already, just use that.

Signed-off-by: default avatarBen Skeggs <bskeggs@nvidia.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-38-bskeggs@nvidia.com
parent 723388bc

drivers/gpu/drm/nouveau/dispnv50/base507c.c

+9 −9
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
int

base507c_update(struct nv50_wndw *wndw, u32 *interlock)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))
@@ -48,7 +48,7 @@ base507c_update(struct nv50_wndw *wndw, u32 *interlock) 
int

base507c_image_clr(struct nv50_wndw *wndw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 4)))
@@ -65,7 +65,7 @@ base507c_image_clr(struct nv50_wndw *wndw) 
static int

base507c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 13)))
@@ -118,7 +118,7 @@ base507c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) 
int

base507c_xlut_clr(struct nv50_wndw *wndw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))
@@ -132,7 +132,7 @@ base507c_xlut_clr(struct nv50_wndw *wndw) 
int

base507c_xlut_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))
@@ -158,7 +158,7 @@ base507c_ntfy_wait_begun(struct nouveau_bo *bo, u32 offset, 
int

base507c_ntfy_clr(struct nv50_wndw *wndw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))
@@ -171,7 +171,7 @@ base507c_ntfy_clr(struct nv50_wndw *wndw) 
int

base507c_ntfy_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 3)))
@@ -195,7 +195,7 @@ base507c_ntfy_reset(struct nouveau_bo *bo, u32 offset) 
int

base507c_sema_clr(struct nv50_wndw *wndw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))
@@ -208,7 +208,7 @@ base507c_sema_clr(struct nv50_wndw *wndw) 
int

base507c_sema_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 5)))

drivers/gpu/drm/nouveau/dispnv50/base827c.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
static int

base827c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 13)))

drivers/gpu/drm/nouveau/dispnv50/base907c.c

+5 −5
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
static int

base907c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 10)))
@@ -65,7 +65,7 @@ base907c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) 
static int

base907c_xlut_clr(struct nv50_wndw *wndw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 6)))
@@ -84,7 +84,7 @@ base907c_xlut_clr(struct nv50_wndw *wndw) 
static int

base907c_xlut_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 6)))
@@ -156,7 +156,7 @@ base907c_csc(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw, 
static int

base907c_csc_clr(struct nv50_wndw *wndw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))
@@ -170,7 +170,7 @@ base907c_csc_clr(struct nv50_wndw *wndw) 
static int

base907c_csc_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	struct nvif_push *push = wndw->wndw.push;

	struct nvif_push *push = &wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 13)))

drivers/gpu/drm/nouveau/dispnv50/core507d.c

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
int

core507d_update(struct nv50_core *core, u32 *interlock, bool ntfy)

{

	struct nvif_push *push = core->chan.push;

	struct nvif_push *push = &core->chan.push;

	int ret;



	if ((ret = PUSH_WAIT(push, (ntfy ? 2 : 0) + 3)))
@@ -80,7 +80,7 @@ core507d_ntfy_init(struct nouveau_bo *bo, u32 offset) 
int

core507d_read_caps(struct nv50_disp *disp)

{

	struct nvif_push *push = disp->core->chan.push;

	struct nvif_push *push = &disp->core->chan.push;

	int ret;



	ret = PUSH_WAIT(push, 6);
@@ -130,7 +130,7 @@ core507d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp) 
int

core507d_init(struct nv50_core *core)

{

	struct nvif_push *push = core->chan.push;

	struct nvif_push *push = &core->chan.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))

drivers/gpu/drm/nouveau/dispnv50/corec37d.c

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
int

corec37d_wndw_owner(struct nv50_core *core)

{

	struct nvif_push *push = core->chan.push;

	struct nvif_push *push = &core->chan.push;

	const u32 windows = 8; /*XXX*/

	int ret, i;
@@ -51,7 +51,7 @@ corec37d_wndw_owner(struct nv50_core *core) 
int

corec37d_update(struct nv50_core *core, u32 *interlock, bool ntfy)

{

	struct nvif_push *push = core->chan.push;

	struct nvif_push *push = &core->chan.push;

	int ret;



	if ((ret = PUSH_WAIT(push, (ntfy ? 2 * 2 : 0) + 5)))
@@ -127,7 +127,7 @@ int corec37d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp) 
static int

corec37d_init(struct nv50_core *core)

{

	struct nvif_push *push = core->chan.push;

	struct nvif_push *push = &core->chan.push;

	const u32 windows = 8; /*XXX*/

	int ret, i;