From: John Hodge <tpg@ucc.asn.au>
Date: Mon, 16 Feb 2015 08:51:57 +0000 (+0800)
Subject: Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=845b6f9d90bb87b5e760e4d49aa93b0e003ab750;hp=-c;p=tpg%2Facess2.git

Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2
---

845b6f9d90bb87b5e760e4d49aa93b0e003ab750
diff --combined KernelLand/Modules/Display/Tegra2Vid/main.c
index 9ca70984,21769bce..a249fd8d
--- a/KernelLand/Modules/Display/Tegra2Vid/main.c
+++ b/KernelLand/Modules/Display/Tegra2Vid/main.c
@@@ -70,13 -70,11 +70,13 @@@ inline void _dumpreg(int i
  	Log_Debug("Tegra2Vid", "[0x%03x] = 0x%08x (%s)", i, gpTegra2Vid_IOMem[i],
  		(csaTegra2Vid_RegisterNames[i] ? csaTegra2Vid_RegisterNames[i] : "-"));
  }
 +#define DUMPREGS(s,e)	do{for(int ii=(s);ii<=(e);ii++) _dumpreg(ii);}while(0)
  
  void Tegra2Vid_int_DumpRegisters(void)
  {
  	Log_Debug("Tegra2Vid", "Display CMD Registers");
 -	for( int i = 0x000; i <= 0x01A; i ++ )	_dumpreg(i);
 +	DUMPREGS(0x000, 0x01A);	// 00 -- 1A :: CMD (block 1)
 +	DUMPREGS(0x028, 0x043);	// 28 -- 43 :: CMD (block 2)
  	for( int i = 0x028; i <= 0x043; i ++ )	_dumpreg(i);
  	Log_Debug("Tegra2Vid", "Display COM Registers");
  	for( int i = 0x300; i <= 0x329; i ++ )	_dumpreg(i);
@@@ -114,7 -112,6 +114,7 @@@ int Tegra2Vid_Install(char **Arguments
  #endif
  
  #if 0
 +	// Map the original framebuffer into memory and write to it (tests the original state)
  	giTegra2Vid_FramebufferSize =
  		(gpTegra2Vid_IOMem[DC_WIN_A_SIZE_0]&0xFFFF)
  		*(gpTegra2Vid_IOMem[DC_WIN_A_SIZE_0]>>16)*4;
@@@ -196,7 -193,7 +196,7 @@@ int Tegra2Vid_IOCtl(tVFS_Node *Node, in
  	
  	switch(ID)
  	{
- 	BASE_IOCTLS(DRV_TYPE_VIDEO, "PL110", VERSION, csaTegra2Vid_IOCtls);
+ 	BASE_IOCTLS(DRV_TYPE_VIDEO, "Tegra2", VERSION, csaTegra2Vid_IOCtls);
  
  	case VIDEO_IOCTL_SETBUFFORMAT:
  		DrvUtil_Video_RemoveCursor( &gTegra2Vid_DrvUtil_BufInfo );
@@@ -362,7 -359,6 +362,7 @@@ int Tegra2Vid_int_SetMode(int Mode
  		if( gpTegra2Vid_Framebuffer )
  		{
  			// TODO: Free framebuffer for reallocation
 +			Log_Error("Tegra2Vid", "TODO: Free existing framebuffer");
  		}
  
  		giTegra2Vid_FramebufferSize = w*h*4;