From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: Re: [PATCH 1/7] radeon: consolidate asic-specific function decls for pre-r600 Date: Mon, 29 Nov 2010 10:29:10 -0500 Message-ID: References: <1290967575-22705-1-git-send-email-daniel.vetter@ffwll.ch> <1290967575-22705-2-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-fx0-f49.google.com (mail-fx0-f49.google.com [209.85.161.49]) by gabe.freedesktop.org (Postfix) with ESMTP id B0E829E8B4 for ; Mon, 29 Nov 2010 07:29:12 -0800 (PST) Received: by fxm19 with SMTP id 19so90518fxm.36 for ; Mon, 29 Nov 2010 07:29:10 -0800 (PST) In-Reply-To: <1290967575-22705-2-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Daniel Vetter Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Sun, Nov 28, 2010 at 1:06 PM, Daniel Vetter wro= te: > Move them to radeon_asic.h together with the other asic > specific stuff. > > Signed-off-by: Daniel Vetter Looks good to me. Reviewed-by: Alex Deucher > --- > =A0drivers/gpu/drm/radeon/radeon.h =A0 =A0 =A0| =A0 59 ------------------= ---------------- > =A0drivers/gpu/drm/radeon/radeon_asic.h | =A0 53 ++++++++++++++++++++++++= ++++-- > =A02 files changed, 50 insertions(+), 62 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/rad= eon.h > index 32d6396..75b9585 100644 > --- a/drivers/gpu/drm/radeon/radeon.h > +++ b/drivers/gpu/drm/radeon/radeon.h > @@ -1433,65 +1433,6 @@ extern void radeon_gtt_location(struct radeon_devi= ce *rdev, struct radeon_mc *mc > =A0extern int radeon_resume_kms(struct drm_device *dev); > =A0extern int radeon_suspend_kms(struct drm_device *dev, pm_message_t sta= te); > > -/* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */ > -extern void r100_gpu_lockup_update(struct r100_gpu_lockup *lockup, struc= t radeon_cp *cp); > -extern bool r100_gpu_cp_is_lockup(struct radeon_device *rdev, struct r10= 0_gpu_lockup *lockup, struct radeon_cp *cp); > - > -/* rv200,rv250,rv280 */ > -extern void r200_set_safe_registers(struct radeon_device *rdev); > - > -/* r300,r350,rv350,rv370,rv380 */ > -extern void r300_set_reg_safe(struct radeon_device *rdev); > -extern void r300_mc_program(struct radeon_device *rdev); > -extern void r300_mc_init(struct radeon_device *rdev); > -extern void r300_clock_startup(struct radeon_device *rdev); > -extern int r300_mc_wait_for_idle(struct radeon_device *rdev); > -extern int rv370_pcie_gart_init(struct radeon_device *rdev); > -extern void rv370_pcie_gart_fini(struct radeon_device *rdev); > -extern int rv370_pcie_gart_enable(struct radeon_device *rdev); > -extern void rv370_pcie_gart_disable(struct radeon_device *rdev); > - > -/* r420,r423,rv410 */ > -extern u32 r420_mc_rreg(struct radeon_device *rdev, u32 reg); > -extern void r420_mc_wreg(struct radeon_device *rdev, u32 reg, u32 v); > -extern int r420_debugfs_pipes_info_init(struct radeon_device *rdev); > -extern void r420_pipes_init(struct radeon_device *rdev); > - > -/* rv515 */ > -struct rv515_mc_save { > - =A0 =A0 =A0 u32 d1vga_control; > - =A0 =A0 =A0 u32 d2vga_control; > - =A0 =A0 =A0 u32 vga_render_control; > - =A0 =A0 =A0 u32 vga_hdp_control; > - =A0 =A0 =A0 u32 d1crtc_control; > - =A0 =A0 =A0 u32 d2crtc_control; > -}; > -extern void rv515_bandwidth_avivo_update(struct radeon_device *rdev); > -extern void rv515_vga_render_disable(struct radeon_device *rdev); > -extern void rv515_set_safe_registers(struct radeon_device *rdev); > -extern void rv515_mc_stop(struct radeon_device *rdev, struct rv515_mc_sa= ve *save); > -extern void rv515_mc_resume(struct radeon_device *rdev, struct rv515_mc_= save *save); > -extern void rv515_clock_startup(struct radeon_device *rdev); > -extern void rv515_debugfs(struct radeon_device *rdev); > -extern int rv515_suspend(struct radeon_device *rdev); > - > -/* rs400 */ > -extern int rs400_gart_init(struct radeon_device *rdev); > -extern int rs400_gart_enable(struct radeon_device *rdev); > -extern void rs400_gart_adjust_size(struct radeon_device *rdev); > -extern void rs400_gart_disable(struct radeon_device *rdev); > -extern void rs400_gart_fini(struct radeon_device *rdev); > - > -/* rs600 */ > -extern void rs600_set_safe_registers(struct radeon_device *rdev); > -extern int rs600_irq_set(struct radeon_device *rdev); > -extern void rs600_irq_disable(struct radeon_device *rdev); > - > -/* rs690, rs740 */ > -extern void rs690_line_buffer_adjust(struct radeon_device *rdev, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 struct drm_display_mode *mode1, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 struct drm_display_mode *mode2); > - > =A0/* r600, rv610, rv630, rv620, rv635, rv670, rs780, rs880 */ > =A0extern bool r600_card_posted(struct radeon_device *rdev); > =A0extern void r600_cp_stop(struct radeon_device *rdev); > diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeo= n/radeon_asic.h > index 4970eda..a5fddcd 100644 > --- a/drivers/gpu/drm/radeon/radeon_asic.h > +++ b/drivers/gpu/drm/radeon/radeon_asic.h > @@ -102,6 +102,11 @@ int r100_pci_gart_enable(struct radeon_device *rdev); > =A0void r100_pci_gart_disable(struct radeon_device *rdev); > =A0int r100_debugfs_mc_info_init(struct radeon_device *rdev); > =A0int r100_gui_wait_for_idle(struct radeon_device *rdev); > +void r100_gpu_lockup_update(struct r100_gpu_lockup *lockup, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct radeon_cp *c= p); > +bool r100_gpu_cp_is_lockup(struct radeon_device *rdev, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct r100_gpu_lock= up *lockup, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct radeon_cp *cp= ); > =A0void r100_ib_fini(struct radeon_device *rdev); > =A0int r100_ib_init(struct radeon_device *rdev); > =A0void r100_irq_disable(struct radeon_device *rdev); > @@ -138,10 +143,11 @@ extern void r100_post_page_flip(struct radeon_devic= e *rdev, int crtc); > =A0* r200,rv250,rs300,rv280 > =A0*/ > =A0extern int r200_copy_dma(struct radeon_device *rdev, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 uint64_t src_offset, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 uint64_t dst_offset, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 unsigned num_pages, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0uint64_t src_offset, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0uint64_t dst_offset, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0unsigned num_pages, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct radeon_fence *fenc= e); > +void r200_set_safe_registers(struct radeon_device *rdev); > > =A0/* > =A0* r300,r350,rv350,rv380 > @@ -162,6 +168,15 @@ extern uint32_t rv370_pcie_rreg(struct radeon_device= *rdev, uint32_t reg); > =A0extern void rv370_pcie_wreg(struct radeon_device *rdev, uint32_t reg, = uint32_t v); > =A0extern void rv370_set_pcie_lanes(struct radeon_device *rdev, int lanes= ); > =A0extern int rv370_get_pcie_lanes(struct radeon_device *rdev); > +extern void r300_set_reg_safe(struct radeon_device *rdev); > +extern void r300_mc_program(struct radeon_device *rdev); > +extern void r300_mc_init(struct radeon_device *rdev); > +extern void r300_clock_startup(struct radeon_device *rdev); > +extern int r300_mc_wait_for_idle(struct radeon_device *rdev); > +extern int rv370_pcie_gart_init(struct radeon_device *rdev); > +extern void rv370_pcie_gart_fini(struct radeon_device *rdev); > +extern int rv370_pcie_gart_enable(struct radeon_device *rdev); > +extern void rv370_pcie_gart_disable(struct radeon_device *rdev); > > =A0/* > =A0* r420,r423,rv410 > @@ -171,6 +186,10 @@ extern void r420_fini(struct radeon_device *rdev); > =A0extern int r420_suspend(struct radeon_device *rdev); > =A0extern int r420_resume(struct radeon_device *rdev); > =A0extern void r420_pm_init_profile(struct radeon_device *rdev); > +extern u32 r420_mc_rreg(struct radeon_device *rdev, u32 reg); > +extern void r420_mc_wreg(struct radeon_device *rdev, u32 reg, u32 v); > +extern int r420_debugfs_pipes_info_init(struct radeon_device *rdev); > +extern void r420_pipes_init(struct radeon_device *rdev); > > =A0/* > =A0* rs400,rs480 > @@ -183,6 +202,12 @@ void rs400_gart_tlb_flush(struct radeon_device *rdev= ); > =A0int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t ad= dr); > =A0uint32_t rs400_mc_rreg(struct radeon_device *rdev, uint32_t reg); > =A0void rs400_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t = v); > +int rs400_gart_init(struct radeon_device *rdev); > +int rs400_gart_enable(struct radeon_device *rdev); > +void rs400_gart_adjust_size(struct radeon_device *rdev); > +void rs400_gart_disable(struct radeon_device *rdev); > +void rs400_gart_fini(struct radeon_device *rdev); > + > > =A0/* > =A0* rs600. > @@ -194,6 +219,7 @@ extern int rs600_suspend(struct radeon_device *rdev); > =A0extern int rs600_resume(struct radeon_device *rdev); > =A0int rs600_irq_set(struct radeon_device *rdev); > =A0int rs600_irq_process(struct radeon_device *rdev); > +void rs600_irq_disable(struct radeon_device *rdev); > =A0u32 rs600_get_vblank_counter(struct radeon_device *rdev, int crtc); > =A0void rs600_gart_tlb_flush(struct radeon_device *rdev); > =A0int rs600_gart_set_page(struct radeon_device *rdev, int i, uint64_t ad= dr); > @@ -211,6 +237,8 @@ extern void rs600_pm_finish(struct radeon_device *rde= v); > =A0extern void rs600_pre_page_flip(struct radeon_device *rdev, int crtc); > =A0extern u32 rs600_page_flip(struct radeon_device *rdev, int crtc, u64 c= rtc_base); > =A0extern void rs600_post_page_flip(struct radeon_device *rdev, int crtc); > +void rs600_set_safe_registers(struct radeon_device *rdev); > + > > =A0/* > =A0* rs690,rs740 > @@ -222,10 +250,21 @@ int rs690_suspend(struct radeon_device *rdev); > =A0uint32_t rs690_mc_rreg(struct radeon_device *rdev, uint32_t reg); > =A0void rs690_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t = v); > =A0void rs690_bandwidth_update(struct radeon_device *rdev); > +void rs690_line_buffer_adjust(struct radeon_device *rdev, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 struct drm_display_mode *mode1, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 struct drm_display_mode *mode2); > > =A0/* > =A0* rv515 > =A0*/ > +struct rv515_mc_save { > + =A0 =A0 =A0 u32 d1vga_control; > + =A0 =A0 =A0 u32 d2vga_control; > + =A0 =A0 =A0 u32 vga_render_control; > + =A0 =A0 =A0 u32 vga_hdp_control; > + =A0 =A0 =A0 u32 d1crtc_control; > + =A0 =A0 =A0 u32 d2crtc_control; > +}; > =A0int rv515_init(struct radeon_device *rdev); > =A0void rv515_fini(struct radeon_device *rdev); > =A0uint32_t rv515_mc_rreg(struct radeon_device *rdev, uint32_t reg); > @@ -236,6 +275,14 @@ void rv515_pcie_wreg(struct radeon_device *rdev, uin= t32_t reg, uint32_t v); > =A0void rv515_bandwidth_update(struct radeon_device *rdev); > =A0int rv515_resume(struct radeon_device *rdev); > =A0int rv515_suspend(struct radeon_device *rdev); > +void rv515_bandwidth_avivo_update(struct radeon_device *rdev); > +void rv515_vga_render_disable(struct radeon_device *rdev); > +void rv515_set_safe_registers(struct radeon_device *rdev); > +void rv515_mc_stop(struct radeon_device *rdev, struct rv515_mc_save *sav= e); > +void rv515_mc_resume(struct radeon_device *rdev, struct rv515_mc_save *s= ave); > +void rv515_clock_startup(struct radeon_device *rdev); > +void rv515_debugfs(struct radeon_device *rdev); > + > > =A0/* > =A0* r520,rv530,rv560,rv570,r580 > -- > 1.7.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >