drm/nouveau/kms/nv50-: convert wndw sema_clr() to new push macros (c686051a) · Commits · 戴 / test

drivers/gpu/drm/nouveau/dispnv50/base.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ int base507c_acquire(struct nv50_wndw , struct nv50_wndw_atom ,
		void base507c_release(struct nv50_wndw , struct nv50_wndw_atom ,
		struct nv50_head_atom *);
		int base507c_sema_set(struct nv50_wndw , struct nv50_wndw_atom );
		void base507c_sema_clr(struct nv50_wndw *);
		int base507c_sema_clr(struct nv50_wndw *);
		void base507c_ntfy_set(struct nv50_wndw , struct nv50_wndw_atom );
		void base507c_ntfy_clr(struct nv50_wndw *);
		void base507c_xlut_set(struct nv50_wndw , struct nv50_wndw_atom );

+9 −7

Original line number	Diff line number	Diff line
		@@ -153,15 +153,17 @@ base507c_ntfy_reset(struct nouveau_bo *bo, u32 offset)
		nouveau_bo_wr32(bo, offset / 4, 0x00000000);
		}

		void
		int
		base507c_sema_clr(struct nv50_wndw *wndw)
		{
		u32 *push;
		if ((push = evo_wait(&wndw->wndw, 2))) {
		evo_mthd(push, 0x0094, 1);
		evo_data(push, 0x00000000);
		evo_kick(push, &wndw->wndw);
		}
		struct nvif_push *push = wndw->wndw.push;
		int ret;

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

		PUSH_NVSQ(push, NV507C, 0x0094, 0x00000000);
		return 0;
		}

		int

+2 −2

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ struct nv50_wndw_func {
		struct nv50_wndw_atom *asyw);

		int (sema_set)(struct nv50_wndw , struct nv50_wndw_atom *);
		void (sema_clr)(struct nv50_wndw );
		int (sema_clr)(struct nv50_wndw );
		void (ntfy_reset)(struct nouveau_bo , u32 offset);
		void (ntfy_set)(struct nv50_wndw , struct nv50_wndw_atom *);
		void (ntfy_clr)(struct nv50_wndw );
		@@ -116,7 +116,7 @@ int wndwc37e_acquire(struct nv50_wndw , struct nv50_wndw_atom ,
		void wndwc37e_release(struct nv50_wndw , struct nv50_wndw_atom ,
		struct nv50_head_atom *);
		int wndwc37e_sema_set(struct nv50_wndw , struct nv50_wndw_atom );
		void wndwc37e_sema_clr(struct nv50_wndw *);
		int wndwc37e_sema_clr(struct nv50_wndw *);
		void wndwc37e_ntfy_set(struct nv50_wndw , struct nv50_wndw_atom );
		void wndwc37e_ntfy_clr(struct nv50_wndw *);
		void wndwc37e_image_clr(struct nv50_wndw *);

+9 −7

Original line number	Diff line number	Diff line
		@@ -175,15 +175,17 @@ wndwc37e_ntfy_set(struct nv50_wndw wndw, struct nv50_wndw_atom asyw)
		}
		}

		void
		int
		wndwc37e_sema_clr(struct nv50_wndw *wndw)
		{
		u32 *push;
		if ((push = evo_wait(&wndw->wndw, 2))) {
		evo_mthd(push, 0x0218, 1);
		evo_data(push, 0x00000000);
		evo_kick(push, &wndw->wndw);
		}
		struct nvif_push *push = wndw->wndw.push;
		int ret;

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

		PUSH_NVSQ(push, NVC37E, 0x0218, 0x00000000);
		return 0;
		}

		int