diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-11 05:34:35 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-12-17 20:20:04 -0500 |
commit | d9906753bb997d651beaba0e4026a873bd0e8340 (patch) | |
tree | 08cfef0a3d712dc1354ce90cd489d33283d9cdcf /include/drm | |
parent | 8da79ccd1aaa2efe482b2c555c4684c7b503864a (diff) |
drm: rip out drm_core_has_AGP
Most place actually want to just check for dev->agp (most do, but a
few don't so this fixes a few potential NULL derefs). The only
exception is the agp init code which should check for the AGP driver
feature flag.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_agpsupport.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/drm/drm_agpsupport.h b/include/drm/drm_agpsupport.h index a184eeee9c96..a12b0e011e44 100644 --- a/include/drm/drm_agpsupport.h +++ b/include/drm/drm_agpsupport.h | |||
@@ -46,12 +46,6 @@ int drm_agp_unbind_ioctl(struct drm_device *dev, void *data, | |||
46 | int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request); | 46 | int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request); |
47 | int drm_agp_bind_ioctl(struct drm_device *dev, void *data, | 47 | int drm_agp_bind_ioctl(struct drm_device *dev, void *data, |
48 | struct drm_file *file_priv); | 48 | struct drm_file *file_priv); |
49 | |||
50 | static inline int drm_core_has_AGP(struct drm_device *dev) | ||
51 | { | ||
52 | return drm_core_check_feature(dev, DRIVER_USE_AGP); | ||
53 | } | ||
54 | |||
55 | #else /* __OS_HAS_AGP */ | 49 | #else /* __OS_HAS_AGP */ |
56 | 50 | ||
57 | static inline void drm_free_agp(DRM_AGP_MEM * handle, int pages) | 51 | static inline void drm_free_agp(DRM_AGP_MEM * handle, int pages) |
@@ -183,12 +177,6 @@ static inline int drm_agp_bind_ioctl(struct drm_device *dev, void *data, | |||
183 | { | 177 | { |
184 | return -ENODEV; | 178 | return -ENODEV; |
185 | } | 179 | } |
186 | |||
187 | static inline int drm_core_has_AGP(struct drm_device *dev) | ||
188 | { | ||
189 | return 0; | ||
190 | } | ||
191 | |||
192 | #endif /* __OS_HAS_AGP */ | 180 | #endif /* __OS_HAS_AGP */ |
193 | 181 | ||
194 | #endif /* _DRM_AGPSUPPORT_H_ */ | 182 | #endif /* _DRM_AGPSUPPORT_H_ */ |