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

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@ 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 );
		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 );
		void base507c_xlut_clr(struct nv50_wndw *);

+11 −8

Original line number	Diff line number	Diff line
		@@ -135,16 +135,19 @@ base507c_ntfy_clr(struct nv50_wndw *wndw)
		}
		}

		void
		int
		base507c_ntfy_set(struct nv50_wndw wndw, struct nv50_wndw_atom asyw)
		{
		u32 *push;
		if ((push = evo_wait(&wndw->wndw, 3))) {
		evo_mthd(push, 0x00a0, 2);
		evo_data(push, asyw->ntfy.awaken << 30 \| asyw->ntfy.offset);
		evo_data(push, asyw->ntfy.handle);
		evo_kick(push, &wndw->wndw);
		}
		struct nvif_push *push = wndw->wndw.push;
		int ret;

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

		PUSH_NVSQ(push, NV507C, 0x00a0, asyw->ntfy.awaken << 30 \|
		asyw->ntfy.offset,
		0x00a4, asyw->ntfy.handle);
		return 0;
		}

		void

+0 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@ int ovly507e_acquire(struct nv50_wndw , struct nv50_wndw_atom ,
		struct nv50_head_atom *);
		void ovly507e_release(struct nv50_wndw , struct nv50_wndw_atom ,
		struct nv50_head_atom *);
		void ovly507e_ntfy_set(struct nv50_wndw , struct nv50_wndw_atom );
		void ovly507e_ntfy_clr(struct nv50_wndw *);
		void ovly507e_image_clr(struct nv50_wndw *);
		void ovly507e_scale_set(struct nv50_wndw , struct nv50_wndw_atom );

+1 −13

Original line number	Diff line number	Diff line
		@@ -103,18 +103,6 @@ ovly507e_ntfy_clr(struct nv50_wndw *wndw)
		}
		}

		void
		ovly507e_ntfy_set(struct nv50_wndw wndw, struct nv50_wndw_atom asyw)
		{
		u32 *push;
		if ((push = evo_wait(&wndw->wndw, 3))) {
		evo_mthd(push, 0x00a0, 2);
		evo_data(push, asyw->ntfy.awaken << 30 \| asyw->ntfy.offset);
		evo_data(push, asyw->ntfy.handle);
		evo_kick(push, &wndw->wndw);
		}
		}

		void
		ovly507e_release(struct nv50_wndw wndw, struct nv50_wndw_atom asyw,
		struct nv50_head_atom *asyh)
		@@ -146,7 +134,7 @@ static const struct nv50_wndw_func
		ovly507e = {
		.acquire = ovly507e_acquire,
		.release = ovly507e_release,
		.ntfy_set = ovly507e_ntfy_set,
		.ntfy_set = base507c_ntfy_set,
		.ntfy_clr = ovly507e_ntfy_clr,
		.ntfy_reset = base507c_ntfy_reset,
		.ntfy_wait_begun = base507c_ntfy_wait_begun,

+1 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ static const struct nv50_wndw_func
		ovly827e = {
		.acquire = ovly507e_acquire,
		.release = ovly507e_release,
		.ntfy_set = ovly507e_ntfy_set,
		.ntfy_set = base507c_ntfy_set,
		.ntfy_clr = ovly507e_ntfy_clr,
		.ntfy_reset = ovly827e_ntfy_reset,
		.ntfy_wait_begun = ovly827e_ntfy_wait_begun,