summaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb/XGI_main_26.c
Commit message (Collapse)AuthorAgeFilesLines
* staging: xgifb: enable forcecrt2type as a module parameterAaro Koskinen2011-12-081-0/+8
| | | | | | | Enable forcecrt2type as a module parameter. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: enable forcecrt2type on XG21Aaro Koskinen2011-12-081-11/+17
| | | | | | | | Make "forcecrt2type" to apply also for XG21. The patch enables user to switch LVDS LCD ON/OFF without the need to update the video BIOS. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete "userom" optionAaro Koskinen2011-12-081-2/+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: move XGI21_LVDSCapStruct into xgifb_video_infoAaro Koskinen2011-12-081-8/+8
| | | | | | | | Move the LVDS data into a device-specific data, and eliminate the global variable usage. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete XGIfb_GetXG21LVDSData()Aaro Koskinen2011-12-081-63/+0
| | | | | | | | Delete XGIfb_GetXG21LVDSData() and code which duplicates xgifb_read_vbios(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: delete ROMAddrAaro Koskinen2011-12-081-2/+0
| | | | | | | Delete a redundant struct member. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: move video BIOS handling completely to ReadVBIOSTablData()Aaro Koskinen2011-12-081-39/+0
| | | | | | | | We need the video BIOS only on XG21 and only during the init, so let's do everything at the same place. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6Linus Torvalds2011-10-301-18/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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)
| * staging: xgifb: use display information in info not in var for panningLaurent Pinchart2011-08-191-16/+6
| | | | | | | | | | | | | | We must not use any information in the passed var besides xoffset, yoffset and vmode as otherwise applications might abuse it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
* | staging: xgifb: clean up 2nd display stateAaro Koskinen2011-10-121-25/+25
| | | | | | | | | | | | | | | | 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: delete CRT1 stateAaro Koskinen2011-10-121-11/+0
| | | | | | | | | | | | | | | | 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>
* | staging: xgifb: eliminate global XGI_Pr dataAaro Koskinen2011-10-121-5/+10
| | | | | | | | | | | | | | | | 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: eliminate filter_tb global variableAaro Koskinen2011-10-121-0/+3
| | | | | | | | | | | | | | | | | | 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-1/+5
| | | | | | | | | | | | | | | | | | 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-24/+32
| | | | | | | | | | | | | | | | | | 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-7/+4
| | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | 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-12/+18
| | | | | | | | | | | | | | | | | | 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-47/+54
| | | | | | | | | | | | | | | | | | 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-8/+6
| | | | | | | | | | | | | | | | 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: dynamically allocate xgifb_video_infoAaro Koskinen2011-10-121-9/+6
| | | | | | | | | | | | | | | | 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>
* | staging: xgifb: avoid direct references xgi_video_infoAaro Koskinen2011-10-121-249/+263
| | | | | | | | | | | | | | | | | | 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>
* | staging: xgifb: rename struct video_info to xgifb_video_infoAaro Koskinen2011-10-121-2/+2
| | | | | | | | | | | | | | | | 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>
* | staging: xgifb: add a global variable for the default refresh rateAaro Koskinen2011-10-121-2/+4
| | | | | | | | | | | | | | | | | | | | 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>
* | staging: xgifb: inline XGIfb_query_VGA_config_space()Aaro Koskinen2011-10-121-42/+2
| | | | | | | | | | | | | | | | | | 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>
* | staging: xgifb: eliminate global XGIhw_ext dataAaro Koskinen2011-10-121-46/+48
| | | | | | | | | | | | | | | | 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-0/+3
| | | | | | | | | | | | | | | | 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: use PCI drvdataAaro Koskinen2011-10-121-8/+11
| | | | | | | | | | | | | | | | 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>
* | staging: xgifb: main: use readb()/readw() to access iomapped memoryAaro Koskinen2011-09-161-32/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | staging: xgifb: delete redundant casts from mtrr_add() callAaro Koskinen2011-09-121-4/+2
| | | | | | | | | | | | | | 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>
* | staging: xgifb: fix up MTRR printkAaro Koskinen2011-09-121-2/+2
| | | | | | | | | | | | | | 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>
* | staging: xgifb: properly delete MTRR regionAaro Koskinen2011-09-121-1/+12
| | | | | | | | | | | | | | 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>
* | staging: xgifb: use common init for module and built-inAaro Koskinen2011-09-061-10/+0
| | | | | | | | | | | | | | Use a common init function for module and built-in driver. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | stating: xgifb: update module parameter descriptionsAaro Koskinen2011-09-061-6/+4
| | | | | | | | | | | | | | Remove incorrect/misleading text from parameter descriptions. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: xgifb: delete all references to mode "none"Aaro Koskinen2011-09-061-11/+5
| | | | | | | | | | | | | | | | 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: simplify default mode setupAaro Koskinen2011-09-061-13/+5
| | | | | | | | | | | | | | | | 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: fail the probe if no supported LCD video mode foundAaro Koskinen2011-09-061-1/+6
| | | | | | | | | | | | | | | | Fail the probe if the LCD resolution described in card firmware does not match any of the supported modes. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: xgifb: delete duplicated default video mode setup codeAaro Koskinen2011-09-061-12/+0
| | | | | | | | | | | | | | | | The code for determining the default video mode is unnecessarily duplicated in XGIfb_search_mode() and XGIfb_search_vesamode() functions. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: xgifb: XGIfb_search_mode(): delete unreachable codeAaro Koskinen2011-09-061-11/+0
| | | | | | | | | | | | | | XGIfb_search_mode() is always called with a valid string pointer. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: xgifb: search video mode later in probeAaro Koskinen2011-09-061-10/+11
| | | | | | | | | | | | | | | | When searching the video mode, some HW details needs to be known. Therefore it's not possible to do that reliably before probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: xgifb: fix LVDS LCD resolution data setupAaro Koskinen2011-09-061-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | If the driver fails to get LVDS LCD data from the firmware, it falls back to using driver's hardcoded values. However, this is done too early in the probe. The selected video mode index is not yet known, and also in some cases it could be defaulting to -1 resulting in a read outside the array. Fix this by moving the array lookup after the video mode validation. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reported-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: xgifb: check and report invalid option valuesAaro Koskinen2011-09-061-11/+17
| | | | | | | | | | | | | | | | Check option values with kstrtoul(). This will also eliminate some checkpatch warnings about simple_strtoul() usage. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: xgifb: XGIfb_setup(): delete redundant assignmentAaro Koskinen2011-09-061-2/+0
| | | | | | | | | | | | | | The global data is already initialized to zero. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: xgifb: XGIfb_setup(): clean up driver messagesAaro Koskinen2011-09-061-5/+2
| | | | | | | | | | | | | | Print options only if they are given. Delete other messages. 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-5/+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 duplicated codeAaro Koskinen2011-09-061-5/+0
| | | | | | | | | | | | | | Delete redundant branches for "mode" and "vesa" options. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: xgifb: fix ypan disable optionAaro Koskinen2011-09-061-4/+0
| | | | | | | | | | | | | | | | Setting any of the FB options will disable ypan as a side effect. It should be disabled only by the "noypan" option. 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-114/+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-2/+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-3/+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>
OpenPOWER on IntegriCloud