drm/nouveau/kms/nv50-: convert wndw update() to new push macros (3afb4db7) · 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_update(struct nv50_wndw , u32 );

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

+9 −7

Original line number	Diff line number	Diff line
		@@ -32,15 +32,17 @@

		#include "nouveau_bo.h"

		void
		int
		base507c_update(struct nv50_wndw wndw, u32 interlock)
		{
		u32 *push;
		if ((push = evo_wait(&wndw->wndw, 2))) {
		evo_mthd(push, 0x0080, 1);
		evo_data(push, interlock[NV50_DISP_INTERLOCK_CORE]);
		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, 0x0080, interlock[NV50_DISP_INTERLOCK_CORE]);
		return PUSH_KICK(push);
		}

		int

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ int ovly507e_acquire(struct nv50_wndw , struct nv50_wndw_atom ,
		void ovly507e_release(struct nv50_wndw , struct nv50_wndw_atom ,
		struct nv50_head_atom *);
		int ovly507e_scale_set(struct nv50_wndw , struct nv50_wndw_atom );
		void ovly507e_update(struct nv50_wndw , u32 );

		extern const u32 ovly827e_format[];
		void ovly827e_ntfy_reset(struct nouveau_bo *, u32);

+1 −12

Original line number	Diff line number	Diff line
		@@ -30,17 +30,6 @@
		#include <nvif/event.h>
		#include <nvif/push507c.h>

		void
		ovly507e_update(struct nv50_wndw wndw, u32 interlock)
		{
		u32 *push;
		if ((push = evo_wait(&wndw->wndw, 2))) {
		evo_mthd(push, 0x0080, 1);
		evo_data(push, interlock[NV50_DISP_INTERLOCK_CORE]);
		evo_kick(push, &wndw->wndw);
		}
		}

		int
		ovly507e_scale_set(struct nv50_wndw wndw, struct nv50_wndw_atom asyw)
		{
		@@ -118,7 +107,7 @@ ovly507e = {
		.image_set = ovly507e_image_set,
		.image_clr = base507c_image_clr,
		.scale_set = ovly507e_scale_set,
		.update = ovly507e_update,
		.update = base507c_update,
		};

		static const u32

+1 −1