Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 3a59026ba111d85b1a86af0f1c4e5a8ef1242d82

Authored by Scott MacKenzie
Committed by Linus Torvalds
1 parent b8c49ef6ae
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] intelfb: extend partial support of i915G to include i915GM 

Add partial support for GMA900 within the i915GM chipset.

Signed-off-by: Scott MacKenzie <irrational@poboxes.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 3 changed files with 14 additions and 5 deletions Side-by-side Diff

drivers/video/intelfb/intelfb.h
Diff comments   View file @ 3a59026
... ... @@ -10,7 +10,7 @@
10 10 /*** Version/name ***/
11 11 #define INTELFB_VERSION "0.9.2"
12 12 #define INTELFB_MODULE_NAME "intelfb"
13   -#define SUPPORTED_CHIPSETS "830M/845G/852GM/855GM/865G/915G"
  13 +#define SUPPORTED_CHIPSETS "830M/845G/852GM/855GM/865G/915G/915GM"
14 14  
15 15  
16 16 /*** Debug/feature defines ***/
... ... @@ -47,6 +47,7 @@
47 47 #define PCI_DEVICE_ID_INTEL_85XGM 0x3582
48 48 #define PCI_DEVICE_ID_INTEL_865G 0x2572
49 49 #define PCI_DEVICE_ID_INTEL_915G 0x2582
  50 +#define PCI_DEVICE_ID_INTEL_915GM 0x2592
50 51  
51 52 /* Size of MMIO region */
52 53 #define INTEL_REG_SIZE 0x80000
... ... @@ -119,7 +120,8 @@
119 120 INTEL_855GM,
120 121 INTEL_855GME,
121 122 INTEL_865G,
122   - INTEL_915G
  123 + INTEL_915G,
  124 + INTEL_915GM
123 125 };
124 126  
125 127 struct intelfb_hwstate {
drivers/video/intelfb/intelfbdrv.c
Diff comments   View file @ 3a59026
1 1 /*
2 2 * intelfb
3 3 *
4   - * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G
  4 + * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM
5 5 * integrated graphics chips.
6 6 *
7 7 * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
... ... @@ -186,6 +186,7 @@
186 186 { 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 },
187 187 { 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 },
188 188 { 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 },
  189 + { 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 },
189 190 { 0, }
190 191 };
191 192  
192 193  
... ... @@ -549,10 +550,11 @@
549 550 }
550 551  
551 552 /* Set base addresses. */
552   - if (ent->device == PCI_DEVICE_ID_INTEL_915G) {
  553 + if ((ent->device == PCI_DEVICE_ID_INTEL_915G) ||
  554 + (ent->device == PCI_DEVICE_ID_INTEL_915GM)) {
553 555 aperture_bar = 2;
554 556 mmio_bar = 0;
555   - /* Disable HW cursor on 915G (not implemented yet) */
  557 + /* Disable HW cursor on 915G/M (not implemented yet) */
556 558 hwcursor = 0;
557 559 }
558 560 dinfo->aperture.physical = pci_resource_start(pdev, aperture_bar);
drivers/video/intelfb/intelfbhw.c
Diff comments   View file @ 3a59026
... ... @@ -99,6 +99,11 @@
99 99 *chipset = INTEL_915G;
100 100 *mobile = 0;
101 101 return 0;
  102 + case PCI_DEVICE_ID_INTEL_915GM:
  103 + *name = "Intel(R) 915GM";
  104 + *chipset = INTEL_915GM;
  105 + *mobile = 1;
  106 + return 0;
102 107 default:
103 108 return 1;
104 109 }