mirror of
				https://github.com/torvalds/linux.git
				synced 2025-10-31 16:48:26 +02:00 
			
		
		
		
	drm: Give drm_agp_clear drm_legacy_ prefix
It has a DRIVER_MODESET check to sure make it's not creating havoc for drm drivers. Make that clear in the name too. v2: Move misplaced hunk, spotted by 0day and Thierry. Cc: Thierry Reding <thierry.reding@gmail.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461691808-12414-2-git-send-email-daniel.vetter@ffwll.ch
This commit is contained in:
		
							parent
							
								
									4eb9b945c6
								
							
						
					
					
						commit
						366884b17f
					
				
					 4 changed files with 6 additions and 6 deletions
				
			
		|  | @ -423,7 +423,7 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev) | |||
| } | ||||
| 
 | ||||
| /**
 | ||||
|  * drm_agp_clear - Clear AGP resource list | ||||
|  * drm_legacy_agp_clear - Clear AGP resource list | ||||
|  * @dev: DRM device | ||||
|  * | ||||
|  * Iterate over all AGP resources and remove them. But keep the AGP head | ||||
|  | @ -434,7 +434,7 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev) | |||
|  * resources from getting destroyed. Drivers are responsible of cleaning them up | ||||
|  * during device shutdown. | ||||
|  */ | ||||
| void drm_agp_clear(struct drm_device *dev) | ||||
| void drm_legacy_agp_clear(struct drm_device *dev) | ||||
| { | ||||
| 	struct drm_agp_mem *entry, *tempe; | ||||
| 
 | ||||
|  |  | |||
|  | @ -413,7 +413,7 @@ int drm_lastclose(struct drm_device * dev) | |||
| 
 | ||||
| 	mutex_lock(&dev->struct_mutex); | ||||
| 
 | ||||
| 	drm_agp_clear(dev); | ||||
| 	drm_legacy_agp_clear(dev); | ||||
| 
 | ||||
| 	drm_legacy_sg_cleanup(dev); | ||||
| 	drm_legacy_vma_flush(dev); | ||||
|  |  | |||
|  | @ -250,7 +250,7 @@ void drm_pci_agp_destroy(struct drm_device *dev) | |||
| { | ||||
| 	if (dev->agp) { | ||||
| 		arch_phys_wc_del(dev->agp->agp_mtrr); | ||||
| 		drm_agp_clear(dev); | ||||
| 		drm_legacy_agp_clear(dev); | ||||
| 		kfree(dev->agp); | ||||
| 		dev->agp = NULL; | ||||
| 	} | ||||
|  |  | |||
|  | @ -37,7 +37,7 @@ struct agp_memory *drm_agp_bind_pages(struct drm_device *dev, | |||
| 				uint32_t type); | ||||
| 
 | ||||
| struct drm_agp_head *drm_agp_init(struct drm_device *dev); | ||||
| void drm_agp_clear(struct drm_device *dev); | ||||
| void drm_legacy_agp_clear(struct drm_device *dev); | ||||
| int drm_agp_acquire(struct drm_device *dev); | ||||
| int drm_agp_acquire_ioctl(struct drm_device *dev, void *data, | ||||
| 			  struct drm_file *file_priv); | ||||
|  | @ -93,7 +93,7 @@ static inline struct drm_agp_head *drm_agp_init(struct drm_device *dev) | |||
| 	return NULL; | ||||
| } | ||||
| 
 | ||||
| static inline void drm_agp_clear(struct drm_device *dev) | ||||
| static inline void drm_legacy_agp_clear(struct drm_device *dev) | ||||
| { | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 Daniel Vetter
						Daniel Vetter