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

Commit da3bd820 authored by Jiri Slaby's avatar Jiri Slaby Committed by Ben Skeggs
Browse files

drm/nouveau: ratelimit IRQ messages 



There are two messages in the ISR of nouveau which might be printed out
hundred times in a second. Ratelimit them. (We need to move
nouveau_ratelimit to the top of the file.)

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Reviewed-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0143832c

drivers/gpu/drm/nouveau/nouveau_irq.c

+14 −12
Original line number Diff line number Diff line
@@ -42,6 +42,13 @@ 
#include "nouveau_connector.h"

#include "nv50_display.h"



static DEFINE_RATELIMIT_STATE(nouveau_ratelimit_state, 3 * HZ, 20);



static int nouveau_ratelimit(void)

{

	return __ratelimit(&nouveau_ratelimit_state);

}



void

nouveau_irq_preinstall(struct drm_device *dev)

{
@@ -213,11 +220,12 @@ nouveau_fifo_irq_handler(struct drm_device *dev) 
				u32 ib_get = nv_rd32(dev, 0x003334);

				u32 ib_put = nv_rd32(dev, 0x003330);



				if (nouveau_ratelimit())

					NV_INFO(dev, "PFIFO_DMA_PUSHER - Ch %d Get 0x%02x%08x "

					     "Put 0x%02x%08x IbGet 0x%08x IbPut 0x%08x "

					     "State 0x%08x Push 0x%08x\n",

					chid, ho_get, get, ho_put, put, ib_get, ib_put,

					state, push);

						chid, ho_get, get, ho_put, put,

						ib_get, ib_put, state, push);



				/* METHOD_COUNT, in DMA_STATE on earlier chipsets */

				nv_wr32(dev, 0x003364, 0x00000000);
@@ -266,6 +274,7 @@ nouveau_fifo_irq_handler(struct drm_device *dev) 
		}



		if (status) {

			if (nouveau_ratelimit())

				NV_INFO(dev, "PFIFO_INTR 0x%08x - Ch %d\n",

					status, chid);

			nv_wr32(dev, NV03_PFIFO_INTR_0, status);
@@ -544,13 +553,6 @@ nouveau_pgraph_intr_notify(struct drm_device *dev, uint32_t nsource) 
		nouveau_graph_dump_trap_info(dev, "PGRAPH_NOTIFY", &trap);

}



static DEFINE_RATELIMIT_STATE(nouveau_ratelimit_state, 3 * HZ, 20);



static int nouveau_ratelimit(void)

{

	return __ratelimit(&nouveau_ratelimit_state);

}





static inline void

nouveau_pgraph_intr_error(struct drm_device *dev, uint32_t nsource)