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

Commit edcd60ce authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: move debugfs code to it's own file 



Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 824815c4

drivers/gpu/drm/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ msm-y := \ 
	mdp/mdp5/mdp5_plane.o \

	mdp/mdp5/mdp5_smp.o \

	msm_atomic.o \

	msm_debugfs.o \

	msm_drv.o \

	msm_fb.o \

	msm_gem.o \

drivers/gpu/drm/msm/msm_debugfs.c

0 → 100644
+168 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013-2016 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#ifdef CONFIG_DEBUG_FS

#include "msm_drv.h"

#include "msm_gpu.h"



static int msm_gpu_show(struct drm_device *dev, struct seq_file *m)

{

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_gpu *gpu = priv->gpu;



	if (gpu) {

		seq_printf(m, "%s Status:\n", gpu->name);

		gpu->funcs->show(gpu, m);

	}



	return 0;

}



static int msm_gem_show(struct drm_device *dev, struct seq_file *m)

{

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_gpu *gpu = priv->gpu;



	if (gpu) {

		seq_printf(m, "Active Objects (%s):\n", gpu->name);

		msm_gem_describe_objects(&gpu->active_list, m);

	}



	seq_printf(m, "Inactive Objects:\n");

	msm_gem_describe_objects(&priv->inactive_list, m);



	return 0;

}



static int msm_mm_show(struct drm_device *dev, struct seq_file *m)

{

	return drm_mm_dump_table(m, &dev->vma_offset_manager->vm_addr_space_mm);

}



static int msm_fb_show(struct drm_device *dev, struct seq_file *m)

{

	struct msm_drm_private *priv = dev->dev_private;

	struct drm_framebuffer *fb, *fbdev_fb = NULL;



	if (priv->fbdev) {

		seq_printf(m, "fbcon ");

		fbdev_fb = priv->fbdev->fb;

		msm_framebuffer_describe(fbdev_fb, m);

	}



	mutex_lock(&dev->mode_config.fb_lock);

	list_for_each_entry(fb, &dev->mode_config.fb_list, head) {

		if (fb == fbdev_fb)

			continue;



		seq_printf(m, "user ");

		msm_framebuffer_describe(fb, m);

	}

	mutex_unlock(&dev->mode_config.fb_lock);



	return 0;

}



static int show_locked(struct seq_file *m, void *arg)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	int (*show)(struct drm_device *dev, struct seq_file *m) =

			node->info_ent->data;

	int ret;



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	ret = show(dev, m);



	mutex_unlock(&dev->struct_mutex);



	return ret;

}



static struct drm_info_list msm_debugfs_list[] = {

		{"gpu", show_locked, 0, msm_gpu_show},

		{"gem", show_locked, 0, msm_gem_show},

		{ "mm", show_locked, 0, msm_mm_show },

		{ "fb", show_locked, 0, msm_fb_show },

};



static int late_init_minor(struct drm_minor *minor)

{

	int ret;



	if (!minor)

		return 0;



	ret = msm_rd_debugfs_init(minor);

	if (ret) {

		dev_err(minor->dev->dev, "could not install rd debugfs\n");

		return ret;

	}



	ret = msm_perf_debugfs_init(minor);

	if (ret) {

		dev_err(minor->dev->dev, "could not install perf debugfs\n");

		return ret;

	}



	return 0;

}



int msm_debugfs_late_init(struct drm_device *dev)

{

	int ret;

	ret = late_init_minor(dev->primary);

	if (ret)

		return ret;

	ret = late_init_minor(dev->render);

	if (ret)

		return ret;

	ret = late_init_minor(dev->control);

	return ret;

}



int msm_debugfs_init(struct drm_minor *minor)

{

	struct drm_device *dev = minor->dev;

	int ret;



	ret = drm_debugfs_create_files(msm_debugfs_list,

			ARRAY_SIZE(msm_debugfs_list),

			minor->debugfs_root, minor);



	if (ret) {

		dev_err(dev->dev, "could not install msm_debugfs_list\n");

		return ret;

	}



	return 0;

}



void msm_debugfs_cleanup(struct drm_minor *minor)

{

	drm_debugfs_remove_files(msm_debugfs_list,

			ARRAY_SIZE(msm_debugfs_list), minor);

	if (!minor->dev->dev_private)

		return;

	msm_rd_debugfs_cleanup(minor);

	msm_perf_debugfs_cleanup(minor);

}

#endif

drivers/gpu/drm/msm/msm_debugfs.h

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#ifndef __MSM_DEBUGFS_H__

#define __MSM_DEBUGFS_H__



