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

Commit 56810a92 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: use XGIRegInit() 



Avoid copy-paste and use XGIRegInit() to initialize registers addresses.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7648e109

drivers/staging/xgifb/XGI_main_26.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, 
	return 1;

}



static void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr)

void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr)

{

	XGI_Pr->P3c4 = BaseAddr + 0x14;

	XGI_Pr->P3d4 = BaseAddr + 0x24;

drivers/staging/xgifb/vb_init.c

+1 −17
Original line number Diff line number Diff line
@@ -1299,23 +1299,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev) 


	outb(0x67, (pVBInfo->BaseAddr + 0x12)); /* 3c2 <- 67 ,ynlai */



	pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14;

	pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24;

	pVBInfo->P3c0 = pVBInfo->BaseAddr + 0x10;

	pVBInfo->P3ce = pVBInfo->BaseAddr + 0x1e;

	pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12;

	pVBInfo->P3ca = pVBInfo->BaseAddr + 0x1a;

	pVBInfo->P3c6 = pVBInfo->BaseAddr + 0x16;

	pVBInfo->P3c7 = pVBInfo->BaseAddr + 0x17;

	pVBInfo->P3c8 = pVBInfo->BaseAddr + 0x18;

	pVBInfo->P3c9 = pVBInfo->BaseAddr + 0x19;

	pVBInfo->P3da = pVBInfo->BaseAddr + 0x2A;

	pVBInfo->Part0Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_00;

	pVBInfo->Part1Port = pVBInfo->BaseAddr + SIS_CRT2_PORT_04;

	pVBInfo->Part2Port = pVBInfo->BaseAddr + SIS_CRT2_PORT_10;

	pVBInfo->Part3Port = pVBInfo->BaseAddr + SIS_CRT2_PORT_12;

	pVBInfo->Part4Port = pVBInfo->BaseAddr + SIS_CRT2_PORT_14;

	pVBInfo->Part5Port = pVBInfo->BaseAddr + SIS_CRT2_PORT_14 + 2;

	XGIRegInit(pVBInfo, xgifb_info->vga_base);



	if (HwDeviceExtension->jChipType < XG20)

		/* Run XGI_GetVBType before InitTo330Pointer */

drivers/staging/xgifb/vb_init.h

+1 −0
Original line number Diff line number Diff line 
#ifndef _VBINIT_

#define _VBINIT_

extern unsigned char XGIInitNew(struct pci_dev *pdev);

extern void XGIRegInit(struct vb_device_info *, unsigned long);

#endif

drivers/staging/xgifb/vb_setmode.c

+2 −18
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include "XGIfb.h"



#include "vb_def.h"

#include "vb_init.h"

#include "vb_util.h"

#include "vb_table.h"

#include "vb_setmode.h"
@@ -5961,24 +5962,7 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info, 
		pVBInfo->IF_DEF_CRT2Monitor = 1;

	}



	pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14;

	pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24;

	pVBInfo->P3c0 = pVBInfo->BaseAddr + 0x10;

	pVBInfo->P3ce = pVBInfo->BaseAddr + 0x1e;

	pVBInfo->P3c2 = pVBInfo->BaseAddr + 0x12;

	pVBInfo->P3cc = pVBInfo->BaseAddr + 0x1C;

	pVBInfo->P3ca = pVBInfo->BaseAddr + 0x1a;

	pVBInfo->P3c6 = pVBInfo->BaseAddr + 0x16;

	pVBInfo->P3c7 = pVBInfo->BaseAddr + 0x17;

	pVBInfo->P3c8 = pVBInfo->BaseAddr + 0x18;

	pVBInfo->P3c9 = pVBInfo->BaseAddr + 0x19;

	pVBInfo->P3da = pVBInfo->BaseAddr + 0x2A;

	pVBInfo->Part0Port = pVBInfo->BaseAddr + XGI_CRT2_PORT_00;

	pVBInfo->Part1Port = pVBInfo->BaseAddr + SIS_CRT2_PORT_04;

	pVBInfo->Part2Port = pVBInfo->BaseAddr + SIS_CRT2_PORT_10;

	pVBInfo->Part3Port = pVBInfo->BaseAddr + SIS_CRT2_PORT_12;

	pVBInfo->Part4Port = pVBInfo->BaseAddr + SIS_CRT2_PORT_14;

	pVBInfo->Part5Port = pVBInfo->BaseAddr + SIS_CRT2_PORT_14 + 2;

	XGIRegInit(pVBInfo, xgifb_info->vga_base);



	/* for x86 Linux, XG21 LVDS */

	if (HwDeviceExtension->jChipType == XG21) {