diff options
| author | Jon Smirl <jonsmirl@yahoo.com> | 2004-08-15 15:35:14 +0000 |
|---|---|---|
| committer | Jon Smirl <jonsmirl@yahoo.com> | 2004-08-15 15:35:14 +0000 |
| commit | 23bbff24aa427d6d0c16707dbe99c28ba2075894 (patch) | |
| tree | 85a192d3c208bad407b48ce26a34f29ba1af859f | |
| parent | 740ddb9c5d5506bc921d10742cf41b5aa143f84e (diff) | |
Add dev to DRIVER_CTX_DTOR( dev, pos->handle) so that sis driver will
compile #if 0 get_pci_driver use in hotplug function until fbdev work
around is written
| -rw-r--r-- | linux-core/drm_drv.c | 2 | ||||
| -rw-r--r-- | linux-core/drm_stub.c | 3 | ||||
| -rw-r--r-- | linux/drm_drv.h | 2 | ||||
| -rw-r--r-- | linux/drm_stub.h | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index 94fbca8e..b841427d 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -976,7 +976,7 @@ int DRM(release)( struct inode *inode, struct file *filp ) if ( pos->tag == priv && pos->handle != DRM_KERNEL_CONTEXT ) { #ifdef DRIVER_CTX_DTOR - DRIVER_CTX_DTOR(pos->handle); + DRIVER_CTX_DTOR( dev, pos->handle); #endif #if __HAVE_CTX_BITMAP DRM(ctxbitmap_free)( dev, pos->handle ); diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c index e993c99e..a5577879 100644 --- a/linux-core/drm_stub.c +++ b/linux-core/drm_stub.c @@ -129,7 +129,7 @@ static int drm_hotplug (struct class_device *dev, char **envp, int num_envp, return -ENOMEM; ++length; scratch += length; - +#if 0 ddev = pci_get_drvdata(pdev); if (ddev) { envp[i++] = scratch; @@ -138,6 +138,7 @@ static int drm_hotplug (struct class_device *dev, char **envp, int num_envp, if ((buffer_size - length <= 0) || (i >= num_envp)) return -ENOMEM; } +#endif envp[i] = 0; return 0; diff --git a/linux/drm_drv.h b/linux/drm_drv.h index 94fbca8e..b841427d 100644 --- a/linux/drm_drv.h +++ b/linux/drm_drv.h @@ -976,7 +976,7 @@ int DRM(release)( struct inode *inode, struct file *filp ) if ( pos->tag == priv && pos->handle != DRM_KERNEL_CONTEXT ) { #ifdef DRIVER_CTX_DTOR - DRIVER_CTX_DTOR(pos->handle); + DRIVER_CTX_DTOR( dev, pos->handle); #endif #if __HAVE_CTX_BITMAP DRM(ctxbitmap_free)( dev, pos->handle ); diff --git a/linux/drm_stub.h b/linux/drm_stub.h index e993c99e..a5577879 100644 --- a/linux/drm_stub.h +++ b/linux/drm_stub.h @@ -129,7 +129,7 @@ static int drm_hotplug (struct class_device *dev, char **envp, int num_envp, return -ENOMEM; ++length; scratch += length; - +#if 0 ddev = pci_get_drvdata(pdev); if (ddev) { envp[i++] = scratch; @@ -138,6 +138,7 @@ static int drm_hotplug (struct class_device *dev, char **envp, int num_envp, if ((buffer_size - length <= 0) || (i >= num_envp)) return -ENOMEM; } +#endif envp[i] = 0; return 0; |