Commit da07e52c authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau: log channel debug/error messages from client object rather than drm client

This will make it more obvious which application caused particular messages.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent aa74c375
...@@ -47,7 +47,7 @@ module_param_named(vram_pushbuf, nouveau_vram_pushbuf, int, 0400); ...@@ -47,7 +47,7 @@ module_param_named(vram_pushbuf, nouveau_vram_pushbuf, int, 0400);
int int
nouveau_channel_idle(struct nouveau_channel *chan) nouveau_channel_idle(struct nouveau_channel *chan)
{ {
struct nouveau_drm *drm = chan->drm; struct nouveau_cli *cli = chan->cli;
struct nouveau_fence *fence = NULL; struct nouveau_fence *fence = NULL;
int ret; int ret;
...@@ -58,7 +58,7 @@ nouveau_channel_idle(struct nouveau_channel *chan) ...@@ -58,7 +58,7 @@ nouveau_channel_idle(struct nouveau_channel *chan)
} }
if (ret) if (ret)
NV_ERROR(drm, "failed to idle channel 0x%08x\n", chan->handle); NV_ERROR(cli, "failed to idle channel 0x%08x\n", chan->handle);
return ret; return ret;
} }
...@@ -381,17 +381,17 @@ nouveau_channel_new(struct nouveau_drm *drm, struct nouveau_cli *cli, ...@@ -381,17 +381,17 @@ nouveau_channel_new(struct nouveau_drm *drm, struct nouveau_cli *cli,
ret = nouveau_channel_ind(drm, cli, parent, handle, arg0, pchan); ret = nouveau_channel_ind(drm, cli, parent, handle, arg0, pchan);
if (ret) { if (ret) {
NV_DEBUG(drm, "ib channel create, %d\n", ret); NV_DEBUG(cli, "ib channel create, %d\n", ret);
ret = nouveau_channel_dma(drm, cli, parent, handle, pchan); ret = nouveau_channel_dma(drm, cli, parent, handle, pchan);
if (ret) { if (ret) {
NV_DEBUG(drm, "dma channel create, %d\n", ret); NV_DEBUG(cli, "dma channel create, %d\n", ret);
return ret; return ret;
} }
} }
ret = nouveau_channel_init(*pchan, arg0, arg1); ret = nouveau_channel_init(*pchan, arg0, arg1);
if (ret) { if (ret) {
NV_ERROR(drm, "channel failed to initialise, %d\n", ret); NV_ERROR(cli, "channel failed to initialise, %d\n", ret);
nouveau_channel_del(pchan); nouveau_channel_del(pchan);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment