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

diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 94fbca8..b841427 100644 (file)
--- 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 e993c99..a557787 100644 (file)
--- 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 94fbca8..b841427 100644 (file)
--- 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 e993c99..a557787 100644 (file)
--- 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;