aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2009-09-15 16:57:31 -0400
committerEric Anholt <eric@anholt.net>2009-11-05 17:47:06 -0500
commit7a9c906094de8b3dc227de448019dbc386cd25d4 (patch)
treebf7ebc3d31e27b449ec0e000bfd65eddf758fc6b
parent97f5ab6651a996ecefed73e41684422f3b29d9a8 (diff)
drm: make drm_mode_object_find typesafe
I've wasted half a day hunting a bug that could easily be spotted by gcc. Prevent this from reoccurring. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/drm_crtc.c3
-rw-r--r--include/drm/drm_crtc.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 5cae0b3eee9b..ee0cde1ecca5 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -247,7 +247,8 @@ static void drm_mode_object_put(struct drm_device *dev,
247 mutex_unlock(&dev->mode_config.idr_mutex); 247 mutex_unlock(&dev->mode_config.idr_mutex);
248} 248}
249 249
250void *drm_mode_object_find(struct drm_device *dev, uint32_t id, uint32_t type) 250struct drm_mode_object *drm_mode_object_find(struct drm_device *dev,
251 uint32_t id, uint32_t type)
251{ 252{
252 struct drm_mode_object *obj = NULL; 253 struct drm_mode_object *obj = NULL;
253 254
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index b69347b8904f..bfcc60d101db 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -711,7 +711,8 @@ extern void drm_mode_connector_detach_encoder(struct drm_connector *connector,
711 struct drm_encoder *encoder); 711 struct drm_encoder *encoder);
712extern bool drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, 712extern bool drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
713 int gamma_size); 713 int gamma_size);
714extern void *drm_mode_object_find(struct drm_device *dev, uint32_t id, uint32_t type); 714extern struct drm_mode_object *drm_mode_object_find(struct drm_device *dev,
715 uint32_t id, uint32_t type);
715/* IOCTLs */ 716/* IOCTLs */
716extern int drm_mode_getresources(struct drm_device *dev, 717extern int drm_mode_getresources(struct drm_device *dev,
717 void *data, struct drm_file *file_priv); 718 void *data, struct drm_file *file_priv);