Hi
On Tue, Sep 23, 2014 at 3:46 PM, Daniel Vetter daniel.vetter@ffwll.ch wrote:
Somehow I've missed these three, fix this up asap. Plus move drm_master_create since while at it.
s/since//
Reviewed-by: David Herrmann dh.herrmann@gmail.com
Thanks David
Signed-off-by: Daniel Vetter daniel.vetter@ffwll.ch
drivers/gpu/drm/drm_internal.h | 9 +++++++++ include/drm/drmP.h | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 05624561118a..bc71be6f29e0 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -62,6 +62,8 @@ int drm_gem_name_info(struct seq_file *m, void *data); /* drm_irq.c */ int drm_control(struct drm_device *dev, void *data, struct drm_file *file_priv); +int drm_modeset_ctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);/* drm_auth.c */ int drm_getmagic(struct drm_device *dev, void *data, @@ -93,3 +95,10 @@ int drm_gem_open_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); void drm_gem_open(struct drm_device *dev, struct drm_file *file_private); void drm_gem_release(struct drm_device *dev, struct drm_file *file_private);
+/* drm_drv.c */ +int drm_setmaster_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);+int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);+struct drm_master *drm_master_create(struct drm_minor *minor); diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 9f1abd51ded2..09dd6c77f152 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1026,15 +1026,8 @@ static inline wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc /* Modesetting support */ extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc); extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc); -extern int drm_modeset_ctl(struct drm_device *dev, void *data,
struct drm_file *file_priv); /* Stub support (drm_stub.h) */-extern int drm_setmaster_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);-extern int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);-struct drm_master *drm_master_create(struct drm_minor *minor); extern struct drm_master *drm_master_get(struct drm_master *master); extern void drm_master_put(struct drm_master **master);
-- 2.1.0
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel