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

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

+9 −7

Original line number	Diff line number	Diff line
		@@ -127,15 +127,17 @@ base907c_csc(struct nv50_wndw wndw, struct nv50_wndw_atom asyw,
		}
		}

		static void
		static int
		base907c_csc_clr(struct nv50_wndw *wndw)
		{
		u32 *push;
		if ((push = evo_wait(&wndw->wndw, 2))) {
		evo_mthd(push, 0x0140, 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, NV907C, 0x0140, 0x00000000);
		return 0;
		}

		static int

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ struct nv50_wndw_func {
		void (csc)(struct nv50_wndw , struct nv50_wndw_atom *,
		const struct drm_color_ctm *);
		int (csc_set)(struct nv50_wndw , struct nv50_wndw_atom *);
		void (csc_clr)(struct nv50_wndw );
		int (csc_clr)(struct nv50_wndw );
		bool ilut_identity;
		int ilut_size;
		bool olut_core;

+2 −1

Original line number	Diff line number	Diff line
		@@ -29,9 +29,10 @@
		#include <nvif/clc37e.h>
		#include <nvif/pushc37b.h>

		static void
		static int
		wndwc37e_csc_clr(struct nv50_wndw *wndw)
		{
		return 0;
		}

		static int

+14 −18

Original line number	Diff line number	Diff line
		@@ -61,26 +61,22 @@ wndwc57e_image_set(struct nv50_wndw wndw, struct nv50_wndw_atom asyw)
		evo_kick(push, &wndw->wndw);
		}

		static void
		static int
		wndwc57e_csc_clr(struct nv50_wndw *wndw)
		{
		u32 *push;
		if ((push = evo_wait(&wndw->wndw, 13))) {
		evo_mthd(push, 0x0400, 12);
		evo_data(push, 0x00010000);
		evo_data(push, 0x00000000);
		evo_data(push, 0x00000000);
		evo_data(push, 0x00000000);
		evo_data(push, 0x00000000);
		evo_data(push, 0x00010000);
		evo_data(push, 0x00000000);
		evo_data(push, 0x00000000);
		evo_data(push, 0x00000000);
		evo_data(push, 0x00000000);
		evo_data(push, 0x00010000);
		evo_data(push, 0x00000000);
		evo_kick(push, &wndw->wndw);
		}
		struct nvif_push *push = wndw->wndw.push;
		const u32 identity[12] = {
		0x00010000, 0x00000000, 0x00000000, 0x00000000,
		0x00000000, 0x00010000, 0x00000000, 0x00000000,
		0x00000000, 0x00000000, 0x00010000, 0x00000000,
		};
		int ret;

		if ((ret = PUSH_WAIT(push, 1 + ARRAY_SIZE(identity))))
		return ret;

		PUSH_NVSQ(push, NVC57E, 0x0400, identity, ARRAY_SIZE(identity));
		return 0;
		}

		static int