summaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb/XGI_main.h
Commit message (Collapse)AuthorAgeFilesLines
* staging/xgifb: Remove remaining duplicate structs and definesPeter Huewe2012-02-091-67/+10
| | | | | | | | This patch removes the now unused structs and defines which were mere duplicates of the ones in the sgi headers Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/xgifb: Include sis headersPeter Huewe2012-02-091-0/+1
| | | | | | | | | | | | This patch includes the headers of the sis driver and reorders some includes. Since the xgi driver used to redefine a lot of stuff from the sis driver, we can simply include the headers of the sis driver itself, so we can remove duplicated stuff later on. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: xgifb: delete "userom" optionAaro Koskinen2011-12-081-1/+0
| | | | | | | Delete a redundant option. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging/xgifb: Convert pci_table entries to PCI_DEVICE (if PCI_ANY_ID is used)Peter Huewe2011-11-261-8/+4
| | | | | | | | | | | | | | This patch converts pci_table entries to use the PCI_DEVICE macro, if .subvendor and .subdevice are set to PCI_ANY_ID, and thus improves readability. v2: Since the driver_data field isn't used anywhere we can also drop the assignments for class, class_mask and driver_data. (found by Aaro Koskinen) Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: clean up 2nd display stateAaro Koskinen2011-10-121-12/+12
| | | | | | | | Convert the display type to enum and rename disp_state to display2. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: eliminate global XGI_Pr dataAaro Koskinen2011-10-121-12/+9
| | | | | | | | Move vb_device_info into xgifb_video_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: make XGIbios_mode constAaro Koskinen2011-10-121-3/+2
| | | | | | | | Comments are wrong, the table is read-only and can be made const. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: eliminate filter_tb global variableAaro Koskinen2011-10-121-1/+0
| | | | | | | | | filter_tb is only used inside a single function, and it does not need to be static. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: eliminate XGIfb_fixAaro Koskinen2011-10-121-7/+0
| | | | | | | | | Eliminate XGIfb_fix and initialize needed fields of fb_info->fix in probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: eliminate default_varAaro Koskinen2011-10-121-29/+0
| | | | | | | | | Eliminate default_var and initialize needed fields of fb_info->var in probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: eliminate XGIfb_CRT2_write_enable variableAaro Koskinen2011-10-121-3/+0
| | | | | | | | Replace XGIfb_CRT2_write_enable with IND_XGI_CRT2_WRITE_ENABLE_315. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: move pseudo_palette into xgifb_video_infoAaro Koskinen2011-10-121-2/+0
| | | | | | | | pseudo_palette should be dynamically allocated for each fb. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: move XGIfb_rate_idx into xgifb_video_infoAaro Koskinen2011-10-121-3/+0
| | | | | | | | | The current refresh rate index should be stored in the device-specific data allocated in probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: move xgifb_mode_idx into xgifb_video_infoAaro Koskinen2011-10-121-1/+0
| | | | | | | | | The current mode index should be stored in the device-specific data allocated in probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: eliminate XGIfb_mode_noAaro Koskinen2011-10-121-1/+0
| | | | | | | | We can get the information from the table with mode index. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: eliminate global XGIhw_ext dataAaro Koskinen2011-10-121-3/+0
| | | | | | | | Move xgi_hw_device_info into xgi_video_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: eliminate global fb_info variableAaro Koskinen2011-10-121-3/+0
| | | | | | | | Move fb_info into xgi_video_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete all references to mode "none"Aaro Koskinen2011-09-061-4/+1
| | | | | | | | Delete all references to mode "none". It should be handled like any other invalid mode. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: correct the default mode commentAaro Koskinen2011-09-061-1/+1
| | | | | | | | | According to the comment, the default mode should be 800x600x8 while the index points actually to 800x600x16. Change the comment and move the definition instead of changing the current behaviour. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: simplify default mode setupAaro Koskinen2011-09-061-2/+0
| | | | | | | | The default mode is the same regardless of the display type, except for XG21/LCD which is determined dynamically. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: assume the default video mode also when moduleAaro Koskinen2011-09-061-6/+1
| | | | | | | | | The same default video mode should be assumed regardless if the driver is a module or not. This won't change the current behaviour, but it will simplify further changes. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete "off" option handlingAaro Koskinen2011-09-061-1/+0
| | | | | | | | | | | | | | It's possible to disable the built-in xgifb driver with the kernel command line option: video=xgifb:off This is already handled by the generic framebuffer layer (fb_get_options() will return TRUE resulting in init failure), so no need to process the option in the driver. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete unused module parameters and optionsAaro Koskinen2011-09-061-2/+0
| | | | | | | Delete parameters which have no effect. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete an empty stringAaro Koskinen2011-08-241-1/+0
| | | | | | | | Delete a string which is always empty. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete driver version informationAaro Koskinen2011-08-241-4/+0
| | | | | | | | Delete version information, it's just noise and serves no purpose. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete write-only variablesAaro Koskinen2011-08-241-8/+0
| | | | | | | | Delete couple write-only variables. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: replace video_type with FB_TYPE_PACKED_PIXELSAaro Koskinen2011-08-231-3/+0
| | | | | | | | Replace a global variable with a constant. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete unused definitionsAaro Koskinen2011-08-231-93/+0
| | | | | | | | Delete some more unused definitions. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: xgifb: Delete define XGIINITSTATIC in XGI_main_26.c and XGI_main.hRuslan Pisarev2011-08-231-1/+0
| | | | | | | This is a patch to the XGI_main.h and XGI_main_26.c file that fixed up a define warrning found by the checkpatch.pl tools. Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: xgifb: Fixed up a errors "do not initialise statics to 0 or NULL" ↵Ruslan Pisarev2011-08-231-10/+10
| | | | | | | | | in XGI_main.h This is a patch to the XGI_main.h file that fixed up a errors "do not initialise statics to 0 or NULL" found by the checkpatch.pl tools. Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: xgifb: Fixed style issues.Kenji Toyama2011-04-261-281/+375
| | | | | | | | | | | | Now there's only 10 errors and 1 warning given by checkpatch.pl, and these are related initialization of statics. The only warning left can be safely ignored I believe. I'm resending this patch as the previous one was conflicting with the newer version updated by Aaro Koskinen. Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: main: delete redudant extern declarationsAaro Koskinen2011-04-251-55/+0
| | | | | | | Delete redudant declarations and include proper .h files. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: main: move functions to avoid forward declarationsAaro Koskinen2011-04-251-41/+0
| | | | | | | | Move functions so that all forward declarations of internal functions can be deleted. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete unused register I/O functionsAaro Koskinen2011-04-251-4/+0
| | | | | | | Delete unused register I/O functions. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete unused register I/O macrosAaro Koskinen2011-04-251-36/+0
| | | | | | | Delete unused register I/O macros. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete incorrect I/O mappingAaro Koskinen2011-03-141-1/+0
| | | | | | | | | | | If the PCI device was disabled when the probe() routine started, the driver will create 256 MB video memory mapping which is never used or properly released. It's also unsafe as the size is incorrect for many video cards. Deleting it also allows eliminating XGIvga_enable global variable. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete unused LINUXBIOS codeAaro Koskinen2011-03-141-2/+0
| | | | | | | Delete unused LINUXBIOS code. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete offscreen memory managementAaro Koskinen2011-03-091-47/+0
| | | | | | | | | | | | The offscreen memory area currently conflicts with the video memory exported to the framebuffer layer. The driver does not utilize offscreen memory, so the functionality can be deleted. The patch also eliminates the one last memory leak when the driver is unloaded. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete command queue selection/initAaro Koskinen2011-03-091-49/+0
| | | | | | | | | The driver does not utilize HW command queue in any way, so the code can be dropped. The support for the default mode (MMIO) and AGP have been disabled already anyway. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete HW cursor memory allocationAaro Koskinen2011-03-091-8/+0
| | | | | | | HW cursor area is not used in any way. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: remove private ioctlsAaro Koskinen2011-03-071-9/+0
| | | | | | | | | Drop the badly defined and broken private ioctl interface. Since the driver is in staging, and some of the ioctls are clearly unsafe or not even working, it's unlikely that there are any users. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete XGI_accel.[ch]Aaro Koskinen2011-02-281-4/+0
| | | | | | | The files contain nothing actually needed by the driver. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: eliminate fbcon_XGI_fillrect()Aaro Koskinen2011-02-281-2/+0
| | | | | | | | fbcon_XGI_fillrect() implementation is trivial and can be replaced with cfb_fillrect(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: eliminate fbcon_XGI_copyarea()Aaro Koskinen2011-02-281-2/+0
| | | | | | | | fbcon_XGI_copyarea() implementation is trivial and can be replaced with cfb_copyarea(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: xgifb: Remove unused function fbcon_XGI_syncJavier Martinez Canillas2011-02-231-1/+0
| | | | | | | | | | | Due a cleanup in earlier patches, the function fbcon_XGI_sync now does nothing so it has to be removed. This patches removes the unused function. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Acked-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: eliminate a global variableAaro Koskinen2011-02-181-1/+0
| | | | | | | Move the XGIfb_mmio_size global variable into the video_info struct. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: xgifb: fix lots of sparse warningsRandy Dunlap2010-08-311-15/+12
| | | | | | | | | | | | | | Fix many sparse warnings about data or functions being static. Fix many sparse warnings about data or functions not being used (put them inside #if 0/#endif blocks). Fix sparse warnings about 0 being used for NULL. Fixed a small bit of source formatting when those lines were being modified anyway, but there is still lots of this yet to be done. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: devel@driverdev.osuosl.org Cc: Arnaud Patard <apatard@mandriva.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: use DEFINE_PCI_DEVICE_TABLE() macroJavier Martinez Canillas2010-08-311-2/+1
| | | | | | | Use DEFINE_PCI_DEVICE_TABLE() to make xgifb_pci_table const and marked as __devinitconst Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: xgifb: Remove typedefs in vb_struct.hBill Pemberton2010-06-221-12/+12
| | | | | | | | This removes all the remaining typedefs in vb_struct.h Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Arnaud Patard <apatard@mandriva.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: xgifb: Remove XGI_HW_DEVICE_INFO and PXGI_HW_DEVICE_INFO typedefsBill Pemberton2010-06-221-12/+11
| | | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Arnaud Patard <apatard@mandriva.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
OpenPOWER on IntegriCloud