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

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

drm: Move internal debugfs functions to drm_internal.h 



In my header cleanup I've missed the debugfs functions completely.

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 e7f0a889

drivers/gpu/drm/drm_internal.h

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

include/drm/drmP.h

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