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

Commit 304424e1 authored by Marcin Kościelnicki's avatar Marcin Kościelnicki Committed by Ben Skeggs
Browse files

drm/nv50: Improve PGRAPH interrupt handling. 



This makes nouveau recognise and report more kinds of PGRAPH errors, as
well as prevent GPU lockups resulting from some of them.

Lots of guesswork was involved and some part of this is probably
incorrect. Some potential-lockuop situations are handled by just
resetting a whole PGRAPH subunit, which doesn't sound like a "proper"
solution, but seems to work just fine... for now.

Signed-off-by: default avatarMarcin Kościelnicki <koriakin@0x04.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 3bf777bf

drivers/gpu/drm/nouveau/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
             nouveau_dp.o nouveau_grctx.o \

             nv04_timer.o \

             nv04_mc.o nv40_mc.o nv50_mc.o \

             nv04_fb.o nv10_fb.o nv40_fb.o \

             nv04_fb.o nv10_fb.o nv40_fb.o nv50_fb.o \

             nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \

             nv04_graph.o nv10_graph.o nv20_graph.o \

             nv40_graph.o nv50_graph.o \

drivers/gpu/drm/nouveau/nouveau_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -930,6 +930,10 @@ extern void nv40_fb_takedown(struct drm_device *); 
extern void nv40_fb_set_region_tiling(struct drm_device *, int, uint32_t,

				      uint32_t, uint32_t);



/* nv50_fb.c */

extern int  nv50_fb_init(struct drm_device *);

extern void nv50_fb_takedown(struct drm_device *);



/* nv04_fifo.c */

extern int  nv04_fifo_init(struct drm_device *);

extern void nv04_fifo_disable(struct drm_device *);

drivers/gpu/drm/nouveau/nouveau_irq.c

+561 −48

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/nouveau/nouveau_state.c

+2 −3
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include "nouveau_drm.h"

#include "nv50_display.h"



static int nouveau_stub_init(struct drm_device *dev) { return 0; }

static void nouveau_stub_takedown(struct drm_device *dev) {}



static int nouveau_init_engine_ptrs(struct drm_device *dev)
@@ -276,8 +275,8 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) 
		engine->timer.init		= nv04_timer_init;

		engine->timer.read		= nv04_timer_read;

		engine->timer.takedown		= nv04_timer_takedown;

		engine->fb.init			= nouveau_stub_init;

		engine->fb.takedown		= nouveau_stub_takedown;

		engine->fb.init			= nv50_fb_init;

		engine->fb.takedown		= nv50_fb_takedown;

		engine->graph.grclass		= nv50_graph_grclass;

		engine->graph.init		= nv50_graph_init;

		engine->graph.takedown		= nv50_graph_takedown;

drivers/gpu/drm/nouveau/nv50_fb.c

0 → 100644
+32 −0
Original line number Diff line number Diff line 
#include "drmP.h"

#include "drm.h"

#include "nouveau_drv.h"

#include "nouveau_drm.h"



int

nv50_fb_init(struct drm_device *dev)

{

	/* This is needed to get meaningful information from 100c90

	 * on traps. No idea what these values mean exactly. */

	struct drm_nouveau_private *dev_priv = dev->dev_private;



	switch (dev_priv->chipset) {

	case 0x50:

		nv_wr32(dev, 0x100c90, 0x0707ff);

		break;

	case 0xa5:

	case 0xa8:

		nv_wr32(dev, 0x100c90, 0x0d0fff);

		break;

	default:

		nv_wr32(dev, 0x100c90, 0x1d07ff);

		break;

	}



	return 0;

}



void

nv50_fb_takedown(struct drm_device *dev)

{

}