From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 6/8] drm: Move internal debugfs functions to drm_internal.h
Date: Tue, 23 Sep 2014 15:46:52 +0200 [thread overview]
Message-ID: <1411480014-10138-7-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1411480014-10138-1-git-send-email-daniel.vetter@ffwll.ch>
In my header cleanup I've missed the debugfs functions completely.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/drm_internal.h | 28 ++++++++++++++++++++++++++++
include/drm/drmP.h | 25 -------------------------
2 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index bc71be6f29e0..7cc0a3516871 100644
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -102,3 +102,31 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data,
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);
+
+/* drm_debugfs.c */
+#if defined(CONFIG_DEBUG_FS)
+int drm_debugfs_init(struct drm_minor *minor, int minor_id,
+ struct dentry *root);
+int drm_debugfs_cleanup(struct drm_minor *minor);
+int drm_debugfs_connector_add(struct drm_connector *connector);
+void drm_debugfs_connector_remove(struct drm_connector *connector);
+#else
+static inline int drm_debugfs_init(struct drm_minor *minor, int minor_id,
+ struct dentry *root)
+{
+ return 0;
+}
+
+static inline int drm_debugfs_cleanup(struct drm_minor *minor)
+{
+ return 0;
+}
+
+static inline int drm_debugfs_connector_add(struct drm_connector *connector)
+{
+ return 0;
+}
+static inline void drm_debugfs_connector_remove(struct drm_connector *connector)
+{
+}
+#endif
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 09dd6c77f152..9130c8bd9e09 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1037,23 +1037,12 @@ extern unsigned int drm_debug;
/* Debugfs support */
#if defined(CONFIG_DEBUG_FS)
-extern int drm_debugfs_init(struct drm_minor *minor, int minor_id,
- struct dentry *root);
extern int drm_debugfs_create_files(const struct drm_info_list *files,
int count, struct dentry *root,
struct drm_minor *minor);
extern int drm_debugfs_remove_files(const struct drm_info_list *files,
int count, struct drm_minor *minor);
-extern int drm_debugfs_cleanup(struct drm_minor *minor);
-extern int drm_debugfs_connector_add(struct drm_connector *connector);
-extern void drm_debugfs_connector_remove(struct drm_connector *connector);
#else
-static inline int drm_debugfs_init(struct drm_minor *minor, int minor_id,
- struct dentry *root)
-{
- return 0;
-}
-
static inline int drm_debugfs_create_files(const struct drm_info_list *files,
int count, struct dentry *root,
struct drm_minor *minor)
@@ -1066,20 +1055,6 @@ static inline int drm_debugfs_remove_files(const struct drm_info_list *files,
{
return 0;
}
-
-static inline int drm_debugfs_cleanup(struct drm_minor *minor)
-{
- return 0;
-}
-
-static inline int drm_debugfs_connector_add(struct drm_connector *connector)
-{
- return 0;
-}
-static inline void drm_debugfs_connector_remove(struct drm_connector *connector)
-{
-}
-
#endif
extern struct dma_buf *drm_gem_prime_export(struct drm_device *dev,
--
2.1.0
next prev parent reply other threads:[~2014-09-23 13:47 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
2014-09-23 13:46 ` Daniel Vetter [this message]
2014-09-23 14:21 ` [PATCH 6/8] drm: Move internal debugfs functions " 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=1411480014-10138-7-git-send-email-daniel.vetter@ffwll.ch \
--to=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).