aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon.h
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2009-10-01 12:02:11 -0400
committerDave Airlie <airlied@redhat.com>2009-10-01 19:33:46 -0400
commit62a8ea3f7bb61e5f92db0a648b7cc566852c36ec (patch)
tree3ffefdbe940c66591dd4863ccf3a766498bf5100 /drivers/gpu/drm/radeon/radeon.h
parentc010f8000a925e08d84d9391e13dd297b9fdc393 (diff)
drm/radeon/kms: Remove old init path as no hw use it anymore
This remove old init path and allow code cleanup, now all hw use the new init path, see top of radeon.h for description of this. 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.h26
1 files changed, 0 insertions, 26 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 2f084e1501d7..902791d2275d 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -590,17 +590,7 @@ struct radeon_asic {
590 void (*fini)(struct radeon_device *rdev); 590 void (*fini)(struct radeon_device *rdev);
591 int (*resume)(struct radeon_device *rdev); 591 int (*resume)(struct radeon_device *rdev);
592 int (*suspend)(struct radeon_device *rdev); 592 int (*suspend)(struct radeon_device *rdev);
593 void (*errata)(struct radeon_device *rdev);
594 void (*vram_info)(struct radeon_device *rdev);
595 int (*gpu_reset)(struct radeon_device *rdev); 593 int (*gpu_reset)(struct radeon_device *rdev);
596 int (*mc_init)(struct radeon_device *rdev);
597 void (*mc_fini)(struct radeon_device *rdev);
598 int (*wb_init)(struct radeon_device *rdev);
599 void (*wb_fini)(struct radeon_device *rdev);
600 int (*gart_init)(struct radeon_device *rdev);
601 void (*gart_fini)(struct radeon_device *rdev);
602 int (*gart_enable)(struct radeon_device *rdev);
603 void (*gart_disable)(struct radeon_device *rdev);
604 void (*gart_tlb_flush)(struct radeon_device *rdev); 594 void (*gart_tlb_flush)(struct radeon_device *rdev);
605 int (*gart_set_page)(struct radeon_device *rdev, int i, uint64_t addr); 595 int (*gart_set_page)(struct radeon_device *rdev, int i, uint64_t addr);
606 int (*cp_init)(struct radeon_device *rdev, unsigned ring_size); 596 int (*cp_init)(struct radeon_device *rdev, unsigned ring_size);
@@ -610,7 +600,6 @@ struct radeon_asic {
610 void (*ring_start)(struct radeon_device *rdev); 600 void (*ring_start)(struct radeon_device *rdev);
611 int (*ring_test)(struct radeon_device *rdev); 601 int (*ring_test)(struct radeon_device *rdev);
612 void (*ring_ib_execute)(struct radeon_device *rdev, struct radeon_ib *ib); 602 void (*ring_ib_execute)(struct radeon_device *rdev, struct radeon_ib *ib);
613 int (*ib_test)(struct radeon_device *rdev);
614 int (*irq_set)(struct radeon_device *rdev); 603 int (*irq_set)(struct radeon_device *rdev);
615 int (*irq_process)(struct radeon_device *rdev); 604 int (*irq_process)(struct radeon_device *rdev);
616 u32 (*get_vblank_counter)(struct radeon_device *rdev, int crtc); 605 u32 (*get_vblank_counter)(struct radeon_device *rdev, int crtc);
@@ -788,7 +777,6 @@ struct radeon_device {
788 bool shutdown; 777 bool shutdown;
789 bool suspend; 778 bool suspend;
790 bool need_dma32; 779 bool need_dma32;
791 bool new_init_path;
792 bool accel_working; 780 bool accel_working;
793 struct radeon_surface_reg surface_regs[RADEON_GEM_MAX_SURFACES]; 781 struct radeon_surface_reg surface_regs[RADEON_GEM_MAX_SURFACES];
794 const struct firmware *me_fw; /* all family ME firmware */ 782 const struct firmware *me_fw; /* all family ME firmware */
@@ -948,27 +936,13 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
948#define radeon_resume(rdev) (rdev)->asic->resume((rdev)) 936#define radeon_resume(rdev) (rdev)->asic->resume((rdev))
949#define radeon_suspend(rdev) (rdev)->asic->suspend((rdev)) 937#define radeon_suspend(rdev) (rdev)->asic->suspend((rdev))
950#define radeon_cs_parse(p) rdev->asic->cs_parse((p)) 938#define radeon_cs_parse(p) rdev->asic->cs_parse((p))
951#define radeon_errata(rdev) (rdev)->asic->errata((rdev))
952#define radeon_vram_info(rdev) (rdev)->asic->vram_info((rdev))
953#define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev)) 939#define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev))
954#define radeon_mc_init(rdev) (rdev)->asic->mc_init((rdev))
955#define radeon_mc_fini(rdev) (rdev)->asic->mc_fini((rdev))
956#define radeon_wb_init(rdev) (rdev)->asic->wb_init((rdev))
957#define radeon_wb_fini(rdev) (rdev)->asic->wb_fini((rdev))
958#define radeon_gpu_gart_init(rdev) (rdev)->asic->gart_init((rdev))
959#define radeon_gpu_gart_fini(rdev) (rdev)->asic->gart_fini((rdev))
960#define radeon_gart_enable(rdev) (rdev)->asic->gart_enable((rdev))
961#define radeon_gart_disable(rdev) (rdev)->asic->gart_disable((rdev))
962#define radeon_gart_tlb_flush(rdev) (rdev)->asic->gart_tlb_flush((rdev)) 940#define radeon_gart_tlb_flush(rdev) (rdev)->asic->gart_tlb_flush((rdev))
963#define radeon_gart_set_page(rdev, i, p) (rdev)->asic->gart_set_page((rdev), (i), (p)) 941#define radeon_gart_set_page(rdev, i, p) (rdev)->asic->gart_set_page((rdev), (i), (p))
964#define radeon_cp_init(rdev,rsize) (rdev)->asic->cp_init((rdev), (rsize))
965#define radeon_cp_fini(rdev) (rdev)->asic->cp_fini((rdev))
966#define radeon_cp_disable(rdev) (rdev)->asic->cp_disable((rdev))
967#define radeon_cp_commit(rdev) (rdev)->asic->cp_commit((rdev)) 942#define radeon_cp_commit(rdev) (rdev)->asic->cp_commit((rdev))
968#define radeon_ring_start(rdev) (rdev)->asic->ring_start((rdev)) 943#define radeon_ring_start(rdev) (rdev)->asic->ring_start((rdev))
969#define radeon_ring_test(rdev) (rdev)->asic->ring_test((rdev)) 944#define radeon_ring_test(rdev) (rdev)->asic->ring_test((rdev))
970#define radeon_ring_ib_execute(rdev, ib) (rdev)->asic->ring_ib_execute((rdev), (ib)) 945#define radeon_ring_ib_execute(rdev, ib) (rdev)->asic->ring_ib_execute((rdev), (ib))
971#define radeon_ib_test(rdev) (rdev)->asic->ib_test((rdev))
972#define radeon_irq_set(rdev) (rdev)->asic->irq_set((rdev)) 946#define radeon_irq_set(rdev) (rdev)->asic->irq_set((rdev))
973#define radeon_irq_process(rdev) (rdev)->asic->irq_process((rdev)) 947#define radeon_irq_process(rdev) (rdev)->asic->irq_process((rdev))
974#define radeon_get_vblank_counter(rdev, crtc) (rdev)->asic->get_vblank_counter((rdev), (crtc)) 948#define radeon_get_vblank_counter(rdev, crtc) (rdev)->asic->get_vblank_counter((rdev), (crtc))