fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-25 00:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add i915GM support Add resume functionality (must be used with later DDX)

Browse source 
Bump to 1.2
This commit is contained in:
Alan Hourihane 2005-01-06 17:51:32 +00:00
parent c6c7496ca0
commit fcece3cf34
6 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
shared-core/drm_pciids.txt
View file

@ -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"

4
shared-core/i915_dma.c
View file

@ -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;

10
shared-core/i915_drv.h
View file

@ -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;

1
shared/drm_pciids.txt
View file

@ -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"

10
shared/i915.h
View file

@ -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

4
shared/i915_dma.c
View file

@ -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;