diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-06-01 05:18:48 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-06-23 01:58:25 -0400 |
commit | e8a863c10f4ca47e942886dddf70c35e3c2d5dd6 (patch) | |
tree | de8d37eb9e33f93c09600e440722a55e355db6b1 /drivers/gpu/drm/nouveau/nouveau_gem.c | |
parent | f8656f0baa316d1f08e224248e0b40ade85a4e80 (diff) |
drm/nouveau: store a per-client channel list
Removes the need to disable IRQs to lookup channel struct on every pushbuf
ioctl, among others.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_gem.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index b52e46018245..2bd8d6da9c3d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c | |||
@@ -139,7 +139,7 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data, | |||
139 | } | 139 | } |
140 | 140 | ||
141 | if (req->channel_hint) { | 141 | if (req->channel_hint) { |
142 | chan = nouveau_channel_get(dev, file_priv, req->channel_hint); | 142 | chan = nouveau_channel_get(file_priv, req->channel_hint); |
143 | if (IS_ERR(chan)) | 143 | if (IS_ERR(chan)) |
144 | return PTR_ERR(chan); | 144 | return PTR_ERR(chan); |
145 | } | 145 | } |
@@ -548,7 +548,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, | |||
548 | struct nouveau_fence *fence = NULL; | 548 | struct nouveau_fence *fence = NULL; |
549 | int i, j, ret = 0, do_reloc = 0; | 549 | int i, j, ret = 0, do_reloc = 0; |
550 | 550 | ||
551 | chan = nouveau_channel_get(dev, file_priv, req->channel); | 551 | chan = nouveau_channel_get(file_priv, req->channel); |
552 | if (IS_ERR(chan)) | 552 | if (IS_ERR(chan)) |
553 | return PTR_ERR(chan); | 553 | return PTR_ERR(chan); |
554 | 554 | ||