drm/i915: move error state to own compilation unit (84734a04) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/gpu/drm/i915/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5,6 +5,7 @@
	ccflags-y := -Iinclude/drm		ccflags-y := -Iinclude/drm
	i915-y := i915_drv.o i915_dma.o i915_irq.o \		i915-y := i915_drv.o i915_dma.o i915_irq.o \
	i915_debugfs.o \		i915_debugfs.o \
			i915_gpu_error.o \
	i915_suspend.o \		i915_suspend.o \
	i915_gem.o \		i915_gem.o \
	i915_gem_context.o \		i915_gem_context.o \

drivers/gpu/drm/i915/i915_debugfs.c

+1 −414

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,6 @@
	#include <linux/debugfs.h>		#include <linux/debugfs.h>
	#include <linux/slab.h>		#include <linux/slab.h>
	#include <linux/export.h>		#include <linux/export.h>
	#include <generated/utsrelease.h>
	#include <drm/drmP.h>		#include <drm/drmP.h>
	#include "intel_drv.h"		#include "intel_drv.h"
	#include "intel_ringbuffer.h"		#include "intel_ringbuffer.h"
	@@ -90,16 +89,6 @@ static const char get_tiling_flag(struct drm_i915_gem_object obj)
	}		}
	}		}

	static const char *cache_level_str(int type)
	{
	switch (type) {
	case I915_CACHE_NONE: return " uncached";
	case I915_CACHE_LLC: return " snooped (LLC)";
	case I915_CACHE_LLC_MLC: return " snooped (LLC+MLC)";
	default: return "";
	}
	}

	static void		static void
	describe_obj(struct seq_file m, struct drm_i915_gem_object obj)		describe_obj(struct seq_file m, struct drm_i915_gem_object obj)
	{		{
	@@ -113,7 +102,7 @@ describe_obj(struct seq_file m, struct drm_i915_gem_object obj)
	obj->last_read_seqno,		obj->last_read_seqno,
	obj->last_write_seqno,		obj->last_write_seqno,
	obj->last_fenced_seqno,		obj->last_fenced_seqno,
	cache_level_str(obj->cache_level),		i915_cache_level_str(obj->cache_level),
	obj->dirty ? " dirty" : "",		obj->dirty ? " dirty" : "",
	obj->madv == I915_MADV_DONTNEED ? " purgeable" : "");		obj->madv == I915_MADV_DONTNEED ? " purgeable" : "");
	if (obj->base.name)		if (obj->base.name)
	@@ -608,358 +597,6 @@ static int i915_hws_info(struct seq_file m, void data)
	return 0;		return 0;
	}		}

	static const char *ring_str(int ring)
	{
	switch (ring) {
	case RCS: return "render";
	case VCS: return "bsd";
	case BCS: return "blt";
	case VECS: return "vebox";
	default: return "";
	}
	}

	static const char *pin_flag(int pinned)
	{
	if (pinned > 0)
	return " P";
	else if (pinned < 0)
	return " p";
	else
	return "";
	}

	static const char *tiling_flag(int tiling)
	{
	switch (tiling) {
	default:
	case I915_TILING_NONE: return "";
	case I915_TILING_X: return " X";
	case I915_TILING_Y: return " Y";
	}
	}

	static const char *dirty_flag(int dirty)
	{
	return dirty ? " dirty" : "";
	}

	static const char *purgeable_flag(int purgeable)
	{
	return purgeable ? " purgeable" : "";
	}

	static bool __i915_error_ok(struct drm_i915_error_state_buf *e)
	{

	if (!e->err && WARN(e->bytes > (e->size - 1), "overflow")) {
	e->err = -ENOSPC;
	return false;
	}

	if (e->bytes == e->size - 1 \|\| e->err)
	return false;

	return true;
	}

	static bool __i915_error_seek(struct drm_i915_error_state_buf *e,
	unsigned len)
	{
	if (e->pos + len <= e->start) {
	e->pos += len;
	return false;
	}

	/* First vsnprintf needs to fit in its entirety for memmove */
	if (len >= e->size) {
	e->err = -EIO;
	return false;
	}

	return true;
	}

	static void __i915_error_advance(struct drm_i915_error_state_buf *e,
	unsigned len)
	{
	/* If this is first printf in this window, adjust it so that
	* start position matches start of the buffer
	*/

	if (e->pos < e->start) {
	const size_t off = e->start - e->pos;

	/* Should not happen but be paranoid */
	if (off > len \|\| e->bytes) {
	e->err = -EIO;
	return;
	}

	memmove(e->buf, e->buf + off, len - off);
	e->bytes = len - off;
	e->pos = e->start;
	return;
	}

	e->bytes += len;
	e->pos += len;
	}

	static void i915_error_vprintf(struct drm_i915_error_state_buf *e,
	const char *f, va_list args)
	{
	unsigned len;

	if (!__i915_error_ok(e))
	return;

	/* Seek the first printf which is hits start position */
	if (e->pos < e->start) {
	len = vsnprintf(NULL, 0, f, args);
	if (!__i915_error_seek(e, len))
	return;
	}

	len = vsnprintf(e->buf + e->bytes, e->size - e->bytes, f, args);
	if (len >= e->size - e->bytes)
	len = e->size - e->bytes - 1;

	__i915_error_advance(e, len);
	}

	static void i915_error_puts(struct drm_i915_error_state_buf *e,
	const char *str)
	{
	unsigned len;

	if (!__i915_error_ok(e))
	return;

	len = strlen(str);

	/* Seek the first printf which is hits start position */
	if (e->pos < e->start) {
	if (!__i915_error_seek(e, len))
	return;
	}

	if (len >= e->size - e->bytes)
	len = e->size - e->bytes - 1;
	memcpy(e->buf + e->bytes, str, len);

	__i915_error_advance(e, len);
	}

	void i915_error_printf(struct drm_i915_error_state_buf e, const char f, ...)
	{
	va_list args;

	va_start(args, f);
	i915_error_vprintf(e, f, args);
	va_end(args);
	}

	#define err_printf(e, ...) i915_error_printf(e, __VA_ARGS__)
	#define err_puts(e, s) i915_error_puts(e, s)

	static void print_error_buffers(struct drm_i915_error_state_buf *m,
	const char *name,
	struct drm_i915_error_buffer *err,
	int count)
	{
	err_printf(m, "%s [%d]:\n", name, count);

	while (count--) {
	err_printf(m, " %08x %8u %02x %02x %x %x",
	err->gtt_offset,
	err->size,
	err->read_domains,
	err->write_domain,
	err->rseqno, err->wseqno);
	err_puts(m, pin_flag(err->pinned));
	err_puts(m, tiling_flag(err->tiling));
	err_puts(m, dirty_flag(err->dirty));
	err_puts(m, purgeable_flag(err->purgeable));
	err_puts(m, err->ring != -1 ? " " : "");
	err_puts(m, ring_str(err->ring));
	err_puts(m, cache_level_str(err->cache_level));

	if (err->name)
	err_printf(m, " (name: %d)", err->name);
	if (err->fence_reg != I915_FENCE_REG_NONE)
	err_printf(m, " (fence: %d)", err->fence_reg);

	err_puts(m, "\n");
	err++;
	}
	}

	static void i915_ring_error_state(struct drm_i915_error_state_buf *m,
	struct drm_device *dev,
	struct drm_i915_error_state *error,
	unsigned ring)
	{
	BUG_ON(ring >= I915_NUM_RINGS); /* shut up confused gcc */
	err_printf(m, "%s command stream:\n", ring_str(ring));
	err_printf(m, " HEAD: 0x%08x\n", error->head[ring]);
	err_printf(m, " TAIL: 0x%08x\n", error->tail[ring]);
	err_printf(m, " CTL: 0x%08x\n", error->ctl[ring]);
	err_printf(m, " ACTHD: 0x%08x\n", error->acthd[ring]);
	err_printf(m, " IPEIR: 0x%08x\n", error->ipeir[ring]);
	err_printf(m, " IPEHR: 0x%08x\n", error->ipehr[ring]);
	err_printf(m, " INSTDONE: 0x%08x\n", error->instdone[ring]);
	if (ring == RCS && INTEL_INFO(dev)->gen >= 4)
	err_printf(m, " BBADDR: 0x%08llx\n", error->bbaddr);

	if (INTEL_INFO(dev)->gen >= 4)
	err_printf(m, " INSTPS: 0x%08x\n", error->instps[ring]);
	err_printf(m, " INSTPM: 0x%08x\n", error->instpm[ring]);
	err_printf(m, " FADDR: 0x%08x\n", error->faddr[ring]);
	if (INTEL_INFO(dev)->gen >= 6) {
	err_printf(m, " RC PSMI: 0x%08x\n", error->rc_psmi[ring]);
	err_printf(m, " FAULT_REG: 0x%08x\n", error->fault_reg[ring]);
	err_printf(m, " SYNC_0: 0x%08x [last synced 0x%08x]\n",
	error->semaphore_mboxes[ring][0],
	error->semaphore_seqno[ring][0]);
	err_printf(m, " SYNC_1: 0x%08x [last synced 0x%08x]\n",
	error->semaphore_mboxes[ring][1],
	error->semaphore_seqno[ring][1]);
	}
	err_printf(m, " seqno: 0x%08x\n", error->seqno[ring]);
	err_printf(m, " waiting: %s\n", yesno(error->waiting[ring]));
	err_printf(m, " ring->head: 0x%08x\n", error->cpu_ring_head[ring]);
	err_printf(m, " ring->tail: 0x%08x\n", error->cpu_ring_tail[ring]);
	}

	int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
	const struct i915_error_state_file_priv *error_priv)
	{
	struct drm_device *dev = error_priv->dev;
	drm_i915_private_t *dev_priv = dev->dev_private;
	struct drm_i915_error_state *error = error_priv->error;
	struct intel_ring_buffer *ring;
	int i, j, page, offset, elt;

	if (!error) {
	err_printf(m, "no error state collected\n");
	goto out;
	}

	err_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
	error->time.tv_usec);
	err_printf(m, "Kernel: " UTS_RELEASE "\n");
	err_printf(m, "PCI ID: 0x%04x\n", dev->pci_device);
	err_printf(m, "EIR: 0x%08x\n", error->eir);
	err_printf(m, "IER: 0x%08x\n", error->ier);
	err_printf(m, "PGTBL_ER: 0x%08x\n", error->pgtbl_er);
	err_printf(m, "FORCEWAKE: 0x%08x\n", error->forcewake);
	err_printf(m, "DERRMR: 0x%08x\n", error->derrmr);
	err_printf(m, "CCID: 0x%08x\n", error->ccid);

	for (i = 0; i < dev_priv->num_fence_regs; i++)
	err_printf(m, " fence[%d] = %08llx\n", i, error->fence[i]);

	for (i = 0; i < ARRAY_SIZE(error->extra_instdone); i++)
	err_printf(m, " INSTDONE_%d: 0x%08x\n", i,
	error->extra_instdone[i]);

	if (INTEL_INFO(dev)->gen >= 6) {
	err_printf(m, "ERROR: 0x%08x\n", error->error);
	err_printf(m, "DONE_REG: 0x%08x\n", error->done_reg);
	}

	if (INTEL_INFO(dev)->gen == 7)
	err_printf(m, "ERR_INT: 0x%08x\n", error->err_int);

	for_each_ring(ring, dev_priv, i)
	i915_ring_error_state(m, dev, error, i);

	if (error->active_bo)
	print_error_buffers(m, "Active",
	error->active_bo,
	error->active_bo_count);

	if (error->pinned_bo)
	print_error_buffers(m, "Pinned",
	error->pinned_bo,
	error->pinned_bo_count);

	for (i = 0; i < ARRAY_SIZE(error->ring); i++) {
	struct drm_i915_error_object *obj;

	if ((obj = error->ring[i].batchbuffer)) {
	err_printf(m, "%s --- gtt_offset = 0x%08x\n",
	dev_priv->ring[i].name,
	obj->gtt_offset);
	offset = 0;
	for (page = 0; page < obj->page_count; page++) {
	for (elt = 0; elt < PAGE_SIZE/4; elt++) {
	err_printf(m, "%08x : %08x\n", offset,
	obj->pages[page][elt]);
	offset += 4;
	}
	}
	}

	if (error->ring[i].num_requests) {
	err_printf(m, "%s --- %d requests\n",
	dev_priv->ring[i].name,
	error->ring[i].num_requests);
	for (j = 0; j < error->ring[i].num_requests; j++) {
	err_printf(m, " seqno 0x%08x, emitted %ld, tail 0x%08x\n",
	error->ring[i].requests[j].seqno,
	error->ring[i].requests[j].jiffies,
	error->ring[i].requests[j].tail);
	}
	}

	if ((obj = error->ring[i].ringbuffer)) {
	err_printf(m, "%s --- ringbuffer = 0x%08x\n",
	dev_priv->ring[i].name,
	obj->gtt_offset);
	offset = 0;
	for (page = 0; page < obj->page_count; page++) {
	for (elt = 0; elt < PAGE_SIZE/4; elt++) {
	err_printf(m, "%08x : %08x\n",
	offset,
	obj->pages[page][elt]);
	offset += 4;
	}
	}
	}

	obj = error->ring[i].ctx;
	if (obj) {
	err_printf(m, "%s --- HW Context = 0x%08x\n",
	dev_priv->ring[i].name,
	obj->gtt_offset);
	offset = 0;
	for (elt = 0; elt < PAGE_SIZE/16; elt += 4) {
	err_printf(m, "[%04x] %08x %08x %08x %08x\n",
	offset,
	obj->pages[0][elt],
	obj->pages[0][elt+1],
	obj->pages[0][elt+2],
	obj->pages[0][elt+3]);
	offset += 16;
	}
	}
	}

	if (error->overlay)
	intel_overlay_print_error_state(m, error->overlay);

	if (error->display)
	intel_display_print_error_state(m, dev, error->display);

	out:
	if (m->bytes == 0 && m->err)
	return m->err;

	return 0;
	}

	static ssize_t		static ssize_t
	i915_error_state_write(struct file *filp,		i915_error_state_write(struct file *filp,
	const char __user *ubuf,		const char __user *ubuf,
	@@ -982,26 +619,6 @@ i915_error_state_write(struct file *filp,
	return cnt;		return cnt;
	}		}

	void i915_error_state_get(struct drm_device *dev,
	struct i915_error_state_file_priv *error_priv)
	{
	struct drm_i915_private *dev_priv = dev->dev_private;
	unsigned long flags;

	spin_lock_irqsave(&dev_priv->gpu_error.lock, flags);
	error_priv->error = dev_priv->gpu_error.first_error;
	if (error_priv->error)
	kref_get(&error_priv->error->ref);
	spin_unlock_irqrestore(&dev_priv->gpu_error.lock, flags);

	}

	void i915_error_state_put(struct i915_error_state_file_priv *error_priv)
	{
	if (error_priv->error)
	kref_put(&error_priv->error->ref, i915_error_state_free);
	}

	static int i915_error_state_open(struct inode inode, struct file file)		static int i915_error_state_open(struct inode inode, struct file file)
	{		{
	struct drm_device *dev = inode->i_private;		struct drm_device *dev = inode->i_private;
	@@ -1030,36 +647,6 @@ static int i915_error_state_release(struct inode inode, struct file file)
	return 0;		return 0;
	}		}

	int i915_error_state_buf_init(struct drm_i915_error_state_buf *ebuf,
	size_t count, loff_t pos)
	{
	memset(ebuf, 0, sizeof(*ebuf));

	/* We need to have enough room to store any i915_error_state printf
	* so that we can move it to start position.
	*/
	ebuf->size = count + 1 > PAGE_SIZE ? count + 1 : PAGE_SIZE;
	ebuf->buf = kmalloc(ebuf->size,
	GFP_TEMPORARY \| __GFP_NORETRY \| __GFP_NOWARN);

	if (ebuf->buf == NULL) {
	ebuf->size = PAGE_SIZE;
	ebuf->buf = kmalloc(ebuf->size, GFP_TEMPORARY);
	}

	if (ebuf->buf == NULL) {
	ebuf->size = 128;
	ebuf->buf = kmalloc(ebuf->size, GFP_TEMPORARY);
	}

	if (ebuf->buf == NULL)
	return -ENOMEM;

	ebuf->start = pos;

	return 0;
	}

	static ssize_t i915_error_state_read(struct file file, char __user userbuf,		static ssize_t i915_error_state_read(struct file file, char __user userbuf,
	size_t count, loff_t *pos)		size_t count, loff_t *pos)
	{		{

drivers/gpu/drm/i915/i915_drv.h

+10 −14

Original line number	Original line	Diff line number	Diff line
	@@ -1627,21 +1627,12 @@ extern void intel_hpd_init(struct drm_device *dev);
	extern void intel_gt_init(struct drm_device *dev);		extern void intel_gt_init(struct drm_device *dev);
	extern void intel_gt_reset(struct drm_device *dev);		extern void intel_gt_reset(struct drm_device *dev);

	void i915_error_state_free(struct kref *error_ref);

	void		void
	i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);		i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);

	void		void
	i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);		i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);

	#ifdef CONFIG_DEBUG_FS
	extern void i915_destroy_error_state(struct drm_device *dev);
	#else
	#define i915_destroy_error_state(x)
	#endif


	/* i915_gem.c */		/* i915_gem.c */
	int i915_gem_init_ioctl(struct drm_device dev, void data,		int i915_gem_init_ioctl(struct drm_device dev, void data,
	struct drm_file *file_priv);		struct drm_file *file_priv);
	@@ -1950,13 +1941,12 @@ void i915_gem_dump_object(struct drm_i915_gem_object *obj, int len,
	/* i915_debugfs.c */		/* i915_debugfs.c */
	int i915_debugfs_init(struct drm_minor *minor);		int i915_debugfs_init(struct drm_minor *minor);
	void i915_debugfs_cleanup(struct drm_minor *minor);		void i915_debugfs_cleanup(struct drm_minor *minor);

			/* i915_gpu_error.c */
	__printf(2, 3)		__printf(2, 3)
	void i915_error_printf(struct drm_i915_error_state_buf e, const char f, ...);		void i915_error_printf(struct drm_i915_error_state_buf e, const char f, ...);
	int i915_error_state_to_str(struct drm_i915_error_state_buf *estr,		int i915_error_state_to_str(struct drm_i915_error_state_buf *estr,
	const struct i915_error_state_file_priv *error);		const struct i915_error_state_file_priv *error);
	void i915_error_state_get(struct drm_device *dev,
	struct i915_error_state_file_priv *error_priv);
	void i915_error_state_put(struct i915_error_state_file_priv *error_priv);
	int i915_error_state_buf_init(struct drm_i915_error_state_buf *eb,		int i915_error_state_buf_init(struct drm_i915_error_state_buf *eb,
	size_t count, loff_t pos);		size_t count, loff_t pos);
	static inline void i915_error_state_buf_release(		static inline void i915_error_state_buf_release(
	@@ -1964,6 +1954,14 @@ static inline void i915_error_state_buf_release(
	{		{
	kfree(eb->buf);		kfree(eb->buf);
	}		}
			void i915_capture_error_state(struct drm_device *dev);
			void i915_error_state_get(struct drm_device *dev,
			struct i915_error_state_file_priv *error_priv);
			void i915_error_state_put(struct i915_error_state_file_priv *error_priv);
			void i915_destroy_error_state(struct drm_device *dev);

			void i915_get_extra_instdone(struct drm_device dev, uint32_t instdone);
			const char *i915_cache_level_str(int type);

	/* i915_suspend.c */		/* i915_suspend.c */
	extern int i915_save_state(struct drm_device *dev);		extern int i915_save_state(struct drm_device *dev);
	@@ -2043,7 +2041,6 @@ int i915_reg_read_ioctl(struct drm_device dev, void data,
	struct drm_file *file);		struct drm_file *file);

	/* overlay */		/* overlay */
	#ifdef CONFIG_DEBUG_FS
	extern struct intel_overlay_error_state intel_overlay_capture_error_state(struct drm_device dev);		extern struct intel_overlay_error_state intel_overlay_capture_error_state(struct drm_device dev);
	extern void intel_overlay_print_error_state(struct drm_i915_error_state_buf *e,		extern void intel_overlay_print_error_state(struct drm_i915_error_state_buf *e,
	struct intel_overlay_error_state *error);		struct intel_overlay_error_state *error);
	@@ -2052,7 +2049,6 @@ extern struct intel_display_error_state *intel_display_capture_error_state(struc
	extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,		extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,
	struct drm_device *dev,		struct drm_device *dev,
	struct intel_display_error_state *error);		struct intel_display_error_state *error);
	#endif

	/* On SNB platform, before reading ring registers forcewake bit		/* On SNB platform, before reading ring registers forcewake bit
	* must be set to prevent GT core from power down and stale values being		* must be set to prevent GT core from power down and stale values being

drivers/gpu/drm/i915/i915_gpu_error.c

0 → 100644

+971 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_irq.c

+0 −529

File changed.

Preview size limit exceeded, changes collapsed.