diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-11 05:34:40 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-12-17 20:32:55 -0500 |
commit | d2e546b855646f251046098ddaccef50bf3d4302 (patch) | |
tree | 2fbb465e003fe0fbcc2283d69ce5e747c6a13329 /drivers/gpu/drm/drm_agpsupport.c | |
parent | 8a5a80081a1cc8b4f7bdf777fde3d955a020481c (diff) |
drm: rip out DRM_AGP_MEM and DRM_AGP_KERN
The <linux/agp_backend.h> header provides dummy functions and
fallbacks, so no need for screaming macros.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_agpsupport.c')
-rw-r--r-- | drivers/gpu/drm/drm_agpsupport.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c index 74fabe6956cb..dde205cef384 100644 --- a/drivers/gpu/drm/drm_agpsupport.c +++ b/drivers/gpu/drm/drm_agpsupport.c | |||
@@ -53,7 +53,7 @@ | |||
53 | */ | 53 | */ |
54 | int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info) | 54 | int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info) |
55 | { | 55 | { |
56 | DRM_AGP_KERN *kern; | 56 | struct agp_kern_info *kern; |
57 | 57 | ||
58 | if (!dev->agp || !dev->agp->acquired) | 58 | if (!dev->agp || !dev->agp->acquired) |
59 | return -EINVAL; | 59 | return -EINVAL; |
@@ -198,7 +198,7 @@ int drm_agp_enable_ioctl(struct drm_device *dev, void *data, | |||
198 | int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request) | 198 | int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request) |
199 | { | 199 | { |
200 | struct drm_agp_mem *entry; | 200 | struct drm_agp_mem *entry; |
201 | DRM_AGP_MEM *memory; | 201 | struct agp_memory *memory; |
202 | unsigned long pages; | 202 | unsigned long pages; |
203 | u32 type; | 203 | u32 type; |
204 | 204 | ||
@@ -466,14 +466,14 @@ void drm_agp_clear(struct drm_device *dev) | |||
466 | * No reference is held on the pages during this time -- it is up to the | 466 | * No reference is held on the pages during this time -- it is up to the |
467 | * caller to handle that. | 467 | * caller to handle that. |
468 | */ | 468 | */ |
469 | DRM_AGP_MEM * | 469 | struct agp_memory * |
470 | drm_agp_bind_pages(struct drm_device *dev, | 470 | drm_agp_bind_pages(struct drm_device *dev, |
471 | struct page **pages, | 471 | struct page **pages, |
472 | unsigned long num_pages, | 472 | unsigned long num_pages, |
473 | uint32_t gtt_offset, | 473 | uint32_t gtt_offset, |
474 | u32 type) | 474 | u32 type) |
475 | { | 475 | { |
476 | DRM_AGP_MEM *mem; | 476 | struct agp_memory *mem; |
477 | int ret, i; | 477 | int ret, i; |
478 | 478 | ||
479 | DRM_DEBUG("\n"); | 479 | DRM_DEBUG("\n"); |