diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-21 17:00:43 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-21 17:00:43 +0800 |
| commit | 0467ad41188031073cbbad1139a916e2439af2f1 (patch) | |
| tree | aff3efec2713270322125cadf07c62b87c5a2127 /shared-core/nouveau_fifo.c | |
| parent | fe4cc50983bdaf51bf29ef041f65e0007f547844 (diff) | |
| parent | e22225416a12c2beab7a5bcb866d214ee212cbc4 (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'shared-core/nouveau_fifo.c')
| -rw-r--r-- | shared-core/nouveau_fifo.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c index 3ffb0516..fd5e46ac 100644 --- a/shared-core/nouveau_fifo.c +++ b/shared-core/nouveau_fifo.c @@ -725,15 +725,16 @@ void nouveau_fifo_cleanup(drm_device_t* dev, DRMFILE filp) nouveau_fifo_init(dev);*/ } -int nouveau_fifo_id_get(drm_device_t* dev, DRMFILE filp) +int +nouveau_fifo_owner(drm_device_t *dev, DRMFILE filp, int channel) { - drm_nouveau_private_t *dev_priv=dev->dev_private; - int i; + drm_nouveau_private_t *dev_priv = dev->dev_private; - for(i=0;i<nouveau_fifo_number(dev);i++) - if (dev_priv->fifos[i].used && dev_priv->fifos[i].filp == filp) - return i; - return -1; + if (channel >= nouveau_fifo_number(dev)) + return 0; + if (dev_priv->fifos[channel].used == 0) + return 0; + return (dev_priv->fifos[channel].filp == filp); } /*********************************** |