Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+6 -6
+2 -2
drivers/gpu/drm/drm_agpsupport.c
··· 423 423 } 424 424 425 425 /** 426 - * drm_agp_clear - Clear AGP resource list 426 + * drm_legacy_agp_clear - Clear AGP resource list 427 427 * @dev: DRM device 428 428 * 429 429 * Iterate over all AGP resources and remove them. But keep the AGP head ··· 434 434 * resources from getting destroyed. Drivers are responsible of cleaning them up 435 435 * during device shutdown. 436 436 */ 437 - void drm_agp_clear(struct drm_device *dev) 437 + void drm_legacy_agp_clear(struct drm_device *dev) 438 438 { 439 439 struct drm_agp_mem *entry, *tempe; 440 440
+1 -1
drivers/gpu/drm/drm_fops.c
··· 413 413 414 414 mutex_lock(&dev->struct_mutex); 415 415 416 - drm_agp_clear(dev); 416 + drm_legacy_agp_clear(dev); 417 417 418 418 drm_legacy_sg_cleanup(dev); 419 419 drm_legacy_vma_flush(dev);
+1 -1
drivers/gpu/drm/drm_pci.c
··· 250 250 { 251 251 if (dev->agp) { 252 252 arch_phys_wc_del(dev->agp->agp_mtrr); 253 - drm_agp_clear(dev); 253 + drm_legacy_agp_clear(dev); 254 254 kfree(dev->agp); 255 255 dev->agp = NULL; 256 256 }
+2 -2
include/drm/drm_agpsupport.h
··· 37 37 uint32_t type); 38 38 39 39 struct drm_agp_head *drm_agp_init(struct drm_device *dev); 40 - void drm_agp_clear(struct drm_device *dev); 40 + void drm_legacy_agp_clear(struct drm_device *dev); 41 41 int drm_agp_acquire(struct drm_device *dev); 42 42 int drm_agp_acquire_ioctl(struct drm_device *dev, void *data, 43 43 struct drm_file *file_priv); ··· 93 93 return NULL; 94 94 } 95 95 96 - static inline void drm_agp_clear(struct drm_device *dev) 96 + static inline void drm_legacy_agp_clear(struct drm_device *dev) 97 97 { 98 98 } 99 99