#ifdef CONFIG_DEBUG_FS

int msm_debugfs_init(struct drm_minor *minor);

void msm_debugfs_cleanup(struct drm_minor *minor);

#endif



#endif /* __MSM_DEBUGFS_H__ */

drivers/gpu/drm/msm/msm_drv.c

+1 −152
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */



#include "msm_drv.h"

#include "msm_debugfs.h"

#include "msm_gpu.h"

#include "msm_kms.h"
@@ -535,158 +536,6 @@ static void msm_disable_vblank(struct drm_device *dev, unsigned int pipe) 
	vblank_ctrl_queue_work(priv, pipe, false);

}



/*

 * DRM debugfs:

 */



#ifdef CONFIG_DEBUG_FS

static int msm_gpu_show(struct drm_device *dev, struct seq_file *m)

{

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_gpu *gpu = priv->gpu;



	if (gpu) {

		seq_printf(m, "%s Status:\n", gpu->name);

		gpu->funcs->show(gpu, m);

	}



	return 0;

}



static int msm_gem_show(struct drm_device *dev, struct seq_file *m)

{

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_gpu *gpu = priv->gpu;



	if (gpu) {

		seq_printf(m, "Active Objects (%s):\n", gpu->name);

		msm_gem_describe_objects(&gpu->active_list, m);

	}



	seq_printf(m, "Inactive Objects:\n");

	msm_gem_describe_objects(&priv->inactive_list, m);



	return 0;

}



static int msm_mm_show(struct drm_device *dev, struct seq_file *m)

{

	return drm_mm_dump_table(m, &dev->vma_offset_manager->vm_addr_space_mm);

}



static int msm_fb_show(struct drm_device *dev, struct seq_file *m)

{

	struct msm_drm_private *priv = dev->dev_private;

	struct drm_framebuffer *fb, *fbdev_fb = NULL;



	if (priv->fbdev) {

		seq_printf(m, "fbcon ");

		fbdev_fb = priv->fbdev->fb;

		msm_framebuffer_describe(fbdev_fb, m);

	}



	mutex_lock(&dev->mode_config.fb_lock);

	list_for_each_entry(fb, &dev->mode_config.fb_list, head) {

		if (fb == fbdev_fb)

			continue;



		seq_printf(m, "user ");

		msm_framebuffer_describe(fb, m);

	}

	mutex_unlock(&dev->mode_config.fb_lock);



	return 0;

}



static int show_locked(struct seq_file *m, void *arg)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	int (*show)(struct drm_device *dev, struct seq_file *m) =

			node->info_ent->data;

	int ret;



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	ret = show(dev, m);



	mutex_unlock(&dev->struct_mutex);



	return ret;

}



static struct drm_info_list msm_debugfs_list[] = {

		{"gpu", show_locked, 0, msm_gpu_show},

		{"gem", show_locked, 0, msm_gem_show},

		{ "mm", show_locked, 0, msm_mm_show },

		{ "fb", show_locked, 0, msm_fb_show },

};



static int late_init_minor(struct drm_minor *minor)

{

	int ret;



	if (!minor)

		return 0;



	ret = msm_rd_debugfs_init(minor);

	if (ret) {

		dev_err(minor->dev->dev, "could not install rd debugfs\n");

		return ret;

	}



	ret = msm_perf_debugfs_init(minor);

	if (ret) {

		dev_err(minor->dev->dev, "could not install perf debugfs\n");

		return ret;

	}



	return 0;

}



int msm_debugfs_late_init(struct drm_device *dev)

{

	int ret;

	ret = late_init_minor(dev->primary);

	if (ret)

		return ret;

	ret = late_init_minor(dev->render);

	if (ret)

		return ret;

	ret = late_init_minor(dev->control);

	return ret;

}



static int msm_debugfs_init(struct drm_minor *minor)

{

	struct drm_device *dev = minor->dev;

	int ret;



	ret = drm_debugfs_create_files(msm_debugfs_list,

			ARRAY_SIZE(msm_debugfs_list),

			minor->debugfs_root, minor);



	if (ret) {

		dev_err(dev->dev, "could not install msm_debugfs_list\n");

		return ret;

	}



	return 0;

}



static void msm_debugfs_cleanup(struct drm_minor *minor)

{

	drm_debugfs_remove_files(msm_debugfs_list,

			ARRAY_SIZE(msm_debugfs_list), minor);

	if (!minor->dev->dev_private)

		return;

	msm_rd_debugfs_cleanup(minor);

	msm_perf_debugfs_cleanup(minor);

}

#endif



/*

 * Fences:

 */