diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-11-02 23:16:18 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-03 00:11:41 -0500 |
commit | 274fec93cdd627408a799519fa602f2eecb14d2f (patch) | |
tree | 1ffc788a096237583608dfa3f09caccfc500ec82 /drivers/gpu/drm/nouveau/nouveau_object.c | |
parent | 5178d40dff23b5eef7f0a3be2411fa6a347e750d (diff) |
drm/nouveau: tidy+move PGRAPH ISRs to their respective *_graph.c files
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_object.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_object.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c index 54078186fe65..94429553433c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_object.c +++ b/drivers/gpu/drm/nouveau/nouveau_object.c | |||
@@ -113,6 +113,24 @@ nouveau_gpuobj_mthd_call(struct nouveau_channel *chan, | |||
113 | return -ENOENT; | 113 | return -ENOENT; |
114 | } | 114 | } |
115 | 115 | ||
116 | int | ||
117 | nouveau_gpuobj_mthd_call2(struct drm_device *dev, int chid, | ||
118 | u32 class, u32 mthd, u32 data) | ||
119 | { | ||
120 | struct drm_nouveau_private *dev_priv = dev->dev_private; | ||
121 | struct nouveau_channel *chan = NULL; | ||
122 | unsigned long flags; | ||
123 | int ret = -EINVAL; | ||
124 | |||
125 | spin_lock_irqsave(&dev_priv->channels.lock, flags); | ||
126 | if (chid > 0 && chid < dev_priv->engine.fifo.channels) | ||
127 | chan = dev_priv->channels.ptr[chid]; | ||
128 | if (chan) | ||
129 | ret = nouveau_gpuobj_mthd_call(chan, class, mthd, data); | ||
130 | spin_unlock_irqrestore(&dev_priv->channels.lock, flags); | ||
131 | return ret; | ||
132 | } | ||
133 | |||
116 | /* NVidia uses context objects to drive drawing operations. | 134 | /* NVidia uses context objects to drive drawing operations. |
117 | 135 | ||
118 | Context objects can be selected into 8 subchannels in the FIFO, | 136 | Context objects can be selected into 8 subchannels in the FIFO, |