From f5283af384e948f54020af1ed9a12e6fd2b3b0e3 Mon Sep 17 00:00:00 2001 From: Ondrej Zary Date: Wed, 27 Oct 2010 15:33:25 -0700 Subject: [PATCH] --- yaml --- r: 218515 b: refs/heads/master c: f0a2f357d46a51f8066eb47b3dba40f87a680804 h: refs/heads/master i: 218513: dd5ae95decb7e5faf068c88d5e4fff2bfef8b04d 218511: b73cac9ba8622702437a79cbbf1775a90c29c4cf v: v3 --- [refs] | 2 +- trunk/drivers/video/savage/savagefb-i2c.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 732bdba74bfc..fc4bcf622ae1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09b599ddd467911ad6b43f3abe3c533446662417 +refs/heads/master: f0a2f357d46a51f8066eb47b3dba40f87a680804 diff --git a/trunk/drivers/video/savage/savagefb-i2c.c b/trunk/drivers/video/savage/savagefb-i2c.c index ed371c868b3a..b16e6138fdd4 100644 --- a/trunk/drivers/video/savage/savagefb-i2c.c +++ b/trunk/drivers/video/savage/savagefb-i2c.c @@ -181,6 +181,15 @@ void savagefb_create_i2c_busses(struct fb_info *info) par->chan.algo.getscl = prosavage_gpio_getscl; break; case FB_ACCEL_SAVAGE4: + par->chan.reg = CR_SERIAL1; + if (par->pcidev->revision > 1 && !(VGArCR(0xa6, par) & 0x40)) + par->chan.reg = CR_SERIAL2; + par->chan.ioaddr = par->mmio.vbase; + par->chan.algo.setsda = prosavage_gpio_setsda; + par->chan.algo.setscl = prosavage_gpio_setscl; + par->chan.algo.getsda = prosavage_gpio_getsda; + par->chan.algo.getscl = prosavage_gpio_getscl; + break; case FB_ACCEL_SAVAGE2000: par->chan.reg = 0xff20; par->chan.ioaddr = par->mmio.vbase;