Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3261f2a1 authored Oct 11, 2011 by Aaro Koskinen Committed by Greg Kroah-Hartman Oct 12, 2011

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>

parent 624554da

drivers/staging/xgifb/XGI_main_26.c

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -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);

drivers/staging/xgifb/XGIfb.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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