summaryrefslogtreecommitdiffstats
path: root/include/drm/drm_agpsupport.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-11 11:34:40 +0100
committerDave Airlie <airlied@redhat.com>2013-12-18 11:32:55 +1000
commitd2e546b855646f251046098ddaccef50bf3d4302 (patch)
tree2fbb465e003fe0fbcc2283d69ce5e747c6a13329 /include/drm/drm_agpsupport.h
parent8a5a80081a1cc8b4f7bdf777fde3d955a020481c (diff)
downloadlinux-stable-d2e546b855646f251046098ddaccef50bf3d4302.tar.gz
linux-stable-d2e546b855646f251046098ddaccef50bf3d4302.tar.bz2
linux-stable-d2e546b855646f251046098ddaccef50bf3d4302.zip
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 'include/drm/drm_agpsupport.h')
-rw-r--r--include/drm/drm_agpsupport.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/drm/drm_agpsupport.h b/include/drm/drm_agpsupport.h
index 56a861b2ceaa..86a02188074b 100644
--- a/include/drm/drm_agpsupport.h
+++ b/include/drm/drm_agpsupport.h
@@ -10,10 +10,10 @@
#if __OS_HAS_AGP
-void drm_free_agp(DRM_AGP_MEM * handle, int pages);
-int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
-int drm_unbind_agp(DRM_AGP_MEM * handle);
-DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
+void drm_free_agp(struct agp_memory * handle, int pages);
+int drm_bind_agp(struct agp_memory * handle, unsigned int start);
+int drm_unbind_agp(struct agp_memory * handle);
+struct agp_memory *drm_agp_bind_pages(struct drm_device *dev,
struct page **pages,
unsigned long num_pages,
uint32_t gtt_offset,
@@ -47,21 +47,21 @@ int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
#else /* __OS_HAS_AGP */
-static inline void drm_free_agp(DRM_AGP_MEM * handle, int pages)
+static inline void drm_free_agp(struct agp_memory * handle, int pages)
{
}
-static inline int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start)
+static inline int drm_bind_agp(struct agp_memory * handle, unsigned int start)
{
return -ENODEV;
}
-static inline int drm_unbind_agp(DRM_AGP_MEM * handle)
+static inline int drm_unbind_agp(struct agp_memory * handle)
{
return -ENODEV;
}
-static inline DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
+static inline struct agp_memory *drm_agp_bind_pages(struct drm_device *dev,
struct page **pages,
unsigned long num_pages,
uint32_t gtt_offset,