Added support for the Intel Integrated Graphics Controller965G/965GM to intelfb

From: Maik Broemme
Date: Thu Apr 10 2008 - 12:22:25 EST

Next message: Peter Zijlstra: "Re: [RFC][-mm] [1/2] Simple stats for cpu resource controller"
Previous message: Steven Rostedt: "Re: [PATCH] pop previous section in alternative.c"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi,

i have added support for the 965G and 965GM graphic chipsets to the intelfb
driver. I have a notebook with an Intel Mobile GM965/GL960 Integrated
Graphics Controller and with the attached patch the framebuffer comes
up. I have tested it a bit with DirectFB to make sure it is working stable.

I also have an Intel Mobile GM945 and i compared the results, the
programming interface of the 9xx series from Intel is mostly the same,
so i think the attached patch should add all functionality the 945GM
have. Please keep me in CC because i am not subscribed.

Signed-off-by: Maik Broemme <mbroemme@xxxxxxxxxxxxx>

--Maik
diff -Nur linux-2.6.25-rc8/Documentation/fb/intelfb.txt linux-2.6.25-rc8-intelfb-i965/Documentation/fb/intelfb.txt
--- linux-2.6.25-rc8/Documentation/fb/intelfb.txt 2008-04-01 21:44:26.000000000 +0200
+++ linux-2.6.25-rc8-intelfb-i965/Documentation/fb/intelfb.txt 2008-04-10 17:11:23.000000000 +0200
@@ -14,6 +14,8 @@
Intel 915GM
Intel 945G
Intel 945GM
+ Intel 965G
+ Intel 965GM

B. List of available options

diff -Nur linux-2.6.25-rc8/drivers/video/Kconfig linux-2.6.25-rc8-intelfb-i965/drivers/video/Kconfig
--- linux-2.6.25-rc8/drivers/video/Kconfig 2008-04-01 21:44:26.000000000 +0200
+++ linux-2.6.25-rc8-intelfb-i965/drivers/video/Kconfig 2008-04-10 17:12:19.000000000 +0200
@@ -1087,7 +1087,7 @@
This driver supports the LE80578 (Carillo Ranch) board

config FB_INTEL
- tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G support (EXPERIMENTAL)"
+ tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
depends on FB && EXPERIMENTAL && PCI && X86
select AGP
select AGP_INTEL
@@ -1097,7 +1097,7 @@
select FB_CFB_IMAGEBLIT
help
This driver supports the on-board graphics built in to the Intel
- 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM chipsets.
+ 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets.
Say Y if you have and plan to use such a board.

If you say Y here and want DDC/I2C support you must first say Y to
diff -Nur linux-2.6.25-rc8/drivers/video/intelfb/intelfb.h linux-2.6.25-rc8-intelfb-i965/drivers/video/intelfb/intelfb.h
--- linux-2.6.25-rc8/drivers/video/intelfb/intelfb.h 2008-04-01 21:44:26.000000000 +0200
+++ linux-2.6.25-rc8-intelfb-i965/drivers/video/intelfb/intelfb.h 2008-04-10 17:10:53.000000000 +0200
@@ -12,9 +12,9 @@
#endif

/*** Version/name ***/
-#define INTELFB_VERSION "0.9.4"
+#define INTELFB_VERSION "0.9.5"
#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/915GM/945G/945GM/965G/965GM"

/*** Debug/feature defines ***/
@@ -58,6 +58,8 @@
#define PCI_DEVICE_ID_INTEL_915GM 0x2592
#define PCI_DEVICE_ID_INTEL_945G 0x2772
#define PCI_DEVICE_ID_INTEL_945GM 0x27A2
+#define PCI_DEVICE_ID_INTEL_965G 0x29A2
+#define PCI_DEVICE_ID_INTEL_965GM 0x2A02

/* Size of MMIO region */
#define INTEL_REG_SIZE 0x80000
@@ -158,6 +160,8 @@
INTEL_915GM,
INTEL_945G,
INTEL_945GM,
+ INTEL_965G,
+ INTEL_965GM,
};

struct intelfb_hwstate {
@@ -358,7 +362,9 @@
#define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G) || \
((dinfo)->chipset == INTEL_915GM) || \
((dinfo)->chipset == INTEL_945G) || \
- ((dinfo)->chipset==INTEL_945GM))
+ ((dinfo)->chipset == INTEL_945GM) || \
+ ((dinfo)->chipset == INTEL_965G) || \
+ ((dinfo)->chipset == INTEL_965GM))

