[Linuxconsole-commit]CVS: ruby/linux/drivers/video/riva rivafb.h,NONE,1.1 fbdev.c,1.12,1.13

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video/riva
In directory usw-pr-cvs1:/tmp/cvs-serv3485

Modified Files:
	fbdev.c 
Added Files:
	rivafb.h 
Log Message:
I somewhat ported the rivafb driver to ruby. Now for testing.

--- NEW FILE: rivafb.h ---
#ifndef __RIVAFB_H
#define __RIVAFB_H

#include <linux/config.h>
#include <linux/fb.h>
#include <video/fbcon.h>
#include "../fbcon-accel.h"
#include "riva_hw.h"

/* GGI compatibility macros */
#define NUM_SEQ_REGS		0x05
#define NUM_CRT_REGS		0x41
#define NUM_GRC_REGS		0x09
#define NUM_ATC_REGS		0x15

/* holds the state of the VGA core and extended Riva hw state from riva_hw.c.
 * From KGI originally. */
struct riva_regs {
	u8 attr[NUM_ATC_REGS];
	u8 crtc[NUM_CRT_REGS];
	u8 gra[NUM_GRC_REGS];
	u8 seq[NUM_SEQ_REGS];
	u8 misc_output;
	RIVA_HW_STATE ext;
};

struct riva_par {
	RIVA_HW_INST riva;	/* interface to riva_hw.c */

	caddr_t ctrl_base;	/* virtual control register base addr */
	unsigned dclk_max;	/* max DCLK */

	struct riva_regs initial_state;	/* initial startup video mode */
	struct riva_regs current_state;

	struct riva_cursor *cursor;
#ifdef CONFIG_MTRR
	struct { int vram; int vram_valid; } mtrr;
#endif
};

#endif /* __RIVAFB_H */

Index: fbdev.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/riva/fbdev.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- fbdev.c	18 Mar 2002 19:29:11 -0000	1.12
+++ fbdev.c	22 Mar 2002 20:19:09 -0000	1.13
@@ -25,7 +25,6 @@
  * Known bugs and issues:
  *	restoring text mode fails
  *	doublescan modes are broken
- *	option 'noaccel' has no effect
  */
 
 #include <linux/config.h>
@@ -34,11 +33,9 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
[...2119 lines suppressed...]
+	release_mem_region(info->fix.smem_start,
+			   info->fix.smem_len);
+	kfree(info);
 	pci_set_drvdata(pd, NULL);
 }
 
-
-
 /* ------------------------------------------------------------------------- *
  *
  * initialization
@@ -2061,8 +1558,6 @@
 
 		} else if (!strncmp(this_opt, "noblink", 7)) {
 			noblink = 1;
-		} else if (!strncmp(this_opt, "noaccel", 7)) {
-			noaccel = 1;
 		} else if (!strncmp(this_opt, "nomove", 6)) {
 			nomove = 1;
 #ifdef CONFIG_MTRR