From 939d906e08b2894aed2e3e82bdd989d7ea5508e1 Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Wed, 23 Jul 2008 21:30:58 -0700 Subject: [PATCH] --- yaml --- r: 105506 b: refs/heads/master c: a0d922562d56073f147a4de2983bee499dd2a10e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/tridentfb.c | 10 +++++++--- trunk/include/video/trident.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 60fa98d50466..757d578d822e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e73a47f094a919e2edeaa88e840cd0400adc423 +refs/heads/master: a0d922562d56073f147a4de2983bee499dd2a10e diff --git a/trunk/drivers/video/tridentfb.c b/trunk/drivers/video/tridentfb.c index 9668be881fe3..9dedc1a5e421 100644 --- a/trunk/drivers/video/tridentfb.c +++ b/trunk/drivers/video/tridentfb.c @@ -87,13 +87,15 @@ MODULE_PARM_DESC(crt, "Define if CRT is connected"); static int is_oldclock(int id) { - return (id == TGUI9660) || + return (id == TGUI9440) || + (id == TGUI9660) || (id == CYBER9320); } static int is_oldprotect(int id) { - return (id == TGUI9660) || + return (id == TGUI9440) || + (id == TGUI9660) || (id == PROVIDIA9685) || (id == CYBER9320) || (id == CYBER9382) || @@ -1042,7 +1044,8 @@ static int tridentfb_set_par(struct fb_info *info) if (!is_xp(par->chip_id)) write3X4(par, Performance, read3X4(par, Performance) | 0x10); /* MMIO & PCI read and write burst enable */ - write3X4(par, PCIReg, read3X4(par, PCIReg) | 0x06); + if (par->chip_id != TGUI9440) + write3X4(par, PCIReg, read3X4(par, PCIReg) | 0x06); /* convert from picoseconds to kHz */ vclk = PICOS2KHZ(info->var.pixclock); @@ -1418,6 +1421,7 @@ static struct pci_device_id trident_devices[] = { {PCI_VENDOR_ID_TRIDENT, CYBERBLADEAi1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEAi1D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEE4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, + {PCI_VENDOR_ID_TRIDENT, TGUI9440, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_TRIDENT, TGUI9660, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_TRIDENT, IMAGE975, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_TRIDENT, IMAGE985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, diff --git a/trunk/include/video/trident.h b/trunk/include/video/trident.h index fa690b9fcc13..76d81b2198dc 100644 --- a/trunk/include/video/trident.h +++ b/trunk/include/video/trident.h @@ -24,6 +24,7 @@ #define CYBER9397DVD 0x939A #define CYBER9520 0x9520 #define CYBER9525DVD 0x9525 +#define TGUI9440 0x9440 #define TGUI9660 0x9660 #define PROVIDIA9685 0x9685 #define IMAGE975 0x9750