#ifndef FBIO_WAITFORVSYNC
#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
diff -Nur linux-2.6.25-rc8/drivers/video/intelfb/intelfb_i2c.c linux-2.6.25-rc8-intelfb-i965/drivers/video/intelfb/intelfb_i2c.c
--- linux-2.6.25-rc8/drivers/video/intelfb/intelfb_i2c.c 2008-04-01 21:44:26.000000000 +0200
+++ linux-2.6.25-rc8-intelfb-i965/drivers/video/intelfb/intelfb_i2c.c 2008-04-10 17:10:53.000000000 +0200
@@ -169,6 +169,8 @@
/* has some LVDS + tv-out */
case INTEL_945G:
case INTEL_945GM:
+ case INTEL_965G:
+ case INTEL_965GM:
/* SDVO ports have a single control bus - 2 devices */
dinfo->output[i].type = INTELFB_OUTPUT_SDVO;
intelfb_setup_i2c_bus(dinfo, &dinfo->output[i].i2c_bus,
diff -Nur linux-2.6.25-rc8/drivers/video/intelfb/intelfbdrv.c linux-2.6.25-rc8-intelfb-i965/drivers/video/intelfb/intelfbdrv.c
--- linux-2.6.25-rc8/drivers/video/intelfb/intelfbdrv.c 2008-04-01 21:44:26.000000000 +0200
+++ linux-2.6.25-rc8-intelfb-i965/drivers/video/intelfb/intelfbdrv.c 2008-04-10 17:10:53.000000000 +0200
@@ -2,7 +2,7 @@
* intelfb
*
* Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/
- * 945G/945GM integrated graphics chips.
+ * 945G/945GM/965G/965GM integrated graphics chips.
*
* Copyright Â© 2002, 2003 David Dawes <dawes@xxxxxxxxxxx>
* 2004 Sylvain Meyer
@@ -99,6 +99,9 @@
* Add vram option to reserve more memory than stolen by BIOS
* Fix intelfbhw_pan_display typo
* Add __initdata annotations
+ *
+ * 04/2008 - Version 0.9.5
+ * Add support for 965G/965GM. (Maik Broemme <mbroemme@xxxxxxxxxxxxx>)
*/

#include <linux/module.h>
@@ -180,6 +183,8 @@
{ 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 },
+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_965G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_965G },
+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_965GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_965GM },
{ 0, }
};

@@ -549,7 +554,10 @@
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_945GM)) {
+ (ent->device == PCI_DEVICE_ID_INTEL_945GM) ||
+ (ent->device == PCI_DEVICE_ID_INTEL_965G) ||
+ (ent->device == PCI_DEVICE_ID_INTEL_965GM)) {
+
aperture_bar = 2;
mmio_bar = 0;
}
diff -Nur linux-2.6.25-rc8/drivers/video/intelfb/intelfbhw.c linux-2.6.25-rc8-intelfb-i965/drivers/video/intelfb/intelfbhw.c
--- linux-2.6.25-rc8/drivers/video/intelfb/intelfbhw.c 2008-04-01 21:44:26.000000000 +0200
+++ linux-2.6.25-rc8-intelfb-i965/drivers/video/intelfb/intelfbhw.c 2008-04-10 17:10:53.000000000 +0200
@@ -143,6 +143,18 @@
dinfo->mobile = 1;
dinfo->pll_index = PLLS_I9xx;
return 0;
+ case PCI_DEVICE_ID_INTEL_965G:
+ dinfo->name = "Intel(R) 965G";
+ dinfo->chipset = INTEL_965G;
+ dinfo->mobile = 0;
+ dinfo->pll_index = PLLS_I9xx;
+ return 0;
+ case PCI_DEVICE_ID_INTEL_965GM:
+ dinfo->name = "Intel(R) 965GM";
+ dinfo->chipset = INTEL_965GM;
+ dinfo->mobile = 1;
+ dinfo->pll_index = PLLS_I9xx;
+ return 0;
default:
return 1;
}
@@ -174,7 +186,9 @@
case PCI_DEVICE_ID_INTEL_915GM:
case PCI_DEVICE_ID_INTEL_945G:
case PCI_DEVICE_ID_INTEL_945GM:
- /* 915 and 945 chipsets support a 256MB aperture.
+ case PCI_DEVICE_ID_INTEL_965G:
+ case PCI_DEVICE_ID_INTEL_965GM:
+ /* 915, 945 and 965 chipsets support a 256MB aperture.
Aperture size is determined by inspected the
base address of the aperture. */
if (pci_resource_start(pdev, 2) & 0x08000000)

Next message: Peter Zijlstra: "Re: [RFC][-mm] [1/2] Simple stats for cpu resource controller"
Previous message: Steven Rostedt: "Re: [PATCH] pop previous section in alternative.c"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]