drm/nouveau/kms/nv50-: convert wndw csc_set() to new push macros (72587dca) · Commits · 戴 / test

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

+12 −9

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@
		*/
		#include "base.h"

		#include <nvif/push507c.h>

		static void
		base907c_image_set(struct nv50_wndw wndw, struct nv50_wndw_atom asyw)
		{
		@@ -136,17 +138,18 @@ base907c_csc_clr(struct nv50_wndw *wndw)
		}
		}

		static void
		static int
		base907c_csc_set(struct nv50_wndw wndw, struct nv50_wndw_atom asyw)
		{
		u32 *push, i;
		if ((push = evo_wait(&wndw->wndw, 13))) {
		evo_mthd(push, 0x0140, 12);
		evo_data(push, asyw->csc.matrix[0] \| 0x80000000);
		for (i = 1; i < 12; i++)
		evo_data(push, asyw->csc.matrix[i]);
		evo_kick(push, &wndw->wndw);
		}
		struct nvif_push *push = wndw->wndw.push;
		int ret;

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

		PUSH_NVSQ(push, NV907C, 0x0140, asyw->csc.matrix[0] \| 0x80000000,
		0x0144, &asyw->csc.matrix[1], 11);
		return 0;
		}

		const struct nv50_wndw_func

+1 −1

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

+9 −8

Original line number	Diff line number	Diff line
		@@ -34,16 +34,17 @@ wndwc37e_csc_clr(struct nv50_wndw *wndw)
		{
		}

		static void
		static int
		wndwc37e_csc_set(struct nv50_wndw wndw, struct nv50_wndw_atom asyw)
		{
		u32 *push, i;
		if ((push = evo_wait(&wndw->wndw, 13))) {
		evo_mthd(push, 0x02bc, 12);
		for (i = 0; i < 12; i++)
		evo_data(push, asyw->csc.matrix[i]);
		evo_kick(push, &wndw->wndw);
		}
		struct nvif_push *push = wndw->wndw.push;
		int ret;

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

		PUSH_NVSQ(push, NVC37E, 0x02bc, asyw->csc.matrix, 12);
		return 0;
		}

		static void

+10 −8

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include <nouveau_bo.h>

		#include <nvif/clc37e.h>
		#include <nvif/pushc37b.h>

		static void
		wndwc57e_image_set(struct nv50_wndw wndw, struct nv50_wndw_atom asyw)
		@@ -82,16 +83,17 @@ wndwc57e_csc_clr(struct nv50_wndw *wndw)
		}
		}

		static void
		static int
		wndwc57e_csc_set(struct nv50_wndw wndw, struct nv50_wndw_atom asyw)
		{
		u32 *push, i;
		if ((push = evo_wait(&wndw->wndw, 13))) {
		evo_mthd(push, 0x0400, 12);
		for (i = 0; i < 12; i++)
		evo_data(push, asyw->csc.matrix[i]);
		evo_kick(push, &wndw->wndw);
		}
		struct nvif_push *push = wndw->wndw.push;
		int ret;

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

		PUSH_NVSQ(push, NVC57E, 0x0400, asyw->csc.matrix, 12);
		return 0;
		}

		static void