intelfb: add support for i945G
This just adds the defines and structure for i945G Signed-off-by: Dave Airlie <airlied@linux.ie>
This commit is contained in:
parent
0c187addab
commit
9639d5ec07
|
@ -8,9 +8,9 @@
|
||||||
|
|
||||||
|
|
||||||
/*** Version/name ***/
|
/*** Version/name ***/
|
||||||
#define INTELFB_VERSION "0.9.2"
|
#define INTELFB_VERSION "0.9.3"
|
||||||
#define INTELFB_MODULE_NAME "intelfb"
|
#define INTELFB_MODULE_NAME "intelfb"
|
||||||
#define SUPPORTED_CHIPSETS "830M/845G/852GM/855GM/865G/915G/915GM"
|
#define SUPPORTED_CHIPSETS "830M/845G/852GM/855GM/865G/915G/915GM/945G"
|
||||||
|
|
||||||
|
|
||||||
/*** Debug/feature defines ***/
|
/*** Debug/feature defines ***/
|
||||||
|
@ -52,6 +52,7 @@
|
||||||
#define PCI_DEVICE_ID_INTEL_865G 0x2572
|
#define PCI_DEVICE_ID_INTEL_865G 0x2572
|
||||||
#define PCI_DEVICE_ID_INTEL_915G 0x2582
|
#define PCI_DEVICE_ID_INTEL_915G 0x2582
|
||||||
#define PCI_DEVICE_ID_INTEL_915GM 0x2592
|
#define PCI_DEVICE_ID_INTEL_915GM 0x2592
|
||||||
|
#define PCI_DEVICE_ID_INTEL_945G 0x2772
|
||||||
|
|
||||||
/* Size of MMIO region */
|
/* Size of MMIO region */
|
||||||
#define INTEL_REG_SIZE 0x80000
|
#define INTEL_REG_SIZE 0x80000
|
||||||
|
@ -125,7 +126,8 @@ enum intel_chips {
|
||||||
INTEL_855GME,
|
INTEL_855GME,
|
||||||
INTEL_865G,
|
INTEL_865G,
|
||||||
INTEL_915G,
|
INTEL_915G,
|
||||||
INTEL_915GM
|
INTEL_915GM,
|
||||||
|
INTEL_945G
|
||||||
};
|
};
|
||||||
|
|
||||||
struct intelfb_hwstate {
|
struct intelfb_hwstate {
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
/*
|
/*
|
||||||
* intelfb
|
* intelfb
|
||||||
*
|
*
|
||||||
* Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM
|
* Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/
|
||||||
* integrated graphics chips.
|
* 945G integrated graphics chips.
|
||||||
*
|
*
|
||||||
* Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
|
* Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
|
||||||
* 2004 Sylvain Meyer
|
* 2004 Sylvain Meyer
|
||||||
|
@ -182,6 +182,7 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = {
|
||||||
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_865G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_865G },
|
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_865G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_865G },
|
||||||
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915G },
|
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915G },
|
||||||
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915GM },
|
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915GM },
|
||||||
|
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945G },
|
||||||
{ 0, }
|
{ 0, }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -546,10 +547,11 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||||
|
|
||||||
/* Set base addresses. */
|
/* Set base addresses. */
|
||||||
if ((ent->device == PCI_DEVICE_ID_INTEL_915G) ||
|
if ((ent->device == PCI_DEVICE_ID_INTEL_915G) ||
|
||||||
(ent->device == PCI_DEVICE_ID_INTEL_915GM)) {
|
(ent->device == PCI_DEVICE_ID_INTEL_915GM) ||
|
||||||
|
(ent->device == PCI_DEVICE_ID_INTEL_945G)) {
|
||||||
aperture_bar = 2;
|
aperture_bar = 2;
|
||||||
mmio_bar = 0;
|
mmio_bar = 0;
|
||||||
/* Disable HW cursor on 915G/M (not implemented yet) */
|
/* Disable HW cursor on 9x5G/M (not implemented yet) */
|
||||||
hwcursor = 0;
|
hwcursor = 0;
|
||||||
}
|
}
|
||||||
dinfo->aperture.physical = pci_resource_start(pdev, aperture_bar);
|
dinfo->aperture.physical = pci_resource_start(pdev, aperture_bar);
|
||||||
|
|
|
@ -128,6 +128,12 @@ intelfbhw_get_chipset(struct pci_dev *pdev, struct intelfb_info *dinfo)
|
||||||
dinfo->mobile = 1;
|
dinfo->mobile = 1;
|
||||||
dinfo->pll_index = PLLS_I9xx;
|
dinfo->pll_index = PLLS_I9xx;
|
||||||
return 0;
|
return 0;
|
||||||
|
case PCI_DEVICE_ID_INTEL_945G:
|
||||||
|
dinfo->name = "Intel(R) 945G";
|
||||||
|
dinfo->chipset = INTEL_945G;
|
||||||
|
dinfo->mobile = 0;
|
||||||
|
dinfo->pll_index = PLLS_I9xx;
|
||||||
|
return 0;
|
||||||
default:
|
default:
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue