[FIX] Re: i915_dma.c

[Kevin DeKorte]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Bachman Kharazmi wrote:
> Just cheked out according to the instructions at the webpage,
> http://intellinuxgraphics.org/download.html
> 
> Compile in drm/linux-core fails, please see paste below.
> Anything missing at line 1352? :/
> 
> thanks /Bachman

> /usr/src/intel/drm/linux-core/i915_dma.c: In function âi915_driver_loadâ:
> /usr/src/intel/drm/linux-core/i915_dma.c:1352: error: expected â,â or
> â;â before â)â token
> make[2]: *** [/usr/src/intel/drm/linux-core/i915_dma.o] Error 1
> make[1]: *** [_module_/usr/src/intel/drm/linux-core] Error 2
> make[1]: Leaving directory `/usr/src/linux-2.6.23'
> make: *** [modules] Error 2
> 
> 
> 1348 int i915_driver_load(struct drm_device *dev, unsigned long flags)
> 1349 {
> 1350         struct drm_i915_private *dev_priv = dev->dev_private;
> 1351         unsigned long base, size;
> 1352         int ret = 0, mmio_bar = IS_I9XX(dev) ? 0 : 1;
> 1353
> 1354         /* i915 has 4 more counters */
> 1355         dev->counters += 4;
> 1356         dev->types[6] = _DRM_STAT_IRQ;
> 1357         dev->types[7] = _DRM_STAT_PRIMARY;
> 1358         dev->types[8] = _DRM_STAT_SECONDARY;
> 1359         dev->types[9] = _DRM_STAT_DMA;


Bachman,

Here is the patch for drm, there is an extra parenthesis


diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 8260529..083b346 100644
- --- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -1194,7 +1194,7 @@ extern int i915_wait_ring(struct drm_device * dev,
int n,
 #define IS_I855(dev) ((dev)->pci_device == 0x3582)
 #define IS_I865G(dev) ((dev)->pci_device == 0x2572)

- -#define IS_I915G(dev) ((dev)->pci_device == 0x2582) ||
(dev)->pci_device == 0x2
+#define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device
== 0x25
 #define IS_I915GM(dev) ((dev)->pci_device == 0x2592)
 #define IS_I945G(dev) ((dev)->pci_device == 0x2772)

Kevin

- --
Get my public GnuPG key from
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x7D0BD5D1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iD8DBQFHl0ii6w2kMH0L1dERAt97AJ46ghO+D4GzCmNt6ygnW7SPfm7HywCglakb
gveUcI3Xb+4IuxdQoJI33cw=
=U8iM
-----END PGP SIGNATURE-----