drm/i915: Convert i915 proc files to seq_file and move to debugfs. (2017263e) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/drm/i915/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \
		i915_suspend.o \
		i915_gem.o \
		i915_gem_debug.o \
		i915_gem_proc.o \
		i915_gem_debugfs.o \
		i915_gem_tiling.o \
		intel_display.o \
		intel_crt.o \

drivers/gpu/drm/i915/i915_drv.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -150,8 +150,10 @@ static struct drm_driver driver = {
		.get_reg_ofs = drm_core_get_reg_ofs,
		.master_create = i915_master_create,
		.master_destroy = i915_master_destroy,
		.proc_init = i915_gem_proc_init,
		.proc_cleanup = i915_gem_proc_cleanup,
		#if defined(CONFIG_DEBUG_FS)
		.debugfs_init = i915_gem_debugfs_init,
		.debugfs_cleanup = i915_gem_debugfs_cleanup,
		#endif
		.gem_init_object = i915_gem_init_object,
		.gem_free_object = i915_gem_free_object,
		.gem_vm_ops = &i915_gem_vm_ops,

drivers/gpu/drm/i915/i915_drv.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -605,8 +605,6 @@ int i915_gem_get_tiling(struct drm_device dev, void data,
		int i915_gem_get_aperture_ioctl(struct drm_device dev, void data,
		struct drm_file *file_priv);
		void i915_gem_load(struct drm_device *dev);
		int i915_gem_proc_init(struct drm_minor *minor);
		void i915_gem_proc_cleanup(struct drm_minor *minor);
		int i915_gem_init_object(struct drm_gem_object *obj);
		void i915_gem_free_object(struct drm_gem_object *obj);
		int i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment);
		@@ -650,6 +648,10 @@ void i915_gem_dump_object(struct drm_gem_object *obj, int len,
		const char *where, uint32_t mark);
		void i915_dump_lru(struct drm_device dev, const char where);

		/* i915_debugfs.c */
		int i915_gem_debugfs_init(struct drm_minor *minor);
		void i915_gem_debugfs_cleanup(struct drm_minor *minor);

		/* i915_suspend.c */
		extern int i915_save_state(struct drm_device *dev);
		extern int i915_restore_state(struct drm_device *dev);

drivers/gpu/drm/i915/i915_gem_debugfs.c

0 → 100644

+230 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright © 2008 Intel Corporation
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice (including the next
		* paragraph) shall be included in all copies or substantial portions of the
		* Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
		* IN THE SOFTWARE.
		*
		* Authors:
		* Eric Anholt <eric@anholt.net>
		* Keith Packard <keithp@keithp.com>
		*
		*/

		#include <linux/seq_file.h>
		#include "drmP.h"
		#include "drm.h"
		#include "i915_drm.h"
		#include "i915_drv.h"

		#define DRM_I915_RING_DEBUG 1


		#if defined(CONFIG_DEBUG_FS)

		static int i915_gem_active_info(struct seq_file m, void data)
		{
		struct drm_info_node node = (struct drm_info_node ) m->private;
		struct drm_device *dev = node->minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;
		struct drm_i915_gem_object *obj_priv;

		seq_printf(m, "Active:\n");
		list_for_each_entry(obj_priv, &dev_priv->mm.active_list,
		list)
		{
		struct drm_gem_object *obj = obj_priv->obj;
		if (obj->name) {
		seq_printf(m, " %p(%d): %08x %08x %d\n",
		obj, obj->name,
		obj->read_domains, obj->write_domain,
		obj_priv->last_rendering_seqno);
		} else {
		seq_printf(m, " %p: %08x %08x %d\n",
		obj,
		obj->read_domains, obj->write_domain,
		obj_priv->last_rendering_seqno);
		}
		}
		return 0;
		}

		static int i915_gem_flushing_info(struct seq_file m, void data)
		{
		struct drm_info_node node = (struct drm_info_node ) m->private;
		struct drm_device *dev = node->minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;
		struct drm_i915_gem_object *obj_priv;

		seq_printf(m, "Flushing:\n");
		list_for_each_entry(obj_priv, &dev_priv->mm.flushing_list,
		list)
		{
		struct drm_gem_object *obj = obj_priv->obj;
		if (obj->name) {
		seq_printf(m, " %p(%d): %08x %08x %d\n",
		obj, obj->name,
		obj->read_domains, obj->write_domain,
		obj_priv->last_rendering_seqno);
		} else {
		seq_printf(m, " %p: %08x %08x %d\n", obj,
		obj->read_domains, obj->write_domain,
		obj_priv->last_rendering_seqno);
		}
		}
		return 0;
		}

		static int i915_gem_inactive_info(struct seq_file m, void data)
		{
		struct drm_info_node node = (struct drm_info_node ) m->private;
		struct drm_device *dev = node->minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;
		struct drm_i915_gem_object *obj_priv;

		seq_printf(m, "Inactive:\n");
		list_for_each_entry(obj_priv, &dev_priv->mm.inactive_list,
		list)
		{
		struct drm_gem_object *obj = obj_priv->obj;
		if (obj->name) {
		seq_printf(m, " %p(%d): %08x %08x %d\n",
		obj, obj->name,
		obj->read_domains, obj->write_domain,
		obj_priv->last_rendering_seqno);
		} else {
		seq_printf(m, " %p: %08x %08x %d\n", obj,
		obj->read_domains, obj->write_domain,
		obj_priv->last_rendering_seqno);
		}
		}
		return 0;
		}

		static int i915_gem_request_info(struct seq_file m, void data)
		{
		struct drm_info_node node = (struct drm_info_node ) m->private;
		struct drm_device *dev = node->minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;
		struct drm_i915_gem_request *gem_request;

		seq_printf(m, "Request:\n");
		list_for_each_entry(gem_request, &dev_priv->mm.request_list, list) {
		seq_printf(m, " %d @ %d\n",
		gem_request->seqno,
		(int) (jiffies - gem_request->emitted_jiffies));
		}
		return 0;
		}

		static int i915_gem_seqno_info(struct seq_file m, void data)
		{
		struct drm_info_node node = (struct drm_info_node ) m->private;
		struct drm_device *dev = node->minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;

		if (dev_priv->hw_status_page != NULL) {
		seq_printf(m, "Current sequence: %d\n",
		i915_get_gem_seqno(dev));
		} else {
		seq_printf(m, "Current sequence: hws uninitialized\n");
		}
		seq_printf(m, "Waiter sequence: %d\n",
		dev_priv->mm.waiting_gem_seqno);
		seq_printf(m, "IRQ sequence: %d\n", dev_priv->mm.irq_gem_seqno);
		return 0;
		}


		static int i915_interrupt_info(struct seq_file m, void data)
		{
		struct drm_info_node node = (struct drm_info_node ) m->private;
		struct drm_device *dev = node->minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;

		seq_printf(m, "Interrupt enable: %08x\n",
		I915_READ(IER));
		seq_printf(m, "Interrupt identity: %08x\n",
		I915_READ(IIR));
		seq_printf(m, "Interrupt mask: %08x\n",
		I915_READ(IMR));
		seq_printf(m, "Pipe A stat: %08x\n",
		I915_READ(PIPEASTAT));
		seq_printf(m, "Pipe B stat: %08x\n",
		I915_READ(PIPEBSTAT));
		seq_printf(m, "Interrupts received: %d\n",
		atomic_read(&dev_priv->irq_received));
		if (dev_priv->hw_status_page != NULL) {
		seq_printf(m, "Current sequence: %d\n",
		i915_get_gem_seqno(dev));
		} else {
		seq_printf(m, "Current sequence: hws uninitialized\n");
		}
		seq_printf(m, "Waiter sequence: %d\n",
		dev_priv->mm.waiting_gem_seqno);
		seq_printf(m, "IRQ sequence: %d\n",
		dev_priv->mm.irq_gem_seqno);
		return 0;
		}

		static int i915_hws_info(struct seq_file m, void data)
		{
		struct drm_info_node node = (struct drm_info_node ) m->private;
		struct drm_device *dev = node->minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;
		int i;
		volatile u32 *hws;

		hws = (volatile u32 *)dev_priv->hw_status_page;
		if (hws == NULL)
		return 0;

		for (i = 0; i < 4096 / sizeof(u32) / 4; i += 4) {
		seq_printf(m, "0x%08x: 0x%08x 0x%08x 0x%08x 0x%08x\n",
		i * 4,
		hws[i], hws[i + 1], hws[i + 2], hws[i + 3]);
		}
		return 0;
		}

		static struct drm_info_list i915_gem_debugfs_list[] = {
		{"i915_gem_active", i915_gem_active_info, 0},
		{"i915_gem_flushing", i915_gem_flushing_info, 0},
		{"i915_gem_inactive", i915_gem_inactive_info, 0},
		{"i915_gem_request", i915_gem_request_info, 0},
		{"i915_gem_seqno", i915_gem_seqno_info, 0},
		{"i915_gem_interrupt", i915_interrupt_info, 0},
		{"i915_gem_hws", i915_hws_info, 0},
		};
		#define I915_GEM_DEBUGFS_ENTRIES ARRAY_SIZE(i915_gem_debugfs_list)

		int i915_gem_debugfs_init(struct drm_minor *minor)
		{
		return drm_debugfs_create_files(i915_gem_debugfs_list,
		I915_GEM_DEBUGFS_ENTRIES,
		minor->debugfs_root, minor);
		}

		void i915_gem_debugfs_cleanup(struct drm_minor *minor)
		{
		drm_debugfs_remove_files(i915_gem_debugfs_list,
		I915_GEM_DEBUGFS_ENTRIES, minor);
		}

		#endif /* CONFIG_DEBUG_FS */

drivers/gpu/drm/i915/i915_gem_proc.c

deleted100644 → 0

+0 −334

Original line number	Diff line number	Diff line
		/*
		* Copyright © 2008 Intel Corporation
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice (including the next
		* paragraph) shall be included in all copies or substantial portions of the
		* Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
		* IN THE SOFTWARE.
		*
		* Authors:
		* Eric Anholt <eric@anholt.net>
		* Keith Packard <keithp@keithp.com>
		*
		*/

		#include "drmP.h"
		#include "drm.h"
		#include "i915_drm.h"
		#include "i915_drv.h"

		static int i915_gem_active_info(char buf, char *start, off_t offset,
		int request, int eof, void data)
		{
		struct drm_minor minor = (struct drm_minor ) data;
		struct drm_device *dev = minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;
		struct drm_i915_gem_object *obj_priv;
		int len = 0;

		if (offset > DRM_PROC_LIMIT) {
		*eof = 1;
		return 0;
		}

		*start = &buf[offset];
		*eof = 0;
		DRM_PROC_PRINT("Active:\n");
		list_for_each_entry(obj_priv, &dev_priv->mm.active_list,
		list)
		{
		struct drm_gem_object *obj = obj_priv->obj;
		if (obj->name) {
		DRM_PROC_PRINT(" %p(%d): %08x %08x %d\n",
		obj, obj->name,
		obj->read_domains, obj->write_domain,
		obj_priv->last_rendering_seqno);
		} else {
		DRM_PROC_PRINT(" %p: %08x %08x %d\n",
		obj,
		obj->read_domains, obj->write_domain,
		obj_priv->last_rendering_seqno);
		}
		}
		if (len > request + offset)
		return request;
		*eof = 1;
		return len - offset;
		}

		static int i915_gem_flushing_info(char buf, char *start, off_t offset,
		int request, int eof, void data)
		{
		struct drm_minor minor = (struct drm_minor ) data;
		struct drm_device *dev = minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;
		struct drm_i915_gem_object *obj_priv;
		int len = 0;

		if (offset > DRM_PROC_LIMIT) {
		*eof = 1;
		return 0;
		}

		*start = &buf[offset];
		*eof = 0;
		DRM_PROC_PRINT("Flushing:\n");
		list_for_each_entry(obj_priv, &dev_priv->mm.flushing_list,
		list)
		{
		struct drm_gem_object *obj = obj_priv->obj;
		if (obj->name) {
		DRM_PROC_PRINT(" %p(%d): %08x %08x %d\n",
		obj, obj->name,
		obj->read_domains, obj->write_domain,
		obj_priv->last_rendering_seqno);
		} else {
		DRM_PROC_PRINT(" %p: %08x %08x %d\n", obj,
		obj->read_domains, obj->write_domain,
		obj_priv->last_rendering_seqno);
		}
		}
		if (len > request + offset)
		return request;
		*eof = 1;
		return len - offset;
		}

		static int i915_gem_inactive_info(char buf, char *start, off_t offset,
		int request, int eof, void data)
		{
		struct drm_minor minor = (struct drm_minor ) data;
		struct drm_device *dev = minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;
		struct drm_i915_gem_object *obj_priv;
		int len = 0;

		if (offset > DRM_PROC_LIMIT) {
		*eof = 1;
		return 0;
		}

		*start = &buf[offset];
		*eof = 0;
		DRM_PROC_PRINT("Inactive:\n");
		list_for_each_entry(obj_priv, &dev_priv->mm.inactive_list,
		list)
		{
		struct drm_gem_object *obj = obj_priv->obj;
		if (obj->name) {
		DRM_PROC_PRINT(" %p(%d): %08x %08x %d\n",
		obj, obj->name,
		obj->read_domains, obj->write_domain,
		obj_priv->last_rendering_seqno);
		} else {
		DRM_PROC_PRINT(" %p: %08x %08x %d\n", obj,
		obj->read_domains, obj->write_domain,
		obj_priv->last_rendering_seqno);
		}
		}
		if (len > request + offset)
		return request;
		*eof = 1;
		return len - offset;
		}

		static int i915_gem_request_info(char buf, char *start, off_t offset,
		int request, int eof, void data)
		{
		struct drm_minor minor = (struct drm_minor ) data;
		struct drm_device *dev = minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;
		struct drm_i915_gem_request *gem_request;
		int len = 0;

		if (offset > DRM_PROC_LIMIT) {
		*eof = 1;
		return 0;
		}

		*start = &buf[offset];
		*eof = 0;
		DRM_PROC_PRINT("Request:\n");
		list_for_each_entry(gem_request, &dev_priv->mm.request_list,
		list)
		{
		DRM_PROC_PRINT(" %d @ %d\n",
		gem_request->seqno,
		(int) (jiffies - gem_request->emitted_jiffies));
		}
		if (len > request + offset)
		return request;
		*eof = 1;
		return len - offset;
		}

		static int i915_gem_seqno_info(char buf, char *start, off_t offset,
		int request, int eof, void data)
		{
		struct drm_minor minor = (struct drm_minor ) data;
		struct drm_device *dev = minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;
		int len = 0;

		if (offset > DRM_PROC_LIMIT) {
		*eof = 1;
		return 0;
		}

		*start = &buf[offset];
		*eof = 0;
		if (dev_priv->hw_status_page != NULL) {
		DRM_PROC_PRINT("Current sequence: %d\n",
		i915_get_gem_seqno(dev));
		} else {
		DRM_PROC_PRINT("Current sequence: hws uninitialized\n");
		}
		DRM_PROC_PRINT("Waiter sequence: %d\n",
		dev_priv->mm.waiting_gem_seqno);
		DRM_PROC_PRINT("IRQ sequence: %d\n", dev_priv->mm.irq_gem_seqno);
		if (len > request + offset)
		return request;
		*eof = 1;
		return len - offset;
		}


		static int i915_interrupt_info(char buf, char *start, off_t offset,
		int request, int eof, void data)
		{
		struct drm_minor minor = (struct drm_minor ) data;
		struct drm_device *dev = minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;
		int len = 0;

		if (offset > DRM_PROC_LIMIT) {
		*eof = 1;
		return 0;
		}

		*start = &buf[offset];
		*eof = 0;
		DRM_PROC_PRINT("Interrupt enable: %08x\n",
		I915_READ(IER));
		DRM_PROC_PRINT("Interrupt identity: %08x\n",
		I915_READ(IIR));
		DRM_PROC_PRINT("Interrupt mask: %08x\n",
		I915_READ(IMR));
		DRM_PROC_PRINT("Pipe A stat: %08x\n",
		I915_READ(PIPEASTAT));
		DRM_PROC_PRINT("Pipe B stat: %08x\n",
		I915_READ(PIPEBSTAT));
		DRM_PROC_PRINT("Interrupts received: %d\n",
		atomic_read(&dev_priv->irq_received));
		if (dev_priv->hw_status_page != NULL) {
		DRM_PROC_PRINT("Current sequence: %d\n",
		i915_get_gem_seqno(dev));
		} else {
		DRM_PROC_PRINT("Current sequence: hws uninitialized\n");
		}
		DRM_PROC_PRINT("Waiter sequence: %d\n",
		dev_priv->mm.waiting_gem_seqno);
		DRM_PROC_PRINT("IRQ sequence: %d\n",
		dev_priv->mm.irq_gem_seqno);
		if (len > request + offset)
		return request;
		*eof = 1;
		return len - offset;
		}

		static int i915_hws_info(char buf, char *start, off_t offset,
		int request, int eof, void data)
		{
		struct drm_minor minor = (struct drm_minor ) data;
		struct drm_device *dev = minor->dev;
		drm_i915_private_t *dev_priv = dev->dev_private;
		int len = 0, i;
		volatile u32 *hws;

		if (offset > DRM_PROC_LIMIT) {
		*eof = 1;
		return 0;
		}

		hws = (volatile u32 *)dev_priv->hw_status_page;
		if (hws == NULL) {
		*eof = 1;
		return 0;
		}

		*start = &buf[offset];
		*eof = 0;
		for (i = 0; i < 4096 / sizeof(u32) / 4; i += 4) {
		DRM_PROC_PRINT("0x%08x: 0x%08x 0x%08x 0x%08x 0x%08x\n",
		i * 4,
		hws[i], hws[i + 1], hws[i + 2], hws[i + 3]);
		}
		if (len > request + offset)
		return request;
		*eof = 1;
		return len - offset;
		}

		static struct drm_proc_list {
		/** file name */
		const char *name;
		/** proc callback*/
		int (f) (char , char *, off_t, int, int , void *);
		} i915_gem_proc_list[] = {
		{"i915_gem_active", i915_gem_active_info},
		{"i915_gem_flushing", i915_gem_flushing_info},
		{"i915_gem_inactive", i915_gem_inactive_info},
		{"i915_gem_request", i915_gem_request_info},
		{"i915_gem_seqno", i915_gem_seqno_info},
		{"i915_gem_interrupt", i915_interrupt_info},
		{"i915_gem_hws", i915_hws_info},
		};

		#define I915_GEM_PROC_ENTRIES ARRAY_SIZE(i915_gem_proc_list)

		int i915_gem_proc_init(struct drm_minor *minor)
		{
		struct proc_dir_entry *ent;
		int i, j;

		for (i = 0; i < I915_GEM_PROC_ENTRIES; i++) {
		ent = create_proc_entry(i915_gem_proc_list[i].name,
		S_IFREG \| S_IRUGO, minor->dev_root);
		if (!ent) {
		DRM_ERROR("Cannot create /proc/dri/.../%s\n",
		i915_gem_proc_list[i].name);
		for (j = 0; j < i; j++)
		remove_proc_entry(i915_gem_proc_list[i].name,
		minor->dev_root);
		return -1;
		}
		ent->read_proc = i915_gem_proc_list[i].f;
		ent->data = minor;
		}
		return 0;
		}

		void i915_gem_proc_cleanup(struct drm_minor *minor)
		{
		int i;

		if (!minor->dev_root)
		return;

		for (i = 0; i < I915_GEM_PROC_ENTRIES; i++)
		remove_proc_entry(i915_gem_proc_list[i].name, minor->dev_root);
		}