From: David Herrmann <dh.herrmann@gmail.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: DRI Development <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 5/8] drm: Move leftover ioctl declarations to drm_internal.h
Date: Tue, 23 Sep 2014 16:16:32 +0200 [thread overview]
Message-ID: <CANq1E4SOG3rBBJqXam4AyAg5nCL-wnwVpwLOoajK0VKS6JOBmA@mail.gmail.com> (raw)
In-Reply-To: <1411480014-10138-6-git-send-email-daniel.vetter@ffwll.ch>
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
next prev parent reply other threads:[~2014-09-23 14:16 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-23 13:46 [PATCH 0/8] More header rework Daniel Vetter
2014-09-23 13:46 ` [PATCH 1/8] drm/<ttm-based-drivers>: Don't call drm_mmap Daniel Vetter
2014-09-23 14:05 ` David Herrmann
2014-09-23 15:30 ` Christian König
2014-09-23 21:38 ` Jerome Glisse
2014-09-23 21:53 ` David Herrmann
2014-09-23 21:57 ` Jerome Glisse
2014-09-23 23:42 ` Ben Skeggs
2014-09-23 13:46 ` [PATCH 2/8] drm/gem: Don't call drm_mmap from drm_gem_mmap Daniel Vetter
2014-09-23 14:06 ` David Herrmann
2014-09-23 13:46 ` [PATCH 3/8] drm: move drm_mmap to <drm/drm_legacy.h> Daniel Vetter
2014-09-23 14:12 ` David Herrmann
2014-09-23 13:46 ` [PATCH 4/8] drm: Move drm_vm_open_locked into drm_internal.h Daniel Vetter
2014-09-23 14:15 ` David Herrmann
2014-09-23 14:21 ` Daniel Vetter
2014-09-23 13:46 ` [PATCH 5/8] drm: Move leftover ioctl declarations to drm_internal.h Daniel Vetter
2014-09-23 14:16 ` David Herrmann [this message]
2014-09-23 13:46 ` [PATCH 6/8] drm: Move internal debugfs functions " Daniel Vetter
2014-09-23 14:21 ` David Herrmann
2014-09-23 13:46 ` [PATCH 7/8] drm: Extract <drm/drm_gem.h> Daniel Vetter
2014-09-23 14:22 ` David Herrmann
2014-09-23 13:46 ` [PATCH 8/8] drm/doc: Fixup drm_irq kerneldoc includes Daniel Vetter
2014-09-23 14:22 ` David Herrmann
2014-09-23 14:25 ` Daniel Vetter
2014-09-23 14:24 ` [PATCH 0/8] More header rework David Herrmann
2014-09-23 15:11 ` Alex Deucher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CANq1E4SOG3rBBJqXam4AyAg5nCL-wnwVpwLOoajK0VKS6JOBmA@mail.gmail.com \
--to=dh.herrmann@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).