summaryrefslogtreecommitdiff
path: root/drivers/staging/xgifb
AgeCommit message (Collapse)Author
2011-10-30Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6Linus Torvalds
* 'fbdev-next' of git://github.com/schandinat/linux-2.6: (270 commits) video: platinumfb: Add __devexit_p at necessary place drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data drivers/video: fsl-diu-fb: merge diu_hw into fsl_diu_data drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported drivers/video: fsl-diu-fb: remove unused panel operating mode support drivers/video: fsl-diu-fb: use an enum for the AOI index drivers/video: fsl-diu-fb: add several new video modes drivers/video: fsl-diu-fb: remove broken screen blanking support drivers/video: fsl-diu-fb: move some definitions out of the header file drivers/video: fsl-diu-fb: fix some ioctls video: da8xx-fb: Increased resolution configuration of revised LCDC IP OMAPDSS: picodlp: add missing #include <linux/module.h> fb: fix au1100fb bitrot. mx3fb: fix NULL pointer dereference in screen blanking. video: irq: Remove IRQF_DISABLED smscufx: change edid data to u8 instead of char OMAPDSS: DISPC: zorder support for DSS overlays OMAPDSS: DISPC: VIDEO3 pipeline support OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting video/omap: fix build dependencies ... Fix up conflicts in: - drivers/staging/xgifb/XGI_main_26.c Changes to XGIfb_pan_var() - drivers/video/omap/{lcd_apollon.c,lcd_ldp.c,lcd_overo.c} Removed (or in the case of apollon.c, merged into the generic DSS panel in drivers/video/omap2/displays/panel-generic-dpi.c)
2011-10-12staging: xgifb: clean up 2nd display stateAaro Koskinen
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>
2011-10-12staging: xgifb: delete CRT1 stateAaro Koskinen
The driver does not need to manage CRT1 state. 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>
2011-10-12staging: xgifb: make DAC tables constAaro Koskinen
DAC tables are 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>
2011-10-12staging: xgifb: make RAM type tables constAaro Koskinen
RAM type tables are 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>
2011-10-12staging: xgifb: move XGINew_DataBusWidth into vb_device_infoAaro Koskinen
Move the memory bus width info to vb_device_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>
2011-10-12staging: xgifb: move XGINew_ChannelAB into vb_device_infoAaro Koskinen
Move the memory channel info into vb_device_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>
2011-10-12staging: xgifb: move XGINew_RAMType into vb_device_infoAaro Koskinen
The RAM type is device specific, so move it into vb_device_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>
2011-10-12staging: xgifb: eliminate global XGI_Pr dataAaro Koskinen
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>
2011-10-12staging: xgifb: make XGIbios_mode constAaro Koskinen
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>
2011-10-12staging: xgifb: eliminate filter_tb global variableAaro Koskinen
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>
2011-10-12staging: xgifb: eliminate XGIfb_fixAaro Koskinen
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>
2011-10-12staging: xgifb: eliminate default_varAaro Koskinen
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>
2011-10-12staging: xgifb: eliminate XGIfb_CRT2_write_enable variableAaro Koskinen
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>
2011-10-12staging: xgifb: move pseudo_palette into xgifb_video_infoAaro Koskinen
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>
2011-10-12staging: xgifb: move XGIfb_rate_idx into xgifb_video_infoAaro Koskinen
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>
2011-10-12staging: xgifb: move xgifb_mode_idx into xgifb_video_infoAaro Koskinen
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>
2011-10-12staging: xgifb: eliminate XGIfb_mode_noAaro Koskinen
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>
2011-10-12staging: xgifb: dynamically allocate xgifb_video_infoAaro Koskinen
Delete global xgi_video_info and dynamically allocate the data. 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>
2011-10-12staging: xgifb: avoid direct references xgi_video_infoAaro Koskinen
Avoid direct references to global xgi_video_info. This will help changing the data from statically allocated to dynamically allocated. 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>
2011-10-12staging: xgifb: rename struct video_info to xgifb_video_infoAaro Koskinen
Rename struct video_info to 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>
2011-10-12staging: xgifb: add a global variable for the default refresh rateAaro Koskinen
Add a global variable for the default refresh rate. This is done to get rid of references to xgi_video_info before the probe routine, which should allocate the xgi_video_info dynamically in the future. 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>
2011-10-12staging: xgifb: inline XGIfb_query_VGA_config_space()Aaro Koskinen
XGIfb_query_VGA_config_space() is used only once during the init and can be replaced with a single PCI configuration space read. 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>
2011-10-12staging: xgifb: eliminate global XGIhw_ext dataAaro Koskinen
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>
2011-10-12staging: xgifb: eliminate global fb_info variableAaro Koskinen
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>
2011-10-12staging: xgifb: use PCI drvdataAaro Koskinen
Don't access the global xgi_video_info directly in xgifb_remove(). 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>
2011-09-16staging: xgifb: update TODOAaro Koskinen
There are no build warnings at the moment. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16staging: xgifb: add missing #includeAaro Koskinen
Add a missing include to eliminate the following sparse warning: drivers/staging/xgifb/vb_table.h:2572:28: warning: symbol 'XGI21_LCDCapList' was not declared. Should it be static? Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16staging: xgifb: vb_init: use readl()/writel() to access iomapped memoryAaro Koskinen
Use readl() and writel() in FB memory test instead of direct pointer access, and also add iomem annotations for the FB memory. The patch eliminates the following sparse warnings: drivers/staging/xgifb/XGI_main_26.c:2113:69: warning: incorrect type in assignment (different address spaces) drivers/staging/xgifb/XGI_main_26.c:2113:69: expected unsigned char *static [addressable] [toplevel] [assigned] pjVideoMemoryAddress drivers/staging/xgifb/XGI_main_26.c:2113:69: got void [noderef] <asn:2>* drivers/staging/xgifb/XGI_main_26.c:2399:30: warning: incorrect type in assignment (different address spaces) drivers/staging/xgifb/XGI_main_26.c:2399:30: expected char [noderef] <asn:2>*screen_base drivers/staging/xgifb/XGI_main_26.c:2399:30: got char *[addressable] [toplevel] [assigned] video_vbase drivers/staging/xgifb/XGI_main_26.c:2430:31: warning: incorrect type in argument 1 (different address spaces) drivers/staging/xgifb/XGI_main_26.c:2430:31: expected void volatile [noderef] <asn:2>*addr drivers/staging/xgifb/XGI_main_26.c:2430:31: got char *[addressable] [toplevel] [assigned] video_vbase drivers/staging/xgifb/XGI_main_26.c:2454:31: warning: incorrect type in argument 1 (different address spaces) drivers/staging/xgifb/XGI_main_26.c:2454:31: expected void volatile [noderef] <asn:2>*addr drivers/staging/xgifb/XGI_main_26.c:2454:31: got char *[addressable] [toplev Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16staging: xgifb: unify #include orderAaro Koskinen
Include Linux headers before driver's own headers. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16staging: xgifb: main: use readb()/readw() to access iomapped memoryAaro Koskinen
Use readb()/readw() instead of direct pointer access to read I/O mapped memory and also add __iomem annotation. The patch eliminates the following sparse warnings: drivers/staging/xgifb/XGI_main_26.c:2125:35: warning: incorrect type in assignment (different address spaces) drivers/staging/xgifb/XGI_main_26.c:2125:35: expected char *[addressable] [toplevel] [assigned] mmio_vbase drivers/staging/xgifb/XGI_main_26.c:2125:35: got void [noderef] <asn:2>* drivers/staging/xgifb/XGI_main_26.c:2439:31: warning: incorrect type in argument 1 (different address spaces) drivers/staging/xgifb/XGI_main_26.c:2439:31: expected void volatile [noderef] <asn:2>*addr drivers/staging/xgifb/XGI_main_26.c:2439:31: got char *[addressable] [toplevel] [assigned] mmio_vbase drivers/staging/xgifb/XGI_main_26.c:2463:31: warning: incorrect type in argument 1 (different address spaces) drivers/staging/xgifb/XGI_main_26.c:2463:31: expected void volatile [noderef] <asn:2>*addr drivers/staging/xgifb/XGI_main_26.c:2463:31: got char *[addressable] [toplevel] [assigned] mmio_vbase Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12staging: xgifb: delete redundant casts from mtrr_add() callAaro Koskinen
Delete redundant casts from mtrr_add() call. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12staging: xgifb: fix up MTRR printkAaro Koskinen
The condition for printk() is wrong. Also change it to dev_info(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12staging: xgifb: properly delete MTRR regionAaro Koskinen
MTRR region should be deleted on probe failure and driver removal. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: delete IF_DEF_ScaleLCDAaro Koskinen
Delete one more disabled feature. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: delete IF_DEF_PWDAaro Koskinen
Delete already disabled code paths. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: delete IF_DEF_OEMUtilAaro Koskinen
Delete already disabled code paths. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: delete Win9xDOSModeAaro Koskinen
Delete another useless flag. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: delete IF_DEF_VideoCaptureAaro Koskinen
Delete already disabled code paths. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: delete duplicated timing dataAaro Koskinen
Delete redundant timing data tables. Replace as follows: EnlargeTap4Timing ==> xgifb_tap4_timing NoScaleTap4Timing ==> xgifb_tap4_timing NTSCTap4Timing ==> xgifb_ntsc_525_tap4_timing YPbPr525iTap4Timing ==> xgifb_ntsc_525_tap4_timing YPbPr525pTap4Timing ==> xgifb_ntsc_525_tap4_timing Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: delete duplicated TV data tablesAaro Koskinen
Delete redundant TV data tables. Replace as follows: XGI_EPLCHTVDataPtr ==> xgifb_chrontel_tv XGI_EPLCHTVRegPtr ==> xgifb_chrontel_tv Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: delete duplicated LCD tableAaro Koskinen
XGI_EPLLCDCRT1Ptr_H and XGI_EPLLCDCRT1Ptr_V tables are identical. Replace as follows: XGI_EPLLCDCRT1Ptr_H ==> xgifb_epllcd_crt1 XGI_EPLLCDCRT1Ptr_V ==> xgifb_epllcd_crt1 Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: delete duplicated LCD dataAaro Koskinen
Delete duplicated LCD data tables. Replace as follows: XGI_ExtLCD1400x1050Data ==> xgifb_lcd_1400x1050 XGI_StLCD1400x1050Data ==> xgifb_lcd_1400x1050 XGI_ExtLCD1280x1024x75Data ==> xgifb_lcd_1280x1024x75 XGI_StLCD1280x1024x75Data ==> xgifb_lcd_1280x1024x75 XGI_ExtLCDDes1400x1050Data ==> xgifb_lcddes_1400x1050 XGI_StLCDDes1400x1050Data ==> xgifb_lcddes_1400x1050 XGI_ExtLCDDLDes1400x1050Data ==> xgifb_lcddldes_1400x1050 XGI_StLCDDLDes1400x1050Data ==> xgifb_lcddldes_1400x1050 XGI_ExtLCDDes1024x768x75Data ==> xgifb_lcddes_1024x768x75 XGI_StLCDDes1024x768x75Data ==> xgifb_lcddes_1024x768x75 XGI_ExtLCDDes1280x1024x75Data ==> xgifb_lcddes_1280x1024x75 XGI_StLCDDes1280x1024x75Data ==> xgifb_lcddes_1280x1024x75 XGI_ExtLCDDLDes1280x1024x75Data ==> xgifb_lcddldes_1280x1024x75 XGI_StLCDDLDes1280x1024x75Data ==> xgifb_lcddldes_1280x1024x75 Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: delete duplicated YFilter1 dataAaro Koskinen
PAL-M and PAL-N "YFilter1" tables are identical. Replace as follows: PALMYFilter1 ==> xgifb_palmn_yfilter1 PALNYFilter1 ==> xgifb_palmn_yfilter1 Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: delete duplicated YFilter2 dataAaro Koskinen
All four "YFilter2" tables are identical. Replace as follows: NTSCYFilter2 ==> xgifb_yfilter2; PALMYFilter2 ==> xgifb_yfilter2; PALNYFilter2 ==> xgifb_yfilter2; PALYFilter2 ==> xgifb_yfilter2; Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: do not initialize static data to 0Aaro Koskinen
Remove redundant initializations. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: eliminate #ifdef Tap4Aaro Koskinen
Eliminate #define Tap4 and related checks. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: delete commented-out routinesAaro Koskinen
Delete routines which have been commented out. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: refactor XGI_SetXG21LVDSPara() and XGI_SetXG27LVDSPara()Aaro Koskinen
The code is almost the same for XG21 and XG27, a single routine can cover both. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06staging: xgifb: refactor XGI_SetXG21LCD() and XGI_SetXG27LCD()Aaro Koskinen
The code is almost the same for XG21 and XG27, a single routine can cover both. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
generated by cgit v0.10.2 at 2024-09-04 20:08:50 (GMT)