Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7f0a889 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: Move leftover ioctl declarations to drm_internal.h 



Somehow I've missed these three, fix this up asap. Plus move
drm_master_create since while at it.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 884d9f05

drivers/gpu/drm/drm_internal.h

+9 −0
Original line number Diff line number Diff line
@@ -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);

include/drm/drmP.h

+0 −7
Original line number Diff line number Diff line
@@ -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);