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

Commit 347486bb authored by Stefan Husemann's avatar Stefan Husemann Committed by Linus Torvalds
Browse files

intelfb: support i854 

Support the Intel 854 Chipset in fbdev.

We test and use the patch on a Thomson IP1101 IPTV-Box.  On the VGA-Port
we get a normal signal.

Here is the link to the Mambux-Project: http://www.mambux.de



Cc: Keith Packard <keithp@keithp.com>
Cc: Dave Airlie <airlied@linux.ie>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: default avatarStefan Husemann <shusemann@googlemail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a55ce6dc

drivers/char/agp/intel-agp.c

+3 −0
Original line number Diff line number Diff line
@@ -2131,6 +2131,8 @@ static const struct intel_driver_description { 
	{ PCI_DEVICE_ID_INTEL_82845G_HB, PCI_DEVICE_ID_INTEL_82845G_IG, 0, "830M",

		&intel_845_driver, &intel_830_driver },

	{ PCI_DEVICE_ID_INTEL_82850_HB, 0, 0, "i850", &intel_850_driver, NULL },

	{ PCI_DEVICE_ID_INTEL_82854_HB, PCI_DEVICE_ID_INTEL_82854_IG, 0, "854",

		&intel_845_driver, &intel_830_driver },

	{ PCI_DEVICE_ID_INTEL_82855PM_HB, 0, 0, "855PM", &intel_845_driver, NULL },

	{ PCI_DEVICE_ID_INTEL_82855GM_HB, PCI_DEVICE_ID_INTEL_82855GM_IG, 0, "855GM",

		&intel_845_driver, &intel_830_driver },
@@ -2355,6 +2357,7 @@ static struct pci_device_id agp_intel_pci_table[] = { 
	ID(PCI_DEVICE_ID_INTEL_82845_HB),

	ID(PCI_DEVICE_ID_INTEL_82845G_HB),

	ID(PCI_DEVICE_ID_INTEL_82850_HB),

	ID(PCI_DEVICE_ID_INTEL_82854_HB),

	ID(PCI_DEVICE_ID_INTEL_82855PM_HB),

	ID(PCI_DEVICE_ID_INTEL_82855GM_HB),

	ID(PCI_DEVICE_ID_INTEL_82860_HB),

drivers/video/intelfb/intelfb.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#define PCI_DEVICE_ID_INTEL_830M	0x3577

#define PCI_DEVICE_ID_INTEL_845G	0x2562

#define PCI_DEVICE_ID_INTEL_85XGM	0x3582

#define PCI_DEVICE_ID_INTEL_854		0x358E

#define PCI_DEVICE_ID_INTEL_865G	0x2572

#define PCI_DEVICE_ID_INTEL_915G	0x2582

#define PCI_DEVICE_ID_INTEL_915GM	0x2592
@@ -154,6 +155,7 @@ enum intel_chips { 
	INTEL_85XGM,

	INTEL_852GM,

	INTEL_852GME,

	INTEL_854,

	INTEL_855GM,

	INTEL_855GME,

	INTEL_865G,

drivers/video/intelfb/intelfb_i2c.c

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ void intelfb_create_i2c_busses(struct intelfb_info *dinfo) 
	switch(dinfo->chipset) {

	case INTEL_830M:

	case INTEL_845G:

	case INTEL_854:

	case INTEL_855GM:

	case INTEL_865G:

		dinfo->output[i].type = INTELFB_OUTPUT_DVO;

drivers/video/intelfb/intelfbdrv.c

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = { 
	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_845G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_845G },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_85XGM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_85XGM },

	{ 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_854, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_854 },

	{ 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 },

drivers/video/intelfb/intelfbhw.c

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

		dinfo->pll_index = PLLS_I8xx;

		return 0;

	case PCI_DEVICE_ID_INTEL_854:

		dinfo->mobile = 1;

		dinfo->name = "Intel(R) 854";

		dinfo->chipset = INTEL_854;

		return 0;

	case PCI_DEVICE_ID_INTEL_85XGM:

		tmp = 0;

		dinfo->mobile = 1;