UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/ltc: switch to subdev printk macros 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:12 +10:00
parent 00c5550710
commit 59e1a2f1a6
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c
View File

@ -92,15 +92,16 @@ gf100_ltc_lts_intr_name[] = {
static void
gf100_ltc_lts_intr(struct nvkm_ltc_priv *ltc, int c, int s)
{
struct nvkm_device *device = ltc->base.subdev.device;
struct nvkm_subdev *subdev = &ltc->base.subdev;
struct nvkm_device *device = subdev->device;
u32 base = 0x141000 + (c * 0x2000) + (s * 0x400);
u32 intr = nvkm_rd32(device, base + 0x020);
u32 stat = intr & 0x0000ffff;
char msg[128];
if (stat) {
nv_info(ltc, "LTC%d_LTS%d:", c, s);
nvkm_bitfield_print(gf100_ltc_lts_intr_name, stat);
pr_cont("\n");
nvkm_snprintbf(msg, sizeof(msg), gf100_ltc_lts_intr_name, stat);
nvkm_error(subdev, "LTC%d_LTS%d: %08x [%s]\n", c, s, stat, msg);
}
nvkm_wr32(device, base + 0x020, intr);

5
drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c
View File

@ -73,12 +73,13 @@ gm107_ltc_zbc_clear_depth(struct nvkm_ltc_priv *ltc, int i, const u32 depth)
static void
gm107_ltc_lts_isr(struct nvkm_ltc_priv *ltc, int c, int s)
{
struct nvkm_device *device = ltc->base.subdev.device;
struct nvkm_subdev *subdev = &ltc->base.subdev;
struct nvkm_device *device = subdev->device;
u32 base = 0x140000 + (c * 0x2000) + (s * 0x400);
u32 stat = nvkm_rd32(device, base + 0x00c);
if (stat) {
nv_info(ltc, "LTC%d_LTS%d: 0x%08x\n", c, s, stat);
nvkm_error(subdev, "LTC%d_LTS%d: %08x\n", c, s, stat);
nvkm_wr32(device, base + 0x00c, stat);
}
}