fix modeset cleanup for LVDS and reenable it in i915.

main
Jesse Barnes 2007-04-11 07:21:24 -07:00
parent dd00aa5851
commit cc7faa4de8
2 changed files with 3 additions and 2 deletions

View File

@ -314,7 +314,8 @@ out:
static void intel_lvds_destroy(struct drm_output *output) static void intel_lvds_destroy(struct drm_output *output)
{ {
drm_output_destroy(output); if (output->driver_private)
kfree(output->driver_private);
} }
static const struct drm_output_funcs intel_lvds_output_funcs = { static const struct drm_output_funcs intel_lvds_output_funcs = {

View File

@ -179,7 +179,7 @@ int i915_driver_unload(drm_device_t *dev)
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
/* FIXME: remove framebuffer */ /* FIXME: remove framebuffer */
//intel_modeset_cleanup(dev); intel_modeset_cleanup(dev);
drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER); drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
dev->dev_private = NULL; dev->dev_private = NULL;