drm/nouveau/kms/nv50-: convert wndw image_clr() to new push macros (8944d8b3) · Commits · 戴 / test

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@ int base507c_sema_set(struct nv50_wndw , struct nv50_wndw_atom );
		int base507c_sema_clr(struct nv50_wndw *);
		int base507c_xlut_set(struct nv50_wndw , struct nv50_wndw_atom );
		int base507c_xlut_clr(struct nv50_wndw *);
		void base507c_image_clr(struct nv50_wndw *);
		void base507c_update(struct nv50_wndw , u32 );

		int base827c_new(struct nouveau_drm , int, s32, struct nv50_wndw *);

+10 −9

Original line number	Diff line number	Diff line
		@@ -43,17 +43,18 @@ base507c_update(struct nv50_wndw wndw, u32 interlock)
		}
		}

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

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

		PUSH_NVSQ(push, NV507C, 0x0084, 0x00000000);
		PUSH_NVSQ(push, NV507C, 0x00c0, 0x00000000);
		return 0;
		}

		static int

+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_image_clr(struct nv50_wndw *);
		void ovly507e_scale_set(struct nv50_wndw , struct nv50_wndw_atom );
		void ovly507e_update(struct nv50_wndw , u32 );

+1 −14

Original line number	Diff line number	Diff line
		@@ -54,19 +54,6 @@ ovly507e_scale_set(struct nv50_wndw wndw, struct nv50_wndw_atom asyw)
		}
		}

		void
		ovly507e_image_clr(struct nv50_wndw *wndw)
		{
		u32 *push;
		if ((push = evo_wait(&wndw->wndw, 4))) {
		evo_mthd(push, 0x0084, 1);
		evo_data(push, 0x00000000);
		evo_mthd(push, 0x00c0, 1);
		evo_data(push, 0x00000000);
		evo_kick(push, &wndw->wndw);
		}
		}

		static int
		ovly507e_image_set(struct nv50_wndw wndw, struct nv50_wndw_atom asyw)
		{
		@@ -127,7 +114,7 @@ ovly507e = {
		.ntfy_reset = base507c_ntfy_reset,
		.ntfy_wait_begun = base507c_ntfy_wait_begun,
		.image_set = ovly507e_image_set,
		.image_clr = ovly507e_image_clr,
		.image_clr = base507c_image_clr,
		.scale_set = ovly507e_scale_set,
		.update = ovly507e_update,
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ ovly827e = {
		.ntfy_reset = ovly827e_ntfy_reset,
		.ntfy_wait_begun = ovly827e_ntfy_wait_begun,
		.image_set = ovly827e_image_set,
		.image_clr = ovly507e_image_clr,
		.image_clr = base507c_image_clr,
		.scale_set = ovly507e_scale_set,
		.update = ovly507e_update,
		};