diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 05:09:07 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 05:09:07 +1100 |
| commit | eb5487b9ca1d7ce60d5ddc784089d91cf176f439 (patch) | |
| tree | 55309717d95b69223a6c1c815286196c47ccd70c /shared-core/nv50_fifo.c | |
| parent | 2370ded79b4176d76cda1ec5f495fd33c2d566ed (diff) | |
| parent | 7c1e59fb0c5043d3d369f5feb8e195a6a3da3457 (diff) | |
Merge branch 'fifo-cleanup' into upstream-master
Diffstat (limited to 'shared-core/nv50_fifo.c')
| -rw-r--r-- | shared-core/nv50_fifo.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/shared-core/nv50_fifo.c b/shared-core/nv50_fifo.c index f77de6e7..c5cde913 100644 --- a/shared-core/nv50_fifo.c +++ b/shared-core/nv50_fifo.c @@ -213,6 +213,15 @@ nv50_fifo_takedown(struct drm_device *dev) } int +nv50_fifo_channel_id(struct drm_device *dev) +{ + struct drm_nouveau_private *dev_priv = dev->dev_private; + + return (NV_READ(NV03_PFIFO_CACHE1_PUSH1) & + NV50_PFIFO_CACHE1_PUSH1_CHID_MASK); +} + +int nv50_fifo_create_context(struct nouveau_channel *chan) { struct drm_device *dev = chan->dev; |