diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-06-07 00:21:29 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-06-23 02:00:37 -0400 |
commit | 7375c95b343aa575940704a38482a334ea87ac6c (patch) | |
tree | 5c6c61ceefe74bc5b3aefe810ba6d3cad87c9618 /drivers/gpu/drm/nouveau/nouveau_bo.c | |
parent | e758a3111914af7ee4351be86f1ac0efe87ed06e (diff) |
drm/nouveau: remove 'chan' argument from nouveau_bo_new
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bo.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 36f3137b3ae2..49af4072c0f6 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c | |||
@@ -87,9 +87,9 @@ nouveau_bo_fixup_align(struct nouveau_bo *nvbo, u32 flags, | |||
87 | } | 87 | } |
88 | 88 | ||
89 | int | 89 | int |
90 | nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan, | 90 | nouveau_bo_new(struct drm_device *dev, int size, int align, |
91 | int size, int align, uint32_t flags, uint32_t tile_mode, | 91 | uint32_t flags, uint32_t tile_mode, uint32_t tile_flags, |
92 | uint32_t tile_flags, struct nouveau_bo **pnvbo) | 92 | struct nouveau_bo **pnvbo) |
93 | { | 93 | { |
94 | struct drm_nouveau_private *dev_priv = dev->dev_private; | 94 | struct drm_nouveau_private *dev_priv = dev->dev_private; |
95 | struct nouveau_bo *nvbo; | 95 | struct nouveau_bo *nvbo; |
@@ -123,7 +123,6 @@ nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan, | |||
123 | } | 123 | } |
124 | } | 124 | } |
125 | 125 | ||
126 | nvbo->channel = chan; | ||
127 | ret = ttm_bo_init(&dev_priv->ttm.bdev, &nvbo->bo, size, | 126 | ret = ttm_bo_init(&dev_priv->ttm.bdev, &nvbo->bo, size, |
128 | ttm_bo_type_device, &nvbo->placement, | 127 | ttm_bo_type_device, &nvbo->placement, |
129 | align >> PAGE_SHIFT, 0, false, NULL, size, | 128 | align >> PAGE_SHIFT, 0, false, NULL, size, |
@@ -132,7 +131,6 @@ nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan, | |||
132 | /* ttm will call nouveau_bo_del_ttm if it fails.. */ | 131 | /* ttm will call nouveau_bo_del_ttm if it fails.. */ |
133 | return ret; | 132 | return ret; |
134 | } | 133 | } |
135 | nvbo->channel = NULL; | ||
136 | 134 | ||
137 | *pnvbo = nvbo; | 135 | *pnvbo = nvbo; |
138 | return 0; | 136 | return 0; |