diff options
author | Christian König <christian.koenig@amd.com> | 2014-06-04 09:29:57 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2014-06-09 22:06:51 -0400 |
commit | 7f90fc965023d72589a4e5fc02ac812e3a6ac809 (patch) | |
tree | 187365b8157da56cd1928ff5d9e5b263f4e73d73 /drivers/gpu/drm/radeon/radeon_asic.h | |
parent | 0986c1a55ca64b44ee126a2f719a6e9f28cbe0ed (diff) |
drm/radeon: remove range check from *_gart_set_page
We never check the return value anyway and if the
index isn't valid would crash way before calling
the functions.
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index 0eab015b2cfb..01e7c0ad8f01 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h | |||
@@ -67,7 +67,8 @@ bool r100_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *cp); | |||
67 | int r100_asic_reset(struct radeon_device *rdev); | 67 | int r100_asic_reset(struct radeon_device *rdev); |
68 | u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc); | 68 | u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc); |
69 | void r100_pci_gart_tlb_flush(struct radeon_device *rdev); | 69 | void r100_pci_gart_tlb_flush(struct radeon_device *rdev); |
70 | int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr); | 70 | void r100_pci_gart_set_page(struct radeon_device *rdev, unsigned i, |
71 | uint64_t addr); | ||
71 | void r100_ring_start(struct radeon_device *rdev, struct radeon_ring *ring); | 72 | void r100_ring_start(struct radeon_device *rdev, struct radeon_ring *ring); |
72 | int r100_irq_set(struct radeon_device *rdev); | 73 | int r100_irq_set(struct radeon_device *rdev); |
73 | int r100_irq_process(struct radeon_device *rdev); | 74 | int r100_irq_process(struct radeon_device *rdev); |
@@ -171,7 +172,8 @@ extern void r300_fence_ring_emit(struct radeon_device *rdev, | |||
171 | struct radeon_fence *fence); | 172 | struct radeon_fence *fence); |
172 | extern int r300_cs_parse(struct radeon_cs_parser *p); | 173 | extern int r300_cs_parse(struct radeon_cs_parser *p); |
173 | extern void rv370_pcie_gart_tlb_flush(struct radeon_device *rdev); | 174 | extern void rv370_pcie_gart_tlb_flush(struct radeon_device *rdev); |
174 | extern int rv370_pcie_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr); | 175 | extern void rv370_pcie_gart_set_page(struct radeon_device *rdev, unsigned i, |
176 | uint64_t addr); | ||
175 | extern void rv370_set_pcie_lanes(struct radeon_device *rdev, int lanes); | 177 | extern void rv370_set_pcie_lanes(struct radeon_device *rdev, int lanes); |
176 | extern int rv370_get_pcie_lanes(struct radeon_device *rdev); | 178 | extern int rv370_get_pcie_lanes(struct radeon_device *rdev); |
177 | extern void r300_set_reg_safe(struct radeon_device *rdev); | 179 | extern void r300_set_reg_safe(struct radeon_device *rdev); |
@@ -206,7 +208,8 @@ extern void rs400_fini(struct radeon_device *rdev); | |||
206 | extern int rs400_suspend(struct radeon_device *rdev); | 208 | extern int rs400_suspend(struct radeon_device *rdev); |
207 | extern int rs400_resume(struct radeon_device *rdev); | 209 | extern int rs400_resume(struct radeon_device *rdev); |
208 | void rs400_gart_tlb_flush(struct radeon_device *rdev); | 210 | void rs400_gart_tlb_flush(struct radeon_device *rdev); |
209 | int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr); | 211 | void rs400_gart_set_page(struct radeon_device *rdev, unsigned i, |
212 | uint64_t addr); | ||
210 | uint32_t rs400_mc_rreg(struct radeon_device *rdev, uint32_t reg); | 213 | uint32_t rs400_mc_rreg(struct radeon_device *rdev, uint32_t reg); |
211 | void rs400_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); | 214 | void rs400_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); |
212 | int rs400_gart_init(struct radeon_device *rdev); | 215 | int rs400_gart_init(struct radeon_device *rdev); |
@@ -229,7 +232,8 @@ int rs600_irq_process(struct radeon_device *rdev); | |||
229 | void rs600_irq_disable(struct radeon_device *rdev); | 232 | void rs600_irq_disable(struct radeon_device *rdev); |
230 | u32 rs600_get_vblank_counter(struct radeon_device *rdev, int crtc); | 233 | u32 rs600_get_vblank_counter(struct radeon_device *rdev, int crtc); |
231 | void rs600_gart_tlb_flush(struct radeon_device *rdev); | 234 | void rs600_gart_tlb_flush(struct radeon_device *rdev); |
232 | int rs600_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr); | 235 | void rs600_gart_set_page(struct radeon_device *rdev, unsigned i, |
236 | uint64_t addr); | ||
233 | uint32_t rs600_mc_rreg(struct radeon_device *rdev, uint32_t reg); | 237 | uint32_t rs600_mc_rreg(struct radeon_device *rdev, uint32_t reg); |
234 | void rs600_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); | 238 | void rs600_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); |
235 | void rs600_bandwidth_update(struct radeon_device *rdev); | 239 | void rs600_bandwidth_update(struct radeon_device *rdev); |