Commit 86b40432 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/ltc/gm107-: decode interrupt status to human-readable strings 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent b1687b3e

drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
 */

#include "priv.h"



#include <core/enum.h>

#include <subdev/fb.h>

#include <subdev/timer.h>
@@ -71,7 +70,7 @@ gf100_ltc_zbc_clear_depth(struct nvkm_ltc *ltc, int i, const u32 depth) 
	nvkm_wr32(device, 0x17ea58, depth);

}



static const struct nvkm_bitfield

const struct nvkm_bitfield

gf100_ltc_lts_intr_name[] = {

	{ 0x00000001, "IDLE_ERROR_IQ" },

	{ 0x00000002, "IDLE_ERROR_CBC" },

drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c

+7 −3
Original line number Diff line number Diff line
@@ -74,12 +74,16 @@ gm107_ltc_intr_lts(struct nvkm_ltc *ltc, int c, int s) 
	struct nvkm_subdev *subdev = &ltc->subdev;

	struct nvkm_device *device = subdev->device;

	u32 base = 0x140400 + (c * 0x2000) + (s * 0x200);

	u32 stat = nvkm_rd32(device, base + 0x00c);

	u32 intr = nvkm_rd32(device, base + 0x00c);

	u16 stat = intr & 0x0000ffff;

	char msg[128];



	if (stat) {

		nvkm_error(subdev, "LTC%d_LTS%d: %08x\n", c, s, stat);

		nvkm_wr32(device, base + 0x00c, stat);

		nvkm_snprintbf(msg, sizeof(msg), gf100_ltc_lts_intr_name, stat);

		nvkm_error(subdev, "LTC%d_LTS%d: %08x [%s]\n", c, s, intr, msg);

	}



	nvkm_wr32(device, base + 0x00c, intr);

}



void

drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __NVKM_LTC_PRIV_H__

#define nvkm_ltc(p) container_of((p), struct nvkm_ltc, subdev)

#include <subdev/ltc.h>

#include <core/enum.h>



int nvkm_ltc_new_(const struct nvkm_ltc_func *, struct nvkm_device *,

		  int index, struct nvkm_ltc **);
@@ -31,6 +32,7 @@ void gf100_ltc_zbc_clear_color(struct nvkm_ltc *, int, const u32[4]); 
void gf100_ltc_zbc_clear_depth(struct nvkm_ltc *, int, const u32);

void gf100_ltc_invalidate(struct nvkm_ltc *);

void gf100_ltc_flush(struct nvkm_ltc *);

extern const struct nvkm_bitfield gf100_ltc_lts_intr_name[];



void gm107_ltc_intr(struct nvkm_ltc *);

void gm107_ltc_cbc_clear(struct nvkm_ltc *, u32, u32);