Skip to content

Commit

Permalink
drm/nouveau: log channel debug/error messages from client object rath…
Browse files Browse the repository at this point in the history
…er than drm client

This will make it more obvious which application caused particular messages.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Oct 3, 2012
1 parent aa74c37 commit da07e52
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/gpu/drm/nouveau/nouveau_chan.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ module_param_named(vram_pushbuf, nouveau_vram_pushbuf, int, 0400);
int
nouveau_channel_idle(struct nouveau_channel *chan)
{
struct nouveau_drm *drm = chan->drm;
struct nouveau_cli *cli = chan->cli;
struct nouveau_fence *fence = NULL;
int ret;

Expand All @@ -58,7 +58,7 @@ nouveau_channel_idle(struct nouveau_channel *chan)
}

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;
}

Expand Down Expand Up @@ -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);
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);
if (ret) {
NV_DEBUG(drm, "dma channel create, %d\n", ret);
NV_DEBUG(cli, "dma channel create, %d\n", ret);
return ret;
}
}

ret = nouveau_channel_init(*pchan, arg0, arg1);
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);
return ret;
}
Expand Down

0 comments on commit da07e52

Please sign in to comment.