diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-03-04 09:58:36 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-03-04 11:07:19 +1000 |
| commit | 73412c3854c877e5f37ad944ee8977addde4d35a (patch) | |
| tree | e47e7d021449b6c2d0a9b566cbc8d92f84d466cc /drivers/gpu/drm/nouveau/nouveau_drv.h | |
| parent | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff) | |
| download | kernel_samsung_smdk4412-73412c3854c877e5f37ad944ee8977addde4d35a.zip kernel_samsung_smdk4412-73412c3854c877e5f37ad944ee8977addde4d35a.tar.gz kernel_samsung_smdk4412-73412c3854c877e5f37ad944ee8977addde4d35a.tar.bz2 | |
drm/nouveau: allocate kernel's notifier object at end of block
The nv30/nv40 3d driver is about to start using DMA_FENCE from the 3D
object which, it turns out, doesn't like its DMA object to not be
aligned to a 4KiB boundary.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 9821fca..982d70b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -852,7 +852,8 @@ extern const struct ttm_mem_type_manager_func nouveau_vram_manager; extern int nouveau_notifier_init_channel(struct nouveau_channel *); extern void nouveau_notifier_takedown_channel(struct nouveau_channel *); extern int nouveau_notifier_alloc(struct nouveau_channel *, uint32_t handle, - int cout, uint32_t *offset); + int cout, uint32_t start, uint32_t end, + uint32_t *offset); extern int nouveau_notifier_offset(struct nouveau_gpuobj *, uint32_t *); extern int nouveau_ioctl_notifier_alloc(struct drm_device *, void *data, struct drm_file *); |