diff options
author | Jerome Glisse <jglisse@redhat.com> | 2010-03-09 09:45:11 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-04-05 21:21:04 -0400 |
commit | a2d07b7438f015a0349bc9af3c96a8164549bbc5 (patch) | |
tree | 7e05f0789ab09215efc96f8d2fd49eb61c3cab9f /drivers/gpu/drm/radeon/radeon.h | |
parent | 225758d8ba4fdcc1e8c9cf617fd89529bd4a9596 (diff) |
drm/radeon/kms: rename gpu_reset to asic_reset
Patch rename gpu_reset to asic_reset in prevision of having
gpu_reset doing more stuff than just basic asic reset.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index a3d13c367176..3cc5820b0e1b 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -748,7 +748,7 @@ struct radeon_asic { | |||
748 | int (*suspend)(struct radeon_device *rdev); | 748 | int (*suspend)(struct radeon_device *rdev); |
749 | void (*vga_set_state)(struct radeon_device *rdev, bool state); | 749 | void (*vga_set_state)(struct radeon_device *rdev, bool state); |
750 | bool (*gpu_is_lockup)(struct radeon_device *rdev); | 750 | bool (*gpu_is_lockup)(struct radeon_device *rdev); |
751 | int (*gpu_reset)(struct radeon_device *rdev); | 751 | int (*asic_reset)(struct radeon_device *rdev); |
752 | void (*gart_tlb_flush)(struct radeon_device *rdev); | 752 | void (*gart_tlb_flush)(struct radeon_device *rdev); |
753 | int (*gart_set_page)(struct radeon_device *rdev, int i, uint64_t addr); | 753 | int (*gart_set_page)(struct radeon_device *rdev, int i, uint64_t addr); |
754 | int (*cp_init)(struct radeon_device *rdev, unsigned ring_size); | 754 | int (*cp_init)(struct radeon_device *rdev, unsigned ring_size); |
@@ -1157,7 +1157,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v) | |||
1157 | #define radeon_cs_parse(p) rdev->asic->cs_parse((p)) | 1157 | #define radeon_cs_parse(p) rdev->asic->cs_parse((p)) |
1158 | #define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state)) | 1158 | #define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state)) |
1159 | #define radeon_gpu_is_lockup(rdev) (rdev)->asic->gpu_is_lockup((rdev)) | 1159 | #define radeon_gpu_is_lockup(rdev) (rdev)->asic->gpu_is_lockup((rdev)) |
1160 | #define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev)) | 1160 | #define radeon_asic_reset(rdev) (rdev)->asic->asic_reset((rdev)) |
1161 | #define radeon_gart_tlb_flush(rdev) (rdev)->asic->gart_tlb_flush((rdev)) | 1161 | #define radeon_gart_tlb_flush(rdev) (rdev)->asic->gart_tlb_flush((rdev)) |
1162 | #define radeon_gart_set_page(rdev, i, p) (rdev)->asic->gart_set_page((rdev), (i), (p)) | 1162 | #define radeon_gart_set_page(rdev, i, p) (rdev)->asic->gart_set_page((rdev), (i), (p)) |
1163 | #define radeon_cp_commit(rdev) (rdev)->asic->cp_commit((rdev)) | 1163 | #define radeon_cp_commit(rdev) (rdev)->asic->cp_commit((rdev)) |
@@ -1290,7 +1290,7 @@ extern void r600_scratch_init(struct radeon_device *rdev); | |||
1290 | extern int r600_blit_init(struct radeon_device *rdev); | 1290 | extern int r600_blit_init(struct radeon_device *rdev); |
1291 | extern void r600_blit_fini(struct radeon_device *rdev); | 1291 | extern void r600_blit_fini(struct radeon_device *rdev); |
1292 | extern int r600_init_microcode(struct radeon_device *rdev); | 1292 | extern int r600_init_microcode(struct radeon_device *rdev); |
1293 | extern int r600_gpu_reset(struct radeon_device *rdev); | 1293 | extern int r600_asic_reset(struct radeon_device *rdev); |
1294 | /* r600 irq */ | 1294 | /* r600 irq */ |
1295 | extern int r600_irq_init(struct radeon_device *rdev); | 1295 | extern int r600_irq_init(struct radeon_device *rdev); |
1296 | extern void r600_irq_fini(struct radeon_device *rdev); | 1296 | extern void r600_irq_fini(struct radeon_device *rdev); |