The driver does not need to manage CRT1 state.
Signed-off-by: Aaro Koskinen <[email protected]>
---
drivers/staging/xgifb/XGI_main_26.c | 11 -----------
drivers/staging/xgifb/XGIfb.h | 3 ---
2 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main_26.c
b/drivers/staging/xgifb/XGI_main_26.c
index dc6a9a8..03b6f78 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -2204,17 +2204,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
if (xgifb_info->hasVB != HASVB_NONE)
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 (!enable_dstn) {
reg = xgifb_reg_get(XGICR, IND_XGI_LCD_PANEL);
diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h
index 7d2b970..2f62d19 100644
--- a/drivers/staging/xgifb/XGIfb.h
+++ b/drivers/staging/xgifb/XGIfb.h
@@ -6,13 +6,10 @@
#include "vb_struct.h"
#include "vgatypes.h"
-#define DISPTYPE_CRT1 0x00000008L
#define DISPTYPE_CRT2 0x00000004L
#define DISPTYPE_LCD 0x00000002L
#define DISPTYPE_TV 0x00000001L
#define DISPTYPE_DISP2 (DISPTYPE_CRT2 | DISPTYPE_LCD | DISPTYPE_TV)
-#define DISPMODE_SINGLE 0x00000020L
-#define DISPMODE_MIRROR 0x00000010L
#define HASVB_NONE 0x00
#define HASVB_301 0x01
--
1.7.2.5
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
