From 29b7cc9ddacda8cd74caae4440204389c1ed15bf Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 31 Aug 2012 13:28:12 -0400 Subject: [PATCH] --- yaml --- r: 329555 b: refs/heads/master c: b9ce0afeef13b18b12caec476f1e6dd76f0f094b h: refs/heads/master i: 329553: d837f6658490bae9227dc6f4c505e686adc37156 329551: 6b7165566fb047aeaa6c4f68a45dc29d2a4a0775 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_asic.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4661205ae8a3..3b7eb5a837bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4755fab5fa949d68e8579eb2e7b73b8e9e75045e +refs/heads/master: b9ce0afeef13b18b12caec476f1e6dd76f0f094b diff --git a/trunk/drivers/gpu/drm/radeon/radeon_asic.h b/trunk/drivers/gpu/drm/radeon/radeon_asic.h index 2b3dd3173022..29b3d0545f94 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_asic.h +++ b/trunk/drivers/gpu/drm/radeon/radeon_asic.h @@ -440,11 +440,10 @@ int cayman_asic_reset(struct radeon_device *rdev); void cayman_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib); int cayman_vm_init(struct radeon_device *rdev); void cayman_vm_fini(struct radeon_device *rdev); -void cayman_vm_unbind(struct radeon_device *rdev, struct radeon_vm *vm); void cayman_vm_flush(struct radeon_device *rdev, struct radeon_ib *ib); uint32_t cayman_vm_page_flags(struct radeon_device *rdev, uint32_t flags); void cayman_vm_set_page(struct radeon_device *rdev, struct radeon_vm *vm, - unsigned pfn, struct ttm_mem_reg *mem, + unsigned pfn, struct ttm_mem_reg *mem, unsigned npages, uint32_t flags); int evergreen_ib_parse(struct radeon_device *rdev, struct radeon_ib *ib);