hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: xgifb: delete CRT1 state 

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>
This commit is contained in:
Aaro Koskinen 2011-10-11 21:47:36 +03:00 committed by Greg Kroah-Hartman
parent 624554dae3
commit 3261f2a171
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/xgifb/XGI_main_26.c
View File

@ -2204,17 +2204,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
if (xgifb_info->hasVB != HASVB_NONE) if (xgifb_info->hasVB != HASVB_NONE)
XGIfb_detect_VB(xgifb_info); XGIfb_detect_VB(xgifb_info);
if (xgifb_info->disp_state & DISPTYPE_DISP2) {
if (XGIfb_crt1off)
xgifb_info->disp_state |= DISPMODE_SINGLE;
else
xgifb_info->disp_state |= (DISPMODE_MIRROR |
DISPTYPE_CRT1);
} else {
xgifb_info->disp_state = DISPMODE_SINGLE |
DISPTYPE_CRT1;
}
if (xgifb_info->disp_state & DISPTYPE_LCD) { if (xgifb_info->disp_state & DISPTYPE_LCD) {
if (!enable_dstn) { if (!enable_dstn) {
reg = xgifb_reg_get(XGICR, IND_XGI_LCD_PANEL); reg = xgifb_reg_get(XGICR, IND_XGI_LCD_PANEL);

3
drivers/staging/xgifb/XGIfb.h
View File

@ -6,13 +6,10 @@
#include "vb_struct.h" #include "vb_struct.h"
#include "vgatypes.h" #include "vgatypes.h"
#define DISPTYPE_CRT1 0x00000008L
#define DISPTYPE_CRT2 0x00000004L #define DISPTYPE_CRT2 0x00000004L
#define DISPTYPE_LCD 0x00000002L #define DISPTYPE_LCD 0x00000002L
#define DISPTYPE_TV 0x00000001L #define DISPTYPE_TV 0x00000001L
#define DISPTYPE_DISP2 (DISPTYPE_CRT2 | DISPTYPE_LCD | DISPTYPE_TV) #define DISPTYPE_DISP2 (DISPTYPE_CRT2 | DISPTYPE_LCD | DISPTYPE_TV)
#define DISPMODE_SINGLE 0x00000020L
#define DISPMODE_MIRROR 0x00000010L
#define HASVB_NONE 0x00 #define HASVB_NONE 0x00
#define HASVB_301 0x01 #define HASVB_301 0x01