diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2005-01-06 17:51:32 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2005-01-06 17:51:32 +0000 |
| commit | fcece3cf34ed5cc7e82d324362a40b3dd5493bbe (patch) | |
| tree | 82d3690128574e1a0ac43068d658e90c685dcb2d | |
| parent | c6c7496ca090dd56599de5bb1398f69762569d5e (diff) | |
Add i915GM support Add resume functionality (must be used with later DDX)
Bump to 1.2
| -rw-r--r-- | shared-core/drm_pciids.txt | 1 | ||||
| -rw-r--r-- | shared-core/i915_dma.c | 4 | ||||
| -rw-r--r-- | shared-core/i915_drv.h | 10 | ||||
| -rw-r--r-- | shared/drm_pciids.txt | 1 | ||||
| -rw-r--r-- | shared/i915.h | 10 | ||||
| -rw-r--r-- | shared/i915_dma.c | 4 |
6 files changed, 12 insertions, 18 deletions
diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt index e5484c41..a72b0e44 100644 --- a/shared-core/drm_pciids.txt +++ b/shared-core/drm_pciids.txt @@ -204,4 +204,5 @@ 0x8086 0x3582 0 "Intel i852GM/i855GM GMCH" 0x8086 0x2572 0 "Intel i865G GMCH" 0x8086 0x2582 0 "Intel i915G" +0x8086 0x2982 0 "Intel i915GM" diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 8d986129..fea848f0 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -209,7 +209,7 @@ static int i915_initialize(drm_device_t * dev, return 0; } -static int i915_resume(drm_device_t * dev) +static int i915_dma_resume(drm_device_t * dev) { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -266,7 +266,7 @@ int i915_dma_init(DRM_IOCTL_ARGS) retcode = i915_dma_cleanup(dev); break; case I915_RESUME_DMA: - retcode = i915_resume(dev); + retcode = i915_dma_resume(dev); break; default: retcode = -EINVAL; diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 19f8c0ad..9e470b88 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -17,21 +17,17 @@ #define DRIVER_NAME "i915" #define DRIVER_DESC "Intel Graphics" -#define DRIVER_DATE "20040405" +#define DRIVER_DATE "20041217" /* Interface history: * * 1.1: Original. + * 1.2: Add Power Management */ #define DRIVER_MAJOR 1 -#define DRIVER_MINOR 1 +#define DRIVER_MINOR 2 #define DRIVER_PATCHLEVEL 0 -/* We use our own dma mechanisms, not the drm template code. However, - * the shared IRQ code is useful to us: - */ -#define __HAVE_PM 1 - typedef struct _drm_i915_ring_buffer { int tail_mask; unsigned long Start; diff --git a/shared/drm_pciids.txt b/shared/drm_pciids.txt index 8532043e..f48e6d0e 100644 --- a/shared/drm_pciids.txt +++ b/shared/drm_pciids.txt @@ -204,4 +204,5 @@ 0x8086 0x3582 0 "Intel i852GM/i855GM GMCH" 0x8086 0x2572 0 "Intel i865G GMCH" 0x8086 0x2582 0 "Intel i915G" +0x8086 0x2592 0 "Intel i915GM" diff --git a/shared/i915.h b/shared/i915.h index d76d737b..360665ae 100644 --- a/shared/i915.h +++ b/shared/i915.h @@ -21,14 +21,15 @@ #define DRIVER_NAME "i915" #define DRIVER_DESC "Intel Graphics" -#define DRIVER_DATE "20040405" +#define DRIVER_DATE "20041217" /* Interface history: * * 1.1: Original. + * 1.2: Add Power Management */ #define DRIVER_MAJOR 1 -#define DRIVER_MINOR 1 +#define DRIVER_MINOR 2 #define DRIVER_PATCHLEVEL 0 #define DRIVER_IOCTLS \ @@ -45,9 +46,4 @@ [DRM_IOCTL_NR(DRM_IOCTL_I915_INIT_HEAP)] = { i915_mem_init_heap, 1, 1 }, \ [DRM_IOCTL_NR(DRM_IOCTL_I915_CMDBUFFER)] = { i915_cmdbuffer, 1, 0 } -/* We use our own dma mechanisms, not the drm template code. However, - * the shared IRQ code is useful to us: - */ -#define __HAVE_PM 1 - #endif diff --git a/shared/i915_dma.c b/shared/i915_dma.c index 5aa287d6..14f7fd6e 100644 --- a/shared/i915_dma.c +++ b/shared/i915_dma.c @@ -207,7 +207,7 @@ static int i915_initialize(drm_device_t * dev, return 0; } -static int i915_resume(drm_device_t * dev) +static int i915_dma_resume(drm_device_t * dev) { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -264,7 +264,7 @@ int i915_dma_init(DRM_IOCTL_ARGS) retcode = i915_dma_cleanup(dev); break; case I915_RESUME_DMA: - retcode = i915_resume(dev); + retcode = i915_dma_resume(dev); break; default: retcode = -EINVAL; |