aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-03-11 16:19:16 -0500
committerDave Airlie <airlied@redhat.com>2010-03-14 21:27:15 -0400
commit9479c54f0dfa63dad1ecfca897f51693c7c2fa65 (patch)
treefdb89432597e0409ae5cf9d97b0db14bf963fbad /drivers/gpu
parent48e7a5f19fe0c10ebb35be7acf383366d139ee0a (diff)
drm/radeon: unconfuse return value of radeon_asic->clear_surface_reg
No one cares about it, so set it to void. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/radeon.h2
-rw-r--r--drivers/gpu/drm/radeon/radeon_asic.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 67f3c576ab7d..a8552eec0643 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -783,7 +783,7 @@ struct radeon_asic {
783 int (*set_surface_reg)(struct radeon_device *rdev, int reg, 783 int (*set_surface_reg)(struct radeon_device *rdev, int reg,
784 uint32_t tiling_flags, uint32_t pitch, 784 uint32_t tiling_flags, uint32_t pitch,
785 uint32_t offset, uint32_t obj_size); 785 uint32_t offset, uint32_t obj_size);
786 int (*clear_surface_reg)(struct radeon_device *rdev, int reg); 786 void (*clear_surface_reg)(struct radeon_device *rdev, int reg);
787 void (*bandwidth_update)(struct radeon_device *rdev); 787 void (*bandwidth_update)(struct radeon_device *rdev);
788 void (*hpd_init)(struct radeon_device *rdev); 788 void (*hpd_init)(struct radeon_device *rdev);
789 void (*hpd_fini)(struct radeon_device *rdev); 789 void (*hpd_fini)(struct radeon_device *rdev);
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index 2bc26232dc92..4c0d3dab794d 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -73,7 +73,7 @@ int r100_copy_blit(struct radeon_device *rdev,
73int r100_set_surface_reg(struct radeon_device *rdev, int reg, 73int r100_set_surface_reg(struct radeon_device *rdev, int reg,
74 uint32_t tiling_flags, uint32_t pitch, 74 uint32_t tiling_flags, uint32_t pitch,
75 uint32_t offset, uint32_t obj_size); 75 uint32_t offset, uint32_t obj_size);
76int r100_clear_surface_reg(struct radeon_device *rdev, int reg); 76void r100_clear_surface_reg(struct radeon_device *rdev, int reg);
77void r100_bandwidth_update(struct radeon_device *rdev); 77void r100_bandwidth_update(struct radeon_device *rdev);
78void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib); 78void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);
79int r100_ring_test(struct radeon_device *rdev); 79int r100_ring_test(struct radeon_device *rdev);
@@ -212,7 +212,7 @@ int r600_gpu_reset(struct radeon_device *rdev);
212int r600_set_surface_reg(struct radeon_device *rdev, int reg, 212int r600_set_surface_reg(struct radeon_device *rdev, int reg,
213 uint32_t tiling_flags, uint32_t pitch, 213 uint32_t tiling_flags, uint32_t pitch,
214 uint32_t offset, uint32_t obj_size); 214 uint32_t offset, uint32_t obj_size);
215int r600_clear_surface_reg(struct radeon_device *rdev, int reg); 215void r600_clear_surface_reg(struct radeon_device *rdev, int reg);
216void r600_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib); 216void r600_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);
217int r600_ring_test(struct radeon_device *rdev); 217int r600_ring_test(struct radeon_device *rdev);
218int r600_copy_blit(struct radeon_device *rdev, 218int r600_copy_blit(struct radeon_device *rdev,