nouveau: cleanup the nv04 pgraph save/restore mechanism.

2 files changed, 145 insertions, 124 deletions

diff --git a/shared-core/nouveau_reg.h b/shared-core/nouveau_reg.h
index c45ca87a..542e7eca 100644
--- a/shared-core/nouveau_reg.h
+++ b/shared-core/nouveau_reg.h
@@ -170,6 +170,7 @@
 
 #define NV04_PGRAPH_BPIXEL                                 0x00400724
 #define NV10_PGRAPH_RDI_INDEX                              0x00400750
+#define NV04_PGRAPH_FFINTFC_ST2                            0x00400754
 #define NV10_PGRAPH_RDI_DATA                               0x00400754
 #define NV04_PGRAPH_DMA_PITCH                              0x00400760
 #define NV10_PGRAPH_FFINTFC_ST2                            0x00400764
diff --git a/shared-core/nv04_graph.c b/shared-core/nv04_graph.c
index 47fb8a1d..d7d78001 100644
--- a/shared-core/nv04_graph.c
+++ b/shared-core/nv04_graph.c
@@ -27,132 +27,133 @@
 #include "nouveau_drm.h"
 #include "nouveau_drv.h"
 
-
-// FIXME check if NV10/NV04 names are the same or if we need separate regs
-static int nv04_graph_ctx_regs [] = {
-	NV04_PGRAPH_CTX_SWITCH1,	1,
-	NV04_PGRAPH_CTX_SWITCH2,	1,
-	NV04_PGRAPH_CTX_SWITCH3,	1,
-	NV04_PGRAPH_CTX_SWITCH4,	1,
-	NV04_PGRAPH_CTX_USER,		1,
-	NV04_PGRAPH_CTX_CACHE1,		8,
-	NV04_PGRAPH_CTX_CACHE2,		8,
-	NV04_PGRAPH_CTX_CACHE3,		8,
-	NV04_PGRAPH_CTX_CACHE4,		8,
-	NV03_PGRAPH_ABS_X_RAM,		32,
-	NV03_PGRAPH_ABS_Y_RAM,		32,
-	NV03_PGRAPH_X_MISC,		1,
-	NV03_PGRAPH_Y_MISC,		1,
-	NV04_PGRAPH_VALID1,		1,
-	NV04_PGRAPH_SOURCE_COLOR,	1,
-	NV04_PGRAPH_MISC24_0,		1,
-	NV03_PGRAPH_XY_LOGIC_MISC0,	1,
-	NV03_PGRAPH_XY_LOGIC_MISC1,	1,
-	NV03_PGRAPH_XY_LOGIC_MISC2,	1,
-	NV03_PGRAPH_XY_LOGIC_MISC3,	1,
-	NV03_PGRAPH_CLIPX_0,		1,
-	NV03_PGRAPH_CLIPX_1,		1,
-	NV03_PGRAPH_CLIPY_0,		1,
-	NV03_PGRAPH_CLIPY_1,		1,
-	NV03_PGRAPH_ABS_ICLIP_XMAX,	1,
-	NV03_PGRAPH_ABS_ICLIP_YMAX,	1,
-	NV03_PGRAPH_ABS_UCLIP_XMIN,	1,
-	NV03_PGRAPH_ABS_UCLIP_YMIN,	1,
-	NV03_PGRAPH_ABS_UCLIP_XMAX,	1,
-	NV03_PGRAPH_ABS_UCLIP_YMAX,	1,
-	NV03_PGRAPH_ABS_UCLIPA_XMIN,	1,
-	NV03_PGRAPH_ABS_UCLIPA_YMIN,	1,
-	NV03_PGRAPH_ABS_UCLIPA_XMAX,	1,
-	NV03_PGRAPH_ABS_UCLIPA_YMAX,	1,
-	NV04_PGRAPH_MISC24_1,		1,
-	NV04_PGRAPH_MISC24_2,		1,
-	NV04_PGRAPH_VALID2,		1,
-	NV04_PGRAPH_PASSTHRU_0,		1,
-	NV04_PGRAPH_PASSTHRU_1,		1,
-	NV04_PGRAPH_PASSTHRU_2,		1,
-	NV04_PGRAPH_COMBINE_0_ALPHA,	1,
-	NV04_PGRAPH_COMBINE_0_COLOR,	1,
-	NV04_PGRAPH_COMBINE_1_ALPHA,	1,
-	NV04_PGRAPH_COMBINE_1_COLOR,	1,
+struct reg_interval
+{
+	int reg;
+	int number;
+} nv04_graph_ctx_regs [] = {
+	{NV04_PGRAPH_CTX_SWITCH1,	1},
+	{NV04_PGRAPH_CTX_SWITCH2,	1},
+	{NV04_PGRAPH_CTX_SWITCH3,	1},
+	{NV04_PGRAPH_CTX_SWITCH4,	1},
+	{NV04_PGRAPH_CTX_USER,		1},
+	{NV04_PGRAPH_CTX_CACHE1,	8},
+	{NV04_PGRAPH_CTX_CACHE2,	8},
+	{NV04_PGRAPH_CTX_CACHE3,	8},
+	{NV04_PGRAPH_CTX_CACHE4,	8},
+	{NV03_PGRAPH_ABS_X_RAM,		32},
+	{NV03_PGRAPH_ABS_Y_RAM,		32},
+	{NV03_PGRAPH_X_MISC,		1},
+	{NV03_PGRAPH_Y_MISC,		1},
+	{NV04_PGRAPH_VALID1,		1},
+	{NV04_PGRAPH_SOURCE_COLOR,	1},
+	{NV04_PGRAPH_MISC24_0,		1},
+	{NV03_PGRAPH_XY_LOGIC_MISC0,	1},
+	{NV03_PGRAPH_XY_LOGIC_MISC1,	1},
+	{NV03_PGRAPH_XY_LOGIC_MISC2,	1},
+	{NV03_PGRAPH_XY_LOGIC_MISC3,	1},
+	{NV03_PGRAPH_CLIPX_0,		1},
+	{NV03_PGRAPH_CLIPX_1,		1},
+	{NV03_PGRAPH_CLIPY_0,		1},
+	{NV03_PGRAPH_CLIPY_1,		1},
+	{NV03_PGRAPH_ABS_ICLIP_XMAX,	1},
+	{NV03_PGRAPH_ABS_ICLIP_YMAX,	1},
+	{NV03_PGRAPH_ABS_UCLIP_XMIN,	1},
+	{NV03_PGRAPH_ABS_UCLIP_YMIN,	1},
+	{NV03_PGRAPH_ABS_UCLIP_XMAX,	1},
+	{NV03_PGRAPH_ABS_UCLIP_YMAX,	1},
+	{NV03_PGRAPH_ABS_UCLIPA_XMIN,	1},
+	{NV03_PGRAPH_ABS_UCLIPA_YMIN,	1},
+	{NV03_PGRAPH_ABS_UCLIPA_XMAX,	1},
+	{NV03_PGRAPH_ABS_UCLIPA_YMAX,	1},
+	{NV04_PGRAPH_MISC24_1,		1},
+	{NV04_PGRAPH_MISC24_2,		1},
+	{NV04_PGRAPH_VALID2,		1},
+	{NV04_PGRAPH_PASSTHRU_0,	1},
+	{NV04_PGRAPH_PASSTHRU_1,	1},
+	{NV04_PGRAPH_PASSTHRU_2,	1},
+	{NV04_PGRAPH_COMBINE_0_ALPHA,	1},
+	{NV04_PGRAPH_COMBINE_0_COLOR,	1},
+	{NV04_PGRAPH_COMBINE_1_ALPHA,	1},
+	{NV04_PGRAPH_COMBINE_1_COLOR,	1},
 	// texture state
-	NV04_PGRAPH_FORMAT_0,		1,
-	NV04_PGRAPH_FORMAT_1,		1,
-	NV04_PGRAPH_FILTER_0,		1,
-	NV04_PGRAPH_FILTER_1,		1,
+	{NV04_PGRAPH_FORMAT_0,		1},
+	{NV04_PGRAPH_FORMAT_1,		1},
+	{NV04_PGRAPH_FILTER_0,		1},
+	{NV04_PGRAPH_FILTER_1,		1},
 	// vertex state
-	0x004005c0,			1,
-	0x004005c4,			1,
-	0x004005c8,			1,
-	0x004005cc,			1,
-	0x004005d0,			1,
-	0x004005d4,			1,
-	0x004005d8,			1,
-	0x004005dc,			1,
-	0x004005e0,			1,
-	NV03_PGRAPH_MONO_COLOR0,	1,
-	NV04_PGRAPH_ROP3,		1,
-	NV04_PGRAPH_BETA_AND,		1,
-	NV04_PGRAPH_BETA_PREMULT,	1,
-	NV04_PGRAPH_FORMATS,		1,
-	NV04_PGRAPH_BOFFSET0,		6,
-	NV04_PGRAPH_BBASE0,		6,
-	NV04_PGRAPH_BPITCH0,		5,
-	NV04_PGRAPH_BLIMIT0,		6,
-	NV04_PGRAPH_BSWIZZLE2,		1,
-	NV04_PGRAPH_BSWIZZLE5,		1,
-	NV04_PGRAPH_SURFACE,		1,
-	NV04_PGRAPH_STATE,		1,
-	NV04_PGRAPH_NOTIFY,		1,
-	NV04_PGRAPH_BPIXEL,		1,
-	NV04_PGRAPH_DMA_PITCH,		1,
-	NV04_PGRAPH_DVD_COLORFMT,	1,
-	NV04_PGRAPH_SCALED_FORMAT,	1,
-	NV04_PGRAPH_PATT_COLOR0,	1,
-	NV04_PGRAPH_PATT_COLOR1,	1,
-	NV04_PGRAPH_PATTERN,		2,
-	NV04_PGRAPH_PATTERN_SHAPE,	1,
-	NV04_PGRAPH_CHROMA,		1,
-	NV04_PGRAPH_CONTROL0,		1,
-	NV04_PGRAPH_CONTROL1,		1,
-	NV04_PGRAPH_CONTROL2,		1,
-	NV04_PGRAPH_BLEND,		1,
-	NV04_PGRAPH_STORED_FMT,		1,
-	NV04_PGRAPH_PATT_COLORRAM,	64,
-	NV04_PGRAPH_U_RAM,		16,
-	NV04_PGRAPH_V_RAM,		16,
-	NV04_PGRAPH_W_RAM,		16,
-	NV04_PGRAPH_DMA_START_0,	1,
-	NV04_PGRAPH_DMA_START_1,	1,
-	NV04_PGRAPH_DMA_LENGTH,		1,
-	NV04_PGRAPH_DMA_MISC,		1,
-	NV04_PGRAPH_DMA_DATA_0,		1,
-	NV04_PGRAPH_DMA_DATA_1,		1,
-	NV04_PGRAPH_DMA_RM,		1,
-	NV04_PGRAPH_DMA_A_XLATE_INST,	1,
-	NV04_PGRAPH_DMA_A_CONTROL,	1,
-	NV04_PGRAPH_DMA_A_LIMIT,	1,
-	NV04_PGRAPH_DMA_A_TLB_PTE,	1,
-	NV04_PGRAPH_DMA_A_TLB_TAG,	1,
-	NV04_PGRAPH_DMA_A_ADJ_OFFSET,	1,
-	NV04_PGRAPH_DMA_A_OFFSET,	1,
-	NV04_PGRAPH_DMA_A_SIZE,		1,
-	NV04_PGRAPH_DMA_A_Y_SIZE,	1,
-	NV04_PGRAPH_DMA_B_XLATE_INST,	1,
-	NV04_PGRAPH_DMA_B_CONTROL,	1,
-	NV04_PGRAPH_DMA_B_LIMIT,	1,
-	NV04_PGRAPH_DMA_B_TLB_PTE,	1,
-	NV04_PGRAPH_DMA_B_TLB_TAG,	1,
-	NV04_PGRAPH_DMA_B_ADJ_OFFSET,	1,
-	NV04_PGRAPH_DMA_B_OFFSET,	1,
-	NV04_PGRAPH_DMA_B_SIZE,		1,
-	NV04_PGRAPH_DMA_B_Y_SIZE,	1,
-	0,				0
+	{0x004005c0,			1},
+	{0x004005c4,			1},
+	{0x004005c8,			1},
+	{0x004005cc,			1},
+	{0x004005d0,			1},
+	{0x004005d4,			1},
+	{0x004005d8,			1},
+	{0x004005dc,			1},
+	{0x004005e0,			1},
+	{NV03_PGRAPH_MONO_COLOR0,	1},
+	{NV04_PGRAPH_ROP3,		1},
+	{NV04_PGRAPH_BETA_AND,		1},
+	{NV04_PGRAPH_BETA_PREMULT,	1},
+	{NV04_PGRAPH_FORMATS,		1},
+	{NV04_PGRAPH_BOFFSET0,		6},
+	{NV04_PGRAPH_BBASE0,		6},
+	{NV04_PGRAPH_BPITCH0,		5},
+	{NV04_PGRAPH_BLIMIT0,		6},
+	{NV04_PGRAPH_BSWIZZLE2,		1},
+	{NV04_PGRAPH_BSWIZZLE5,		1},
+	{NV04_PGRAPH_SURFACE,		1},
+	{NV04_PGRAPH_STATE,		1},
+	{NV04_PGRAPH_NOTIFY,		1},
+	{NV04_PGRAPH_BPIXEL,		1},
+	{NV04_PGRAPH_DMA_PITCH,		1},
+	{NV04_PGRAPH_DVD_COLORFMT,	1},
+	{NV04_PGRAPH_SCALED_FORMAT,	1},
+	{NV04_PGRAPH_PATT_COLOR0,	1},
+	{NV04_PGRAPH_PATT_COLOR1,	1},
+	{NV04_PGRAPH_PATTERN,		2},
+	{NV04_PGRAPH_PATTERN_SHAPE,	1},
+	{NV04_PGRAPH_CHROMA,		1},
+	{NV04_PGRAPH_CONTROL0,		1},
+	{NV04_PGRAPH_CONTROL1,		1},
+	{NV04_PGRAPH_CONTROL2,		1},
+	{NV04_PGRAPH_BLEND,		1},
+	{NV04_PGRAPH_STORED_FMT,	1},
+	{NV04_PGRAPH_PATT_COLORRAM,	64},
+	{NV04_PGRAPH_U_RAM,		16},
+	{NV04_PGRAPH_V_RAM,		16},
+	{NV04_PGRAPH_W_RAM,		16},
+	{NV04_PGRAPH_DMA_START_0,	1},
+	{NV04_PGRAPH_DMA_START_1,	1},
+	{NV04_PGRAPH_DMA_LENGTH,	1},
+	{NV04_PGRAPH_DMA_MISC,		1},
+	{NV04_PGRAPH_DMA_DATA_0,	1},
+	{NV04_PGRAPH_DMA_DATA_1,	1},
+	{NV04_PGRAPH_DMA_RM,		1},
+	{NV04_PGRAPH_DMA_A_XLATE_INST,	1},
+	{NV04_PGRAPH_DMA_A_CONTROL,	1},
+	{NV04_PGRAPH_DMA_A_LIMIT,	1},
+	{NV04_PGRAPH_DMA_A_TLB_PTE,	1},
+	{NV04_PGRAPH_DMA_A_TLB_TAG,	1},
+	{NV04_PGRAPH_DMA_A_ADJ_OFFSET,	1},
+	{NV04_PGRAPH_DMA_A_OFFSET,	1},
+	{NV04_PGRAPH_DMA_A_SIZE,	1},
+	{NV04_PGRAPH_DMA_A_Y_SIZE,	1},
+	{NV04_PGRAPH_DMA_B_XLATE_INST,	1},
+	{NV04_PGRAPH_DMA_B_CONTROL,	1},
+	{NV04_PGRAPH_DMA_B_LIMIT,	1},
+	{NV04_PGRAPH_DMA_B_TLB_PTE,	1},
+	{NV04_PGRAPH_DMA_B_TLB_TAG,	1},
+	{NV04_PGRAPH_DMA_B_ADJ_OFFSET,	1},
+	{NV04_PGRAPH_DMA_B_OFFSET,	1},
+	{NV04_PGRAPH_DMA_B_SIZE,	1},
+	{NV04_PGRAPH_DMA_B_Y_SIZE,	1},
 };
 
 void nouveau_nv04_context_switch(drm_device_t *dev)
 {
 	drm_nouveau_private_t *dev_priv = dev->dev_private;
-	int channel, channel_old, i;
+	int channel, channel_old, i, j, index;
 
 	channel=NV_READ(NV03_PFIFO_CACHE1_PUSH1)&(nouveau_fifo_number(dev)-1);
 	channel_old = (NV_READ(NV04_PGRAPH_CTX_USER) >> 24) & (nouveau_fifo_number(dev)-1);
@@ -167,8 +168,13 @@ void nouveau_nv04_context_switch(drm_device_t *dev)
 #endif
 
 	// save PGRAPH context
-	for (i = 0; nv04_graph_ctx_regs[i]; i++)
-		dev_priv->fifos[channel_old].pgraph_ctx[i] = NV_READ(nv04_graph_ctx_regs[i]);
+	index=0;
+	for (i = 0; i<sizeof(nv04_graph_ctx_regs)/sizeof(nv04_graph_ctx_regs[0]); i++)
+		for (j = 0; j<nv04_graph_ctx_regs[i].number; j++)
+		{
+			dev_priv->fifos[channel_old].pgraph_ctx[index] = NV_READ(nv04_graph_ctx_regs[i].reg+j*4);
+			index++;
+		}
 
 	nouveau_wait_for_idle(dev);
 
@@ -179,14 +185,19 @@ void nouveau_nv04_context_switch(drm_device_t *dev)
 	// restore PGRAPH context
 	//XXX not working yet
 #if 1
-	for (i = 0; nv04_graph_ctx_regs[i]; i++)
-		NV_WRITE(nv04_graph_ctx_regs[i], dev_priv->fifos[channel].pgraph_ctx[i]);
+	index=0;
+	for (i = 0; i<sizeof(nv04_graph_ctx_regs)/sizeof(nv04_graph_ctx_regs[0]); i++)
+		for (j = 0; j<nv04_graph_ctx_regs[i].number; j++)
+		{
+			NV_WRITE(nv04_graph_ctx_regs[i].reg+j*4, dev_priv->fifos[channel].pgraph_ctx[index]);
+			index++;
+		}
 	nouveau_wait_for_idle(dev);
 #endif
 
 	NV_WRITE(NV03_PGRAPH_CTX_CONTROL, 0x10010100);
 	NV_WRITE(NV04_PGRAPH_CTX_USER, channel << 24);
-	//NV_WRITE(NV_PGRAPH_FFINTFC_ST2, NV_READ(NV_PGRAPH_FFINTFC_ST2)&0xCFFFFFFF);
+	NV_WRITE(NV04_PGRAPH_FFINTFC_ST2, NV_READ(NV04_PGRAPH_FFINTFC_ST2)&0xCFFFFFFF);
 
 #if 0
 	NV_WRITE(NV_PFIFO_CACH1_PUL0, 0x00000001);
@@ -213,5 +224,14 @@ int nv04_graph_context_create(drm_device_t *dev, int channel) {
 
 
 int nv04_graph_init(drm_device_t *dev) {
+	drm_nouveau_private_t *dev_priv = dev->dev_private;
+
+	// check the context is big enough
+	int i,sum=0;
+	for ( i = 0 ; i<sizeof(nv04_graph_ctx_regs)/sizeof(nv04_graph_ctx_regs[0]); i++)
+		sum+=nv04_graph_ctx_regs[i].number;
+	if ( sum*4>sizeof(dev_priv->fifos[0].pgraph_ctx) )
+		DRM_ERROR();
 	return 0;
 }
+