drm: kill agp indirection mess
There's no point in jumping through two indirections. So kill one and call the kernels agp functions directly. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
8f879194f8
commit
89c372647d
|
@ -193,7 +193,7 @@ int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
|
||||||
* \return zero on success or a negative number on failure.
|
* \return zero on success or a negative number on failure.
|
||||||
*
|
*
|
||||||
* Verifies the AGP device is present and has been acquired, allocates the
|
* Verifies the AGP device is present and has been acquired, allocates the
|
||||||
* memory via alloc_agp() and creates a drm_agp_mem entry for it.
|
* memory via agp_allocate_memory() and creates a drm_agp_mem entry for it.
|
||||||
*/
|
*/
|
||||||
int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)
|
int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)
|
||||||
{
|
{
|
||||||
|
@ -211,7 +211,7 @@ int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)
|
||||||
|
|
||||||
pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE;
|
pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE;
|
||||||
type = (u32) request->type;
|
type = (u32) request->type;
|
||||||
if (!(memory = drm_alloc_agp(dev, pages, type))) {
|
if (!(memory = agp_allocate_memory(dev->agp->bridge, pages, type))) {
|
||||||
kfree(entry);
|
kfree(entry);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
@ -423,38 +423,6 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev)
|
||||||
return head;
|
return head;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Calls agp_allocate_memory() */
|
|
||||||
DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data * bridge,
|
|
||||||
size_t pages, u32 type)
|
|
||||||
{
|
|
||||||
return agp_allocate_memory(bridge, pages, type);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Calls agp_free_memory() */
|
|
||||||
int drm_agp_free_memory(DRM_AGP_MEM * handle)
|
|
||||||
{
|
|
||||||
if (!handle)
|
|
||||||
return 0;
|
|
||||||
agp_free_memory(handle);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Calls agp_bind_memory() */
|
|
||||||
int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start)
|
|
||||||
{
|
|
||||||
if (!handle)
|
|
||||||
return -EINVAL;
|
|
||||||
return agp_bind_memory(handle, start);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Calls agp_unbind_memory() */
|
|
||||||
int drm_agp_unbind_memory(DRM_AGP_MEM * handle)
|
|
||||||
{
|
|
||||||
if (!handle)
|
|
||||||
return -EINVAL;
|
|
||||||
return agp_unbind_memory(handle);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Binds a collection of pages into AGP memory at the given offset, returning
|
* Binds a collection of pages into AGP memory at the given offset, returning
|
||||||
* the AGP memory structure containing them.
|
* the AGP memory structure containing them.
|
||||||
|
@ -474,7 +442,7 @@ drm_agp_bind_pages(struct drm_device *dev,
|
||||||
|
|
||||||
DRM_DEBUG("\n");
|
DRM_DEBUG("\n");
|
||||||
|
|
||||||
mem = drm_agp_allocate_memory(dev->agp->bridge, num_pages,
|
mem = agp_allocate_memory(dev->agp->bridge, num_pages,
|
||||||
type);
|
type);
|
||||||
if (mem == NULL) {
|
if (mem == NULL) {
|
||||||
DRM_ERROR("Failed to allocate memory for %ld pages\n",
|
DRM_ERROR("Failed to allocate memory for %ld pages\n",
|
||||||
|
@ -487,7 +455,7 @@ drm_agp_bind_pages(struct drm_device *dev,
|
||||||
mem->page_count = num_pages;
|
mem->page_count = num_pages;
|
||||||
|
|
||||||
mem->is_flushed = true;
|
mem->is_flushed = true;
|
||||||
ret = drm_agp_bind_memory(mem, gtt_offset / PAGE_SIZE);
|
ret = agp_bind_memory(mem, gtt_offset / PAGE_SIZE);
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
DRM_ERROR("Failed to bind AGP memory: %d\n", ret);
|
DRM_ERROR("Failed to bind AGP memory: %d\n", ret);
|
||||||
agp_free_memory(mem);
|
agp_free_memory(mem);
|
||||||
|
|
|
@ -99,29 +99,23 @@ static void *agp_remap(unsigned long offset, unsigned long size,
|
||||||
return addr;
|
return addr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Wrapper around agp_allocate_memory() */
|
|
||||||
DRM_AGP_MEM *drm_alloc_agp(struct drm_device * dev, int pages, u32 type)
|
|
||||||
{
|
|
||||||
return drm_agp_allocate_memory(dev->agp->bridge, pages, type);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Wrapper around agp_free_memory() */
|
/** Wrapper around agp_free_memory() */
|
||||||
void drm_free_agp(DRM_AGP_MEM * handle, int pages)
|
void drm_free_agp(DRM_AGP_MEM * handle, int pages)
|
||||||
{
|
{
|
||||||
drm_agp_free_memory(handle);
|
agp_free_memory(handle);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(drm_free_agp);
|
EXPORT_SYMBOL(drm_free_agp);
|
||||||
|
|
||||||
/** Wrapper around agp_bind_memory() */
|
/** Wrapper around agp_bind_memory() */
|
||||||
int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start)
|
int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start)
|
||||||
{
|
{
|
||||||
return drm_agp_bind_memory(handle, start);
|
return agp_bind_memory(handle, start);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Wrapper around agp_unbind_memory() */
|
/** Wrapper around agp_unbind_memory() */
|
||||||
int drm_unbind_agp(DRM_AGP_MEM * handle)
|
int drm_unbind_agp(DRM_AGP_MEM * handle)
|
||||||
{
|
{
|
||||||
return drm_agp_unbind_memory(handle);
|
return agp_unbind_memory(handle);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(drm_unbind_agp);
|
EXPORT_SYMBOL(drm_unbind_agp);
|
||||||
|
|
||||||
|
|
|
@ -1171,7 +1171,6 @@ extern int drm_mem_info(char *buf, char **start, off_t offset,
|
||||||
extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);
|
extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);
|
||||||
|
|
||||||
extern void drm_free_agp(DRM_AGP_MEM * handle, int pages);
|
extern void drm_free_agp(DRM_AGP_MEM * handle, int pages);
|
||||||
extern DRM_AGP_MEM *drm_alloc_agp(struct drm_device *dev, int pages, u32 type);
|
|
||||||
extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
|
extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
|
||||||
extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
|
extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
|
||||||
struct page **pages,
|
struct page **pages,
|
||||||
|
@ -1331,10 +1330,6 @@ extern int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
|
||||||
extern int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);
|
extern int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);
|
||||||
extern int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
|
extern int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
|
||||||
struct drm_file *file_priv);
|
struct drm_file *file_priv);
|
||||||
extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size_t pages, u32 type);
|
|
||||||
extern int drm_agp_free_memory(DRM_AGP_MEM * handle);
|
|
||||||
extern int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start);
|
|
||||||
extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle);
|
|
||||||
extern void drm_agp_chipset_flush(struct drm_device *dev);
|
extern void drm_agp_chipset_flush(struct drm_device *dev);
|
||||||
|
|
||||||
/* Stub support (drm_stub.h) */
|
/* Stub support (drm_stub.h) */
|
||||||
|
|
Loading…
Reference in a new issue