Attachment 289694 Details for Bug 425786 – IntelFB support (not tested)

IntelFB support (not tested)

linux-2.6-intelfb-E7221-support.patch (text/x-patch), 4.82 KB, created by Carlos Martín on 2007-12-15 17:58:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Martín

Created: 2007-12-15 17:58:28 UTC

Size: 4.82 KB

patch

obsolete

>From ec9dbf86b98132624bf50620db552d06979edda1 Mon Sep 17 00:00:00 2001
>From: =?utf-8?q?Carlos=20Mart=C3=ADn?= <inean@users.sf.net>
>Date: Fri, 14 Dec 2007 16:24:57 +0100
>Subject: [PATCH] add support to E7221 chipset in intelfb module
>
>---
> drivers/video/intelfb/intelfb.h     |    6 ++++--
> drivers/video/intelfb/intelfb_i2c.c |    1 +
> drivers/video/intelfb/intelfbdrv.c  |    2 ++
> drivers/video/intelfb/intelfbhw.c   |    7 +++++++
> 4 files changed, 14 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
>index 6148300..7b8c213 100644
>--- a/drivers/video/intelfb/intelfb.h
>+++ b/drivers/video/intelfb/intelfb.h
>@@ -14,7 +14,7 @@
> /*** Version/name ***/
> #define INTELFB_VERSION			"0.9.4"
> #define INTELFB_MODULE_NAME		"intelfb"
>-#define SUPPORTED_CHIPSETS		"830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM"
>+#define SUPPORTED_CHIPSETS		"830M/845G/852GM/855GM/865G/915G/E7221/915GM/945G/945GM"
> 
> 
> /*** Debug/feature defines ***/
>@@ -55,6 +55,7 @@
> #define PCI_DEVICE_ID_INTEL_85XGM	0x3582
> #define PCI_DEVICE_ID_INTEL_865G	0x2572
> #define PCI_DEVICE_ID_INTEL_915G	0x2582
>+#define PCI_DEVICE_ID_INTEL_E7221	0x258a
> #define PCI_DEVICE_ID_INTEL_915GM	0x2592
> #define PCI_DEVICE_ID_INTEL_945G	0x2772
> #define PCI_DEVICE_ID_INTEL_945GM	0x27A2
>@@ -155,6 +156,7 @@ enum intel_chips {
> 	INTEL_855GME,
> 	INTEL_865G,
> 	INTEL_915G,
>+	INTEL_E7221,
> 	INTEL_915GM,
> 	INTEL_945G,
> 	INTEL_945GM,
>@@ -355,7 +357,7 @@ struct intelfb_info {
> 	struct intelfb_output_rec output[MAX_OUTPUTS];
> };
> 
>-#define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G)||(dinfo->chipset == INTEL_915GM)||((dinfo)->chipset == INTEL_945G)||(dinfo->chipset==INTEL_945GM))
>+#define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G)||((dinfo)->chipset == INTEL_E7221)||(dinfo->chipset == INTEL_915GM)||((dinfo)->chipset == INTEL_945G)||(dinfo->chipset==INTEL_945GM))
> 
> #ifndef FBIO_WAITFORVSYNC
> #define FBIO_WAITFORVSYNC	_IOW('F', 0x20, __u32)
>diff --git a/drivers/video/intelfb/intelfb_i2c.c b/drivers/video/intelfb/intelfb_i2c.c
>index 61e4c87..7248837 100644
>--- a/drivers/video/intelfb/intelfb_i2c.c
>+++ b/drivers/video/intelfb/intelfb_i2c.c
>@@ -160,6 +160,7 @@ void intelfb_create_i2c_busses(struct intelfb_info *dinfo)
> 		i++;
> 		break;
> 	case INTEL_915G:
>+	case INTEL_E7221:
> 	case INTEL_915GM:
> 		/* has  some LVDS + tv-out */
> 	case INTEL_945G:
>diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
>index b75eda8..c70961c 100644
>--- a/drivers/video/intelfb/intelfbdrv.c
>+++ b/drivers/video/intelfb/intelfbdrv.c
>@@ -184,6 +184,7 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = {
> 	{ 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_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_E7221, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_E7221 },
> 	{ 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 },
>@@ -559,6 +560,7 @@ 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_E7221) ||
> 	    (ent->device == PCI_DEVICE_ID_INTEL_915GM) ||
> 	    (ent->device == PCI_DEVICE_ID_INTEL_945G)  ||
> 	    (ent->device == PCI_DEVICE_ID_INTEL_945GM)) {
>diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
>index 6a47682..29290e4 100644
>--- a/drivers/video/intelfb/intelfbhw.c
>+++ b/drivers/video/intelfb/intelfbhw.c
>@@ -126,6 +126,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_E7221:
>+		dinfo->name = "Intel(R) E7221 (i915G)";
>+		dinfo->chipset = INTEL_E7221;
>+		dinfo->mobile = 0;
>+		dinfo->pll_index = PLLS_I9xx;
>+		return 0;
> 	case PCI_DEVICE_ID_INTEL_915GM:
> 		dinfo->name = "Intel(R) 915GM";
> 		dinfo->chipset = INTEL_915GM;
>@@ -173,6 +179,7 @@ intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size,
> 
> 	switch (pdev->device) {
> 	case PCI_DEVICE_ID_INTEL_915G:
>+	case PCI_DEVICE_ID_INTEL_E7221:
> 	case PCI_DEVICE_ID_INTEL_915GM:
> 	case PCI_DEVICE_ID_INTEL_945G:
> 	case PCI_DEVICE_ID_INTEL_945GM:
>-- 
>1.5.3.6
>

Actions: View

Attachments on bug 425786: 289692 | 289693 | 289694 | 289695