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

Commit fc2d10dd authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds
Browse files

matroxfb: get rid of unneeded macros ACCESS_FBINFO and MINFO 



With multihead support always enabled, these macros are no longer needed
and make the code harder to read.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarPetr Vandrovec <vandrove@vc.cvut.cz>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0728bacb

drivers/video/matrox/g450_pll.c

+12 −12
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static unsigned int g450_mnp2vco(CPMINFO unsigned int mnp) { 


	m = ((mnp >> 16) & 0x0FF) + 1;

	n = ((mnp >>  7) & 0x1FE) + 4;

	return (ACCESS_FBINFO(features).pll.ref_freq * n + (m >> 1)) / m;

	return (minfo->features.pll.ref_freq * n + (m >> 1)) / m;

}



unsigned int g450_mnp2f(CPMINFO unsigned int mnp) {
@@ -90,7 +90,7 @@ static unsigned int g450_nextpll(CPMINFO const struct matrox_pll_limits* pi, uns 
		} else {

			m--;

		}

        	n = ((tvco * (m+1) + ACCESS_FBINFO(features).pll.ref_freq) / (ACCESS_FBINFO(features).pll.ref_freq * 2)) - 2;

		n = ((tvco * (m+1) + minfo->features.pll.ref_freq) / (minfo->features.pll.ref_freq * 2)) - 2;

	} while (n < 0x03 || n > 0x7A);

	return (m << 16) | (n << 8) | p;

}
@@ -333,7 +333,7 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll, 
				matroxfb_DAC_out(PMINFO M1064_XPIXCLKCTRL, tmp);

				/* DVI PLL preferred for frequencies up to

				   panel link max, standard PLL otherwise */

				if (fout >= MINFO->max_pixel_clock_panellink)

				if (fout >= minfo->max_pixel_clock_panellink)

					tmp = 0;

				else tmp =

					M1064_XDVICLKCTRL_DVIDATAPATHSEL |
@@ -363,20 +363,20 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll, 
				}

				mga_outb(M_MISC_REG, misc);

			}

			pi = &ACCESS_FBINFO(limits.pixel);

			ci = &ACCESS_FBINFO(cache.pixel);

			pi = &minfo->limits.pixel;

			ci = &minfo->cache.pixel;

			break;

		case M_SYSTEM_PLL:

			{

				u_int32_t opt;



				pci_read_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, &opt);

				pci_read_config_dword(minfo->pcidev, PCI_OPTION_REG, &opt);

				if (!(opt & 0x20)) {

					pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, opt | 0x20);

					pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, opt | 0x20);

				}

			}

			pi = &ACCESS_FBINFO(limits.system);

			ci = &ACCESS_FBINFO(cache.system);

			pi = &minfo->limits.system;

			ci = &minfo->cache.system;

			break;

		case M_VIDEO_PLL:

			{
@@ -395,8 +395,8 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll, 
				pixel_vco = g450_mnp2vco(PMINFO mnp);

				matroxfb_DAC_unlock_irqrestore(flags);

			}

			pi = &ACCESS_FBINFO(limits.video);

			ci = &ACCESS_FBINFO(cache.video);

			pi = &minfo->limits.video;

			ci = &minfo->cache.video;

			break;

		default:

			return -EINVAL;
@@ -475,7 +475,7 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll, 
			mnp = g450_findworkingpll(PMINFO pll, mnparray, mnpcount);

			g450_addcache(ci, mnparray[0], mnp);

		}

		updatehwstate_clk(&ACCESS_FBINFO(hw), mnp, pll);

		updatehwstate_clk(&minfo->hw, mnp, pll);

		matroxfb_DAC_unlock_irqrestore(flags);

		return mnp;

	}

drivers/video/matrox/i2c-matroxfb.c

