Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5d499cf authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm: make drm_alloc_agp take a dev arg. 



Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 93f453f3

drivers/char/drm/drmP.h

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ extern void *drm_ioremap_nocache(unsigned long offset, unsigned long size, 
					   drm_device_t *dev);

extern void	     drm_ioremapfree(void *pt, unsigned long size, drm_device_t *dev);



extern DRM_AGP_MEM   *drm_alloc_agp(struct agp_bridge_data *bridge, int pages, u32 type);

extern DRM_AGP_MEM   *drm_alloc_agp(drm_device_t *dev, int pages, u32 type);

extern int           drm_free_agp(DRM_AGP_MEM *handle, int pages);

extern int           drm_bind_agp(DRM_AGP_MEM *handle, unsigned int start);

extern int           drm_unbind_agp(DRM_AGP_MEM *handle);

drivers/char/drm/drm_agpsupport.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ int drm_agp_alloc(struct inode *inode, struct file *filp, 
	pages = (request.size + PAGE_SIZE - 1) / PAGE_SIZE;

	type = (u32) request.type;



	if (!(memory = drm_alloc_agp(dev->agp->bridge, pages, type))) {

	if (!(memory = drm_alloc_agp(dev, pages, type))) {

		drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);

		return -ENOMEM;

	}

drivers/char/drm/drm_memory.c

+2 −2
Original line number Diff line number Diff line
@@ -142,9 +142,9 @@ void drm_free_pages(unsigned long address, int order, int area) 


#if __OS_HAS_AGP

/** Wrapper around agp_allocate_memory() */

DRM_AGP_MEM *drm_alloc_agp(struct agp_bridge_data *bridge, int pages, u32 type)

DRM_AGP_MEM *drm_alloc_agp(drm_device_t *dev, int pages, u32 type)

{

	return drm_agp_allocate_memory(bridge, pages, type);

	return drm_agp_allocate_memory(dev->agp->bridge, pages, type);

}

EXPORT_SYMBOL(drm_alloc_agp);