OSDN Git Service

drm: fix oops on unload.
authorDave Airlie <airlied@panoply-rh.(none)>
Tue, 11 Mar 2008 06:05:26 +0000 (16:05 +1000)
committerDave Airlie <airlied@panoply-rh.(none)>
Tue, 11 Mar 2008 06:05:26 +0000 (16:05 +1000)
if we are unloading the module, there is no master so therefore no lock

shared-core/i915_init.c

index 274322e..fa2fc3d 100644 (file)
@@ -277,7 +277,6 @@ int i915_driver_unload(struct drm_device *dev)
 
        I915_WRITE(LP_RING + RING_LEN, 0);
 
-
        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
                drm_irq_uninstall(dev);
                intel_modeset_cleanup(dev);
@@ -291,7 +290,6 @@ int i915_driver_unload(struct drm_device *dev)
        if (dev_priv->sarea_kmap.virtual) {
                drm_bo_kunmap(&dev_priv->sarea_kmap);
                dev_priv->sarea_kmap.virtual = NULL;
-               dev->primary->master->lock.hw_lock = NULL;
                dev->sigdata.lock = NULL;
        }