+3 −3
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo, 
	i2c_set_adapdata(&b->adapter, b);

	b->adapter.class = class;

	b->adapter.algo_data = &b->bac;

	b->adapter.dev.parent = &ACCESS_FBINFO(pcidev)->dev;

	b->adapter.dev.parent = &minfo->pcidev->dev;

	b->bac = matrox_i2c_algo_template;

	b->bac.data = b;

	err = i2c_bit_add_bus(&b->adapter);
@@ -153,7 +153,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) { 
	matroxfb_DAC_out(PMINFO DAC_XGENIOCTRL, 0x00);

	matroxfb_DAC_unlock_irqrestore(flags);



	switch (ACCESS_FBINFO(chip)) {

	switch (minfo->chip) {

		case MGA_2064:

		case MGA_2164:

			err = i2c_bus_reg(&m2info->ddc1, minfo,
@@ -168,7 +168,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) { 
	}

	if (err)

		goto fail_ddc1;

	if (ACCESS_FBINFO(devflags.dualhead)) {

	if (minfo->devflags.dualhead) {

		err = i2c_bus_reg(&m2info->ddc2, minfo,

				  DDC2_DATA, DDC2_CLK,

				  "DDC:fb%u #1", I2C_CLASS_DDC);

drivers/video/matrox/matroxfb_DAC1064.c

+189 −189

File changed.

Preview size limit exceeded, changes collapsed.

drivers/video/matrox/matroxfb_Ti3026.c

+47 −47
Original line number Diff line number Diff line
@@ -295,11 +295,11 @@ static int Ti3026_calcclock(CPMINFO unsigned int freq, unsigned int fmax, int* i 
static int Ti3026_setpclk(WPMINFO int clk) {

	unsigned int f_pll;

	unsigned int pixfeed, pixin, pixpost;

	struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);

	struct matrox_hw_state *hw = &minfo->hw;



	DBG(__func__)



	f_pll = Ti3026_calcclock(PMINFO clk, ACCESS_FBINFO(max_pixel_clock), &pixin, &pixfeed, &pixpost);

	f_pll = Ti3026_calcclock(PMINFO clk, minfo->max_pixel_clock, &pixin, &pixfeed, &pixpost);



	hw->DACclk[0] = pixin | 0xC0;

	hw->DACclk[1] = pixfeed;
@@ -309,9 +309,9 @@ static int Ti3026_setpclk(WPMINFO int clk) { 
		unsigned int loopfeed, loopin, looppost, loopdiv, z;

		unsigned int Bpp;



		Bpp = ACCESS_FBINFO(curr.final_bppShift);

		Bpp = minfo->curr.final_bppShift;



		if (ACCESS_FBINFO(fbcon).var.bits_per_pixel == 24) {

		if (minfo->fbcon.var.bits_per_pixel == 24) {

			loopfeed = 3;		/* set lm to any possible value */

			loopin = 3 * 32 / Bpp;

		} else {
@@ -330,18 +330,18 @@ static int Ti3026_setpclk(WPMINFO int clk) { 
			looppost = 3;

			loopdiv = z/16;

		}

		if (ACCESS_FBINFO(fbcon).var.bits_per_pixel == 24) {

		if (minfo->fbcon.var.bits_per_pixel == 24) {

			hw->DACclk[3] = ((65 - loopin) & 0x3F) | 0xC0;

			hw->DACclk[4] = (65 - loopfeed) | 0x80;

			if (ACCESS_FBINFO(accel.ramdac_rev) > 0x20) {

				if (isInterleave(MINFO))

			if (minfo->accel.ramdac_rev > 0x20) {

				if (isInterleave(minfo))

					hw->DACreg[POS3026_XLATCHCTRL] = TVP3026B_XLATCHCTRL_8_3;

				else {

					hw->DACclk[4] &= ~0xC0;

					hw->DACreg[POS3026_XLATCHCTRL] = TVP3026B_XLATCHCTRL_4_3;

				}

			} else {

				if (isInterleave(MINFO))

				if (isInterleave(minfo))

					;	/* default... */

				else {

					hw->DACclk[4] ^= 0xC0;	/* change from 0x80 to 0x40 */
@@ -349,7 +349,7 @@ static int Ti3026_setpclk(WPMINFO int clk) { 
				}

			}

			hw->DACclk[5] = looppost | 0xF8;

			if (ACCESS_FBINFO(devflags.mga_24bpp_fix))

			if (minfo->devflags.mga_24bpp_fix)

				hw->DACclk[5] ^= 0x40;

		} else {

			hw->DACclk[3] = ((65 - loopin) & 0x3F) | 0xC0;
@@ -362,13 +362,13 @@ static int Ti3026_setpclk(WPMINFO int clk) { 
}



static int Ti3026_init(WPMINFO struct my_timming* m) {

	u_int8_t muxctrl = isInterleave(MINFO) ? TVP3026_XMUXCTRL_MEMORY_64BIT : TVP3026_XMUXCTRL_MEMORY_32BIT;

	struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);

	u_int8_t muxctrl = isInterleave(minfo) ? TVP3026_XMUXCTRL_MEMORY_64BIT : TVP3026_XMUXCTRL_MEMORY_32BIT;

	struct matrox_hw_state *hw = &minfo->hw;



	DBG(__func__)



	memcpy(hw->DACreg, MGADACbpp32, sizeof(hw->DACreg));

	switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {

	switch (minfo->fbcon.var.bits_per_pixel) {

		case 4:	hw->DACreg[POS3026_XLATCHCTRL] = TVP3026_XLATCHCTRL_16_1;	/* or _8_1, they are same */

			hw->DACreg[POS3026_XTRUECOLORCTRL] = TVP3026_XTRUECOLORCTRL_PSEUDOCOLOR;

			hw->DACreg[POS3026_XMUXCTRL] = muxctrl | TVP3026_XMUXCTRL_PIXEL_4BIT;
@@ -383,7 +383,7 @@ static int Ti3026_init(WPMINFO struct my_timming* m) { 
			break;

		case 16:

			/* XLATCHCTRL should be _4_1 / _2_1... Why is not? (_2_1 is used everytime) */

			hw->DACreg[POS3026_XTRUECOLORCTRL] = (ACCESS_FBINFO(fbcon).var.green.length == 5)? (TVP3026_XTRUECOLORCTRL_DIRECTCOLOR | TVP3026_XTRUECOLORCTRL_ORGB_1555 ) : (TVP3026_XTRUECOLORCTRL_DIRECTCOLOR | TVP3026_XTRUECOLORCTRL_RGB_565);

			hw->DACreg[POS3026_XTRUECOLORCTRL] = (minfo->fbcon.var.green.length == 5) ? (TVP3026_XTRUECOLORCTRL_DIRECTCOLOR | TVP3026_XTRUECOLORCTRL_ORGB_1555) : (TVP3026_XTRUECOLORCTRL_DIRECTCOLOR | TVP3026_XTRUECOLORCTRL_RGB_565);

			hw->DACreg[POS3026_XMUXCTRL] = muxctrl | TVP3026_XMUXCTRL_PIXEL_16BIT;

			hw->DACreg[POS3026_XCLKCTRL] = TVP3026_XCLKCTRL_SRC_PLL | TVP3026_XCLKCTRL_DIV2;

			break;
@@ -412,9 +412,9 @@ static int Ti3026_init(WPMINFO struct my_timming* m) { 
		hw->DACreg[POS3026_XGENCTRL] |= TVP3026_XGENCTRL_SYNC_ON_GREEN;



	/* set DELAY */

	if (ACCESS_FBINFO(video.len) < 0x400000)

	if (minfo->video.len < 0x400000)

		hw->CRTCEXT[3] |= 0x08;

	else if (ACCESS_FBINFO(video.len) > 0x400000)

	else if (minfo->video.len > 0x400000)

		hw->CRTCEXT[3] |= 0x10;



	/* set HWCURSOR */
@@ -426,7 +426,7 @@ static int Ti3026_init(WPMINFO struct my_timming* m) { 


	/* set interleaving */

	hw->MXoptionReg &= ~0x00001000;

	if (isInterleave(MINFO)) hw->MXoptionReg |= 0x00001000;

	if (isInterleave(minfo)) hw->MXoptionReg |= 0x00001000;



	/* set DAC */

	Ti3026_setpclk(PMINFO m->pixclock);
@@ -442,7 +442,7 @@ static void ti3026_setMCLK(WPMINFO int fout){ 


	DBG(__func__)



	f_pll = Ti3026_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &mclk_n, &mclk_m, &mclk_p);

	f_pll = Ti3026_calcclock(PMINFO fout, minfo->max_pixel_clock, &mclk_n, &mclk_m, &mclk_p);



	/* save pclk */

	outTi3026(PMINFO TVP3026_XPLLADDR, 0xFC);
@@ -496,7 +496,7 @@ static void ti3026_setMCLK(WPMINFO int fout){ 
		printk(KERN_ERR "matroxfb: Memory PLL not locked after 5 secs\n");



	f_pll = f_pll * 333 / (10000 << mclk_p);

	if (isMilleniumII(MINFO)) {

	if (isMilleniumII(minfo)) {

		rfhcnt = (f_pll - 128) / 256;

		if (rfhcnt > 15)

			rfhcnt = 15;
@@ -505,8 +505,8 @@ static void ti3026_setMCLK(WPMINFO int fout){ 
		if (rfhcnt > 15)

			rfhcnt = 0;

	}

	ACCESS_FBINFO(hw).MXoptionReg = (ACCESS_FBINFO(hw).MXoptionReg & ~0x000F0000) | (rfhcnt << 16);

	pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, ACCESS_FBINFO(hw).MXoptionReg);

	minfo->hw.MXoptionReg = (minfo->hw.MXoptionReg & ~0x000F0000) | (rfhcnt << 16);

	pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, minfo->hw.MXoptionReg);



	/* output MCLK to MCLK pin */

	outTi3026(PMINFO TVP3026_XMEMPLLCTRL, (mclk_ctl & 0xE7) | TVP3026_XMEMPLLCTRL_MCLK_MCLKPLL);
@@ -536,14 +536,14 @@ static void ti3026_ramdac_init(WPMINFO2) { 


	DBG(__func__)



	ACCESS_FBINFO(features.pll.vco_freq_min) = 110000;

	ACCESS_FBINFO(features.pll.ref_freq)	 = 114545;

	ACCESS_FBINFO(features.pll.feed_div_min) = 2;

	ACCESS_FBINFO(features.pll.feed_div_max) = 24;

	ACCESS_FBINFO(features.pll.in_div_min)	 = 2;

	ACCESS_FBINFO(features.pll.in_div_max)	 = 63;

	ACCESS_FBINFO(features.pll.post_shift_max) = 3;

	if (ACCESS_FBINFO(devflags.noinit))

	minfo->features.pll.vco_freq_min = 110000;

	minfo->features.pll.ref_freq	 = 114545;

	minfo->features.pll.feed_div_min = 2;

	minfo->features.pll.feed_div_max = 24;

	minfo->features.pll.in_div_min	 = 2;

	minfo->features.pll.in_div_max	 = 63;

	minfo->features.pll.post_shift_max = 3;

	if (minfo->devflags.noinit)

		return;

	ti3026_setMCLK(PMINFO 60000);

}
@@ -551,7 +551,7 @@ static void ti3026_ramdac_init(WPMINFO2) { 
static void Ti3026_restore(WPMINFO2) {

	int i;

	unsigned char progdac[6];

	struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);

	struct matrox_hw_state *hw = &minfo->hw;

	CRITFLAGS



	DBG(__func__)
@@ -565,7 +565,7 @@ static void Ti3026_restore(WPMINFO2) { 


	CRITBEGIN



	pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);

	pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, hw->MXoptionReg);



	CRITEND
@@ -573,7 +573,7 @@ static void Ti3026_restore(WPMINFO2) { 


	CRITBEGIN



	ACCESS_FBINFO(crtc1.panpos) = -1;

	minfo->crtc1.panpos = -1;

	for (i = 0; i < 6; i++)

		mga_setr(M_EXTVGA_INDEX, i, hw->CRTCEXT[i]);
@@ -678,35 +678,35 @@ static int Ti3026_preinit(WPMINFO2) { 
	static const int vxres_mill1[] = {             640, 768,  800,        960,

					  1024, 1152, 1280,      1600,       1920,

					  2048, 0};

	struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);

	struct matrox_hw_state *hw = &minfo->hw;



	DBG(__func__)



	ACCESS_FBINFO(millenium) = 1;

	ACCESS_FBINFO(milleniumII) = (ACCESS_FBINFO(pcidev)->device != PCI_DEVICE_ID_MATROX_MIL);

	ACCESS_FBINFO(capable.cfb4) = 1;

	ACCESS_FBINFO(capable.text) = 1; /* isMilleniumII(MINFO); */

	ACCESS_FBINFO(capable.vxres) = isMilleniumII(MINFO)?vxres_mill2:vxres_mill1;

	minfo->millenium = 1;

	minfo->milleniumII = (minfo->pcidev->device != PCI_DEVICE_ID_MATROX_MIL);

	minfo->capable.cfb4 = 1;

	minfo->capable.text = 1; /* isMilleniumII(minfo); */

	minfo->capable.vxres = isMilleniumII(minfo) ? vxres_mill2 : vxres_mill1;



	ACCESS_FBINFO(outputs[0]).data = MINFO;

	ACCESS_FBINFO(outputs[0]).output = &ti3026_output;

	ACCESS_FBINFO(outputs[0]).src = ACCESS_FBINFO(outputs[0]).default_src;

	ACCESS_FBINFO(outputs[0]).mode = MATROXFB_OUTPUT_MODE_MONITOR;

	minfo->outputs[0].data = minfo;

	minfo->outputs[0].output = &ti3026_output;

	minfo->outputs[0].src = minfo->outputs[0].default_src;

	minfo->outputs[0].mode = MATROXFB_OUTPUT_MODE_MONITOR;



	if (ACCESS_FBINFO(devflags.noinit))

	if (minfo->devflags.noinit)

		return 0;

	/* preserve VGA I/O, BIOS and PPC */

	hw->MXoptionReg &= 0xC0000100;

	hw->MXoptionReg |= 0x002C0000;

	if (ACCESS_FBINFO(devflags.novga))

	if (minfo->devflags.novga)

		hw->MXoptionReg &= ~0x00000100;

	if (ACCESS_FBINFO(devflags.nobios))

	if (minfo->devflags.nobios)

		hw->MXoptionReg &= ~0x40000000;

	if (ACCESS_FBINFO(devflags.nopciretry))

	if (minfo->devflags.nopciretry)

		hw->MXoptionReg |=  0x20000000;

	pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);

	pci_write_config_dword(minfo->pcidev, PCI_OPTION_REG, hw->MXoptionReg);



	ACCESS_FBINFO(accel.ramdac_rev) = inTi3026(PMINFO TVP3026_XSILICONREV);

	minfo->accel.ramdac_rev = inTi3026(PMINFO TVP3026_XSILICONREV);



	outTi3026(PMINFO TVP3026_XCLKCTRL, TVP3026_XCLKCTRL_SRC_CLK0VGA | TVP3026_XCLKCTRL_CLKSTOPPED);

	outTi3026(PMINFO TVP3026_XTRUECOLORCTRL, TVP3026_XTRUECOLORCTRL_PSEUDOCOLOR);

drivers/video/matrox/matroxfb_accel.c

+43 −43
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ 
#include "matroxfb_Ti3026.h"

#include "matroxfb_misc.h"



#define curr_ydstorg(x)	ACCESS_FBINFO2(x, curr.ydstorg.pixels)

#define curr_ydstorg(x)	((x)->curr.ydstorg.pixels)



#define mga_ydstlen(y,l) mga_outl(M_YDSTLEN | M_EXEC, ((y) << 16) | (l))
@@ -115,59 +115,59 @@ void matrox_cfbX_init(WPMINFO2) { 


	DBG(__func__)



	mpitch = ACCESS_FBINFO(fbcon).var.xres_virtual;

	mpitch = minfo->fbcon.var.xres_virtual;



	ACCESS_FBINFO(fbops).fb_copyarea = cfb_copyarea;

	ACCESS_FBINFO(fbops).fb_fillrect = cfb_fillrect;

	ACCESS_FBINFO(fbops).fb_imageblit = cfb_imageblit;

	ACCESS_FBINFO(fbops).fb_cursor = NULL;

	minfo->fbops.fb_copyarea = cfb_copyarea;

	minfo->fbops.fb_fillrect = cfb_fillrect;

	minfo->fbops.fb_imageblit = cfb_imageblit;

	minfo->fbops.fb_cursor = NULL;



	accel = (ACCESS_FBINFO(fbcon).var.accel_flags & FB_ACCELF_TEXT) == FB_ACCELF_TEXT;

	accel = (minfo->fbcon.var.accel_flags & FB_ACCELF_TEXT) == FB_ACCELF_TEXT;



	switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {

	switch (minfo->fbcon.var.bits_per_pixel) {

		case 4:		maccess = 0x00000000;	/* accelerate as 8bpp video */

				mpitch = (mpitch >> 1) | 0x8000; /* disable linearization */

				mopmode = M_OPMODE_4BPP;

				matrox_cfb4_pal(ACCESS_FBINFO(cmap));

				matrox_cfb4_pal(minfo->cmap);

				if (accel && !(mpitch & 1)) {

					ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_cfb4_copyarea;

					ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_cfb4_fillrect;

					minfo->fbops.fb_copyarea = matroxfb_cfb4_copyarea;

					minfo->fbops.fb_fillrect = matroxfb_cfb4_fillrect;

				}

				break;

		case 8:		maccess = 0x00000000;

				mopmode = M_OPMODE_8BPP;

				matrox_cfb8_pal(ACCESS_FBINFO(cmap));

				matrox_cfb8_pal(minfo->cmap);

				if (accel) {

					ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;

					ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_fillrect;

					ACCESS_FBINFO(fbops).fb_imageblit = matroxfb_imageblit;

					minfo->fbops.fb_copyarea = matroxfb_copyarea;

					minfo->fbops.fb_fillrect = matroxfb_fillrect;

					minfo->fbops.fb_imageblit = matroxfb_imageblit;

				}

				break;

		case 16:	if (ACCESS_FBINFO(fbcon).var.green.length == 5)

		case 16:	if (minfo->fbcon.var.green.length == 5)

					maccess = 0xC0000001;

				else

					maccess = 0x40000001;

				mopmode = M_OPMODE_16BPP;

				if (accel) {

					ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;

					ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_fillrect;

					ACCESS_FBINFO(fbops).fb_imageblit = matroxfb_imageblit;

					minfo->fbops.fb_copyarea = matroxfb_copyarea;

					minfo->fbops.fb_fillrect = matroxfb_fillrect;

					minfo->fbops.fb_imageblit = matroxfb_imageblit;

				}

				break;

		case 24:	maccess = 0x00000003;

				mopmode = M_OPMODE_24BPP;

				if (accel) {

					ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;

					ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_fillrect;

					ACCESS_FBINFO(fbops).fb_imageblit = matroxfb_imageblit;

					minfo->fbops.fb_copyarea = matroxfb_copyarea;

					minfo->fbops.fb_fillrect = matroxfb_fillrect;

					minfo->fbops.fb_imageblit = matroxfb_imageblit;

				}

				break;

		case 32:	maccess = 0x00000002;

				mopmode = M_OPMODE_32BPP;

				if (accel) {

					ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;

					ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_fillrect;

					ACCESS_FBINFO(fbops).fb_imageblit = matroxfb_imageblit;

					minfo->fbops.fb_copyarea = matroxfb_copyarea;

					minfo->fbops.fb_fillrect = matroxfb_fillrect;

					minfo->fbops.fb_imageblit = matroxfb_imageblit;

				}

				break;

		default:	maccess = 0x00000000;
@@ -176,10 +176,10 @@ void matrox_cfbX_init(WPMINFO2) { 
	}

	mga_fifo(8);

	mga_outl(M_PITCH, mpitch);

	mga_outl(M_YDSTORG, curr_ydstorg(MINFO));

	if (ACCESS_FBINFO(capable.plnwt))

	mga_outl(M_YDSTORG, curr_ydstorg(minfo));

	if (minfo->capable.plnwt)

		mga_outl(M_PLNWT, -1);

	if (ACCESS_FBINFO(capable.srcorg)) {

	if (minfo->capable.srcorg) {

		mga_outl(M_SRCORG, 0);

		mga_outl(M_DSTORG, 0);

	}
@@ -188,9 +188,9 @@ void matrox_cfbX_init(WPMINFO2) { 
	mga_outl(M_YTOP, 0);

	mga_outl(M_YBOT, 0x01FFFFFF);

	mga_outl(M_MACCESS, maccess);

	ACCESS_FBINFO(accel.m_dwg_rect) = M_DWG_TRAP | M_DWG_SOLID | M_DWG_ARZERO | M_DWG_SGNZERO | M_DWG_SHIFTZERO;

	if (isMilleniumII(MINFO)) ACCESS_FBINFO(accel.m_dwg_rect) |= M_DWG_TRANSC;

	ACCESS_FBINFO(accel.m_opmode) = mopmode;

	minfo->accel.m_dwg_rect = M_DWG_TRAP | M_DWG_SOLID | M_DWG_ARZERO | M_DWG_SGNZERO | M_DWG_SHIFTZERO;

	if (isMilleniumII(minfo)) minfo->accel.m_dwg_rect |= M_DWG_TRANSC;

	minfo->accel.m_opmode = mopmode;

}



EXPORT_SYMBOL(matrox_cfbX_init);
@@ -209,7 +209,7 @@ static void matrox_accel_bmove(WPMINFO int vxres, int sy, int sx, int dy, int dx 
			 M_DWG_BFCOL | M_DWG_REPLACE);

		mga_outl(M_AR5, vxres);

		width--;

		start = sy*vxres+sx+curr_ydstorg(MINFO);

		start = sy*vxres+sx+curr_ydstorg(minfo);

		end = start+width;

	} else {

		mga_fifo(3);
@@ -217,7 +217,7 @@ static void matrox_accel_bmove(WPMINFO int vxres, int sy, int sx, int dy, int dx 
		mga_outl(M_SGN, 5);

		mga_outl(M_AR5, -vxres);

		width--;

		end = (sy+height-1)*vxres+sx+curr_ydstorg(MINFO);

		end = (sy+height-1)*vxres+sx+curr_ydstorg(minfo);

		start = end+width;

		dy += height-1;

	}
@@ -245,7 +245,7 @@ static void matrox_accel_bmove_lin(WPMINFO int vxres, int sy, int sx, int dy, in 
			M_DWG_BFCOL | M_DWG_REPLACE);

		mga_outl(M_AR5, vxres);

		width--;

		start = sy*vxres+sx+curr_ydstorg(MINFO);

		start = sy*vxres+sx+curr_ydstorg(minfo);

		end = start+width;

	} else {

		mga_fifo(3);
@@ -253,7 +253,7 @@ static void matrox_accel_bmove_lin(WPMINFO int vxres, int sy, int sx, int dy, in 
		mga_outl(M_SGN, 5);

		mga_outl(M_AR5, -vxres);

		width--;

		end = (sy+height-1)*vxres+sx+curr_ydstorg(MINFO);

		end = (sy+height-1)*vxres+sx+curr_ydstorg(minfo);

		start = end+width;

		dy += height-1;

	}
@@ -274,13 +274,13 @@ static void matroxfb_cfb4_copyarea(struct fb_info* info, const struct fb_copyare 
	if ((area->sx | area->dx | area->width) & 1)

		cfb_copyarea(info, area);

	else

		matrox_accel_bmove_lin(PMINFO ACCESS_FBINFO(fbcon.var.xres_virtual) >> 1, area->sy, area->sx >> 1, area->dy, area->dx >> 1, area->height, area->width >> 1);

		matrox_accel_bmove_lin(PMINFO minfo->fbcon.var.xres_virtual >> 1, area->sy, area->sx >> 1, area->dy, area->dx >> 1, area->height, area->width >> 1);

}



static void matroxfb_copyarea(struct fb_info* info, const struct fb_copyarea* area) {

	MINFO_FROM_INFO(info);



	matrox_accel_bmove(PMINFO ACCESS_FBINFO(fbcon.var.xres_virtual), area->sy, area->sx, area->dy, area->dx, area->height, area->width);

	matrox_accel_bmove(PMINFO minfo->fbcon.var.xres_virtual, area->sy, area->sx, area->dy, area->dx, area->height, area->width);

}



static void matroxfb_accel_clear(WPMINFO u_int32_t color, int sy, int sx, int height,
@@ -292,7 +292,7 @@ static void matroxfb_accel_clear(WPMINFO u_int32_t color, int sy, int sx, int he 
	CRITBEGIN



	mga_fifo(5);

	mga_outl(M_DWGCTL, ACCESS_FBINFO(accel.m_dwg_rect) | M_DWG_REPLACE);

	mga_outl(M_DWGCTL, minfo->accel.m_dwg_rect | M_DWG_REPLACE);

	mga_outl(M_FCOL, color);

	mga_outl(M_FXBNDRY, ((sx + width) << 16) | sx);

	mga_ydstlen(sy, height);
@@ -333,16 +333,16 @@ static void matroxfb_cfb4_clear(WPMINFO u_int32_t bgx, int sy, int sx, int heigh 
	sx >>= 1;

	if (width) {

		mga_fifo(5);

		mga_outl(M_DWGCTL, ACCESS_FBINFO(accel.m_dwg_rect) | M_DWG_REPLACE2);

		mga_outl(M_DWGCTL, minfo->accel.m_dwg_rect | M_DWG_REPLACE2);

		mga_outl(M_FCOL, bgx);

		mga_outl(M_FXBNDRY, ((sx + width) << 16) | sx);

		mga_outl(M_YDST, sy * ACCESS_FBINFO(fbcon).var.xres_virtual >> 6);

		mga_outl(M_YDST, sy * minfo->fbcon.var.xres_virtual >> 6);

		mga_outl(M_LEN | M_EXEC, height);

		WaitTillIdle();

	}

	if (whattodo) {

		u_int32_t step = ACCESS_FBINFO(fbcon).var.xres_virtual >> 1;

		vaddr_t vbase = ACCESS_FBINFO(video.vbase);

		u_int32_t step = minfo->fbcon.var.xres_virtual >> 1;

		vaddr_t vbase = minfo->video.vbase;

		if (whattodo & 1) {

			unsigned int uaddr = sy * step + sx - 1;

			u_int32_t loop;
@@ -412,7 +412,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx, 
	mga_outl(M_FCOL, fgx);

	mga_outl(M_BCOL, bgx);

	fxbndry = ((xx + width - 1) << 16) | xx;

	mmio = ACCESS_FBINFO(mmio.vbase);

	mmio = minfo->mmio.vbase;



	mga_fifo(6);

	mga_writel(mmio, M_FXBNDRY, fxbndry);