diff options
| -rw-r--r-- | drivers/gpu/drm/drm_file.c | 24 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_legacy.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_legacy_misc.c | 24 | 
3 files changed, 25 insertions, 24 deletions
| diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c index 9701469a6e93..263fbef73fe5 100644 --- a/drivers/gpu/drm/drm_file.c +++ b/drivers/gpu/drm/drm_file.c @@ -425,30 +425,6 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)  	return 0;  } -static void drm_legacy_dev_reinit(struct drm_device *dev) -{ -	if (dev->irq_enabled) -		drm_irq_uninstall(dev); - -	mutex_lock(&dev->struct_mutex); - -	drm_legacy_agp_clear(dev); - -	drm_legacy_sg_cleanup(dev); -	drm_legacy_vma_flush(dev); -	drm_legacy_dma_takedown(dev); - -	mutex_unlock(&dev->struct_mutex); - -	dev->sigdata.lock = NULL; - -	dev->context_flag = 0; -	dev->last_context = 0; -	dev->if_version = 0; - -	DRM_DEBUG("lastclose completed\n"); -} -  void drm_lastclose(struct drm_device * dev)  {  	DRM_DEBUG("\n"); diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h index 4f6319d2bb03..d7189aa22a48 100644 --- a/drivers/gpu/drm/drm_legacy.h +++ b/drivers/gpu/drm/drm_legacy.h @@ -138,6 +138,7 @@ int drm_legacy_sg_free(struct drm_device *dev, void *data,  void drm_legacy_init_members(struct drm_device *dev);  void drm_legacy_destroy_members(struct drm_device *dev); +void drm_legacy_dev_reinit(struct drm_device *dev);  void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *master);  #endif /* __DRM_LEGACY_H__ */ diff --git a/drivers/gpu/drm/drm_legacy_misc.c b/drivers/gpu/drm/drm_legacy_misc.c index 94973885c913..3616b1691007 100644 --- a/drivers/gpu/drm/drm_legacy_misc.c +++ b/drivers/gpu/drm/drm_legacy_misc.c @@ -50,3 +50,27 @@ void drm_legacy_destroy_members(struct drm_device *dev)  {  	mutex_destroy(&dev->ctxlist_mutex);  } + +void drm_legacy_dev_reinit(struct drm_device *dev) +{ +	if (dev->irq_enabled) +		drm_irq_uninstall(dev); + +	mutex_lock(&dev->struct_mutex); + +	drm_legacy_agp_clear(dev); + +	drm_legacy_sg_cleanup(dev); +	drm_legacy_vma_flush(dev); +	drm_legacy_dma_takedown(dev); + +	mutex_unlock(&dev->struct_mutex); + +	dev->sigdata.lock = NULL; + +	dev->context_flag = 0; +	dev->last_context = 0; +	dev->if_version = 0; + +	DRM_DEBUG("lastclose completed\n"); +} | 
