Commit 9a90603f authored by Dave Airlie's avatar Dave Airlie
Browse files

intelfb: add i945GM support 



Untested i945GM support just add the framework.

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 8b91b0b4

drivers/video/intelfb/intelfb.h

+6 −4
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 




/*** Version/name ***/

#define INTELFB_VERSION			"0.9.3"

#define INTELFB_VERSION			"0.9.4"

#define INTELFB_MODULE_NAME		"intelfb"

#define SUPPORTED_CHIPSETS		"830M/845G/852GM/855GM/865G/915G/915GM/945G"

#define SUPPORTED_CHIPSETS		"830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM"





/*** Debug/feature defines ***/
@@ -53,6 +53,7 @@ 
#define PCI_DEVICE_ID_INTEL_915G	0x2582

#define PCI_DEVICE_ID_INTEL_915GM	0x2592

#define PCI_DEVICE_ID_INTEL_945G	0x2772

#define PCI_DEVICE_ID_INTEL_945GM	0x27A2



/* Size of MMIO region */

#define INTEL_REG_SIZE			0x80000
@@ -127,7 +128,8 @@ enum intel_chips { 
	INTEL_865G,

	INTEL_915G,

	INTEL_915GM,

	INTEL_945G

	INTEL_945G,

	INTEL_945GM,

};



struct intelfb_hwstate {
@@ -284,7 +286,7 @@ struct intelfb_info { 
	int pll_index;

};



#define IS_I9xx(dinfo) (((dinfo)->chipset == INTEL_915G)||(dinfo->chipset == INTEL_915GM)||((dinfo)->chipset == INTEL_945G))

#define IS_I9xx(dinfo) (((dinfo)->chipset == INTEL_915G)||(dinfo->chipset == INTEL_915GM)||((dinfo)->chipset == INTEL_945G)||(dinfo->chipset==INTEL_945GM))



/*** function prototypes ***/

drivers/video/intelfb/intelfbdrv.c

+4 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * intelfb

 *

 * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/

 * 945G integrated graphics chips.

 * 945G/945GM integrated graphics chips.

 *

 * Copyright  2002, 2003 David Dawes <dawes@xfree86.org>

 *                   2004 Sylvain Meyer
@@ -184,6 +184,7 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = { 
	{ 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_945G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945G },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945GM },

	{ 0, }

};
@@ -549,7 +550,8 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* Set base addresses. */

	if ((ent->device == PCI_DEVICE_ID_INTEL_915G) ||

	    (ent->device == PCI_DEVICE_ID_INTEL_915GM) ||

	    (ent->device == PCI_DEVICE_ID_INTEL_945G)) {

	    (ent->device == PCI_DEVICE_ID_INTEL_945G)  ||

	    (ent->device == PCI_DEVICE_ID_INTEL_945GM)) {

		aperture_bar = 2;

		mmio_bar = 0;

	}

drivers/video/intelfb/intelfbhw.c

+6 −0
Original line number Diff line number Diff line
@@ -134,6 +134,12 @@ intelfbhw_get_chipset(struct pci_dev *pdev, struct intelfb_info *dinfo) 
		dinfo->mobile = 0;

		dinfo->pll_index = PLLS_I9xx;

		return 0;

	case PCI_DEVICE_ID_INTEL_945GM:

		dinfo->name = "Intel(R) 945GM";

		dinfo->chipset = INTEL_945GM;

		dinfo->mobile = 1;

		dinfo->pll_index = PLLS_I9xx;

		return 0;

	default:

		return 1;

	}