radeon: fix bandwidth computation on avivo hardware
Subsystems (2)
PATCH 1/1 radeon: fix bandwidth computation on avivo hardware
Fix bandwidth computation and crtc priority in memory controller so that crtc memory request are fullfill in time to avoid display artifact.
Signed-off-by Jerome Glisse <[email protected]>
--- drivers/gpu/drm/radeon/atombios_crtc.c | 276 ++++----- drivers/gpu/drm/radeon/r100.c | 483 ++++++++++++++ drivers/gpu/drm/radeon/r300.c | 1 + drivers/gpu/drm/radeon/r520.c | 14 + drivers/gpu/drm/radeon/radeon.h | 39 ++- drivers/gpu/drm/radeon/radeon_asic.h | 13 + drivers/gpu/drm/radeon/radeon_device.c | 10 +- drivers/gpu/drm/radeon/radeon_display.c | 68 ++- drivers/gpu/drm/radeon/radeon_encoders.c | 369 +----------- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 661 ++++++-------------- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 188 +------ drivers/gpu/drm/radeon/radeon_mode.h | 48 +- drivers/gpu/drm/radeon/radeon_share.h | 39 ++ drivers/gpu/drm/radeon/rs400.c | 1 + drivers/gpu/drm/radeon/rs600.c | 5 + drivers/gpu/drm/radeon/rs690.c | 472 ++++++++++++++ drivers/gpu/drm/radeon/rs690r.h | 99 +++ drivers/gpu/drm/radeon/rv515.c | 774 +++++++++++++++++++---- drivers/gpu/drm/radeon/rv515r.h | 170 +++++ 19 files changed, 2377 insertions(+), 1353 deletions(-) create mode 100644 drivers/gpu/drm/radeon/radeon_share.h create mode 100644 drivers/gpu/drm/radeon/rs690r.h create mode 100644 drivers/gpu/drm/radeon/rv515r.h
drivers/gpu/drm/radeon/atombios_crtc.c +131 -145
@@ -31,6 +31,132 @@#include "atom.h" #include "atom-bits.h" +static void atombios_overscan_setup (struct drm_crtc *crtc, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) +{ +struct drm_device *dev = crtc->dev; +struct radeon_device *rdev = dev->dev_private; +struct radeon_crtc *radeon_crtc =to_radeon_crtc (crtc); +SET_CRTC_OVERSCAN_PS_ALLOCATION args; +int index =GetIndexIntoMasterTable (COMMAND , SetCRTC_OverScan); +int a1, a2; + +memset (&args,0 ,sizeof (args)); + + args.usOverscanRight =0 ; + args.usOverscanLeft =0 ; + args.usOverscanBottom =0 ; + args.usOverscanTop =0 ; + args.ucCRTC = radeon_crtc->crtc_id; + +switch (radeon_crtc->rmx_type) { +case RMX_CENTER : + args.usOverscanTop = (adjusted_mode->crtc_vdisplay - mode->crtc_vdisplay) /2 ; + args.usOverscanBottom = (adjusted_mode->crtc_vdisplay - mode->crtc_vdisplay) /2 ; + args.usOverscanLeft = (adjusted_mode->crtc_hdisplay - mode->crtc_hdisplay) /2 ; + args.usOverscanRight = (adjusted_mode->crtc_hdisplay - mode->crtc_hdisplay) /2 ; +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +break ; +case RMX_ASPECT : + a1 = mode->crtc_vdisplay * adjusted_mode->crtc_hdisplay; + a2 = adjusted_mode->crtc_vdisplay * mode->crtc_hdisplay; + +if (a1 > a2) { + args.usOverscanLeft = (adjusted_mode->crtc_hdisplay - (a2 / mode->crtc_vdisplay)) /2 ; + args.usOverscanRight = (adjusted_mode->crtc_hdisplay - (a2 / mode->crtc_vdisplay)) /2 ; + }else if (a2 > a1) { + args.usOverscanLeft = (adjusted_mode->crtc_vdisplay - (a1 / mode->crtc_hdisplay)) /2 ; + args.usOverscanRight = (adjusted_mode->crtc_vdisplay - (a1 / mode->crtc_hdisplay)) /2 ; + } +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +break ; +case RMX_FULL : +default : + args.usOverscanRight =0 ; + args.usOverscanLeft =0 ; + args.usOverscanBottom =0 ; + args.usOverscanTop =0 ; +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +break ; + } +} + +static void atombios_scaler_setup (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +struct radeon_device *rdev = dev->dev_private; +struct radeon_crtc *radeon_crtc =to_radeon_crtc (crtc); +ENABLE_SCALER_PS_ALLOCATION args; +int index =GetIndexIntoMasterTable (COMMAND , EnableScaler); +/* fixme - fill in enc_priv for atom dac */ +enum radeon_tv_std tv_std =TV_STD_NTSC ; + +if (!ASIC_IS_AVIVO (rdev) && radeon_crtc->crtc_id) +return ; + +memset (&args,0 ,sizeof (args)); + + args.ucScaler = radeon_crtc->crtc_id; + +if (radeon_crtc->devices & (ATOM_DEVICE_TV_SUPPORT )) { +switch (tv_std) { +case TV_STD_NTSC : +default : + args.ucTVStandard =ATOM_TV_NTSC ; +break ; +case TV_STD_PAL : + args.ucTVStandard =ATOM_TV_PAL ; +break ; +case TV_STD_PAL_M : + args.ucTVStandard =ATOM_TV_PALM ; +break ; +case TV_STD_PAL_60 : + args.ucTVStandard =ATOM_TV_PAL60 ; +break ; +case TV_STD_NTSC_J : + args.ucTVStandard =ATOM_TV_NTSCJ ; +break ; +case TV_STD_SCART_PAL : + args.ucTVStandard =ATOM_TV_PAL ;/* ??? */ +break ; +case TV_STD_SECAM : + args.ucTVStandard =ATOM_TV_SECAM ; +break ; +case TV_STD_PAL_CN : + args.ucTVStandard =ATOM_TV_PALCN ; +break ; + } + args.ucEnable =SCALER_ENABLE_MULTITAP_MODE ; + }else if (radeon_crtc->devices & (ATOM_DEVICE_CV_SUPPORT )) { + args.ucTVStandard =ATOM_TV_CV ; + args.ucEnable =SCALER_ENABLE_MULTITAP_MODE ; + }else { +switch (radeon_crtc->rmx_type) { +case RMX_FULL : + args.ucEnable =ATOM_SCALER_EXPANSION ; +break ; +case RMX_CENTER : + args.ucEnable =ATOM_SCALER_CENTER ; +break ; +case RMX_ASPECT : + args.ucEnable =ATOM_SCALER_EXPANSION ; +break ; +default : +if (ASIC_IS_AVIVO (rdev)) + args.ucEnable =ATOM_SCALER_DISABLE ; +else + args.ucEnable =ATOM_SCALER_CENTER ; +break ; + } + } +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +if (radeon_crtc->devices & (ATOM_DEVICE_CV_SUPPORT |ATOM_DEVICE_TV_SUPPORT ) + && rdev->family >=CHIP_RV515 && rdev->family <=CHIP_RV570 ) { +atom_rv515_force_tv_scaler (rdev); + } +} +static void atombios_lock_crtc (struct drm_crtc *crtc,int lock) {struct radeon_crtc *radeon_crtc =to_radeon_crtc (crtc);
@@ -509,6 +635,9 @@ int atombios_crtc_mode_set(struct drm_crtc *crtc,radeon_crtc_set_base (crtc, x, y, old_fb);radeon_legacy_atom_set_surface (crtc); } +atombios_overscan_setup (crtc, mode, adjusted_mode); +atombios_scaler_setup (crtc); +radeon_bandwidth_update (rdev);return 0 ; }
@@ -516,6 +645,8 @@ static bool atombios_crtc_mode_fixup(struct drm_crtc *crtc, struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { +if (!radeon_crtc_scaling_mode_fixup (crtc, mode, adjusted_mode)) +return false;return true; }
@@ -548,148 +679,3 @@ void radeon_atombios_init_crtc(struct drm_device *dev,AVIVO_D2CRTC_H_TOTAL -AVIVO_D1CRTC_H_TOTAL ;drm_crtc_helper_add (&radeon_crtc->base, &atombios_helper_funcs); } - -void radeon_init_disp_bw_avivo (struct drm_device *dev, -struct drm_display_mode *mode1, -uint32_t pixel_bytes1, -struct drm_display_mode *mode2, -uint32_t pixel_bytes2) -{ -struct radeon_device *rdev = dev->dev_private; -fixed20_12 min_mem_eff; -fixed20_12 peak_disp_bw, mem_bw, pix_clk, pix_clk2, temp_ff; -fixed20_12 sclk_ff, mclk_ff; -uint32_t dc_lb_memory_split, temp; - - min_mem_eff.full =rfixed_const_8 (0 ); -if (rdev->disp_priority ==2 ) { -uint32_t mc_init_misc_lat_timer =0 ; -if (rdev->family ==CHIP_RV515 ) - mc_init_misc_lat_timer = -RREG32_MC (RV515_MC_INIT_MISC_LAT_TIMER ); -else if (rdev->family ==CHIP_RS690 ) - mc_init_misc_lat_timer = -RREG32_MC (RS690_MC_INIT_MISC_LAT_TIMER ); - - mc_init_misc_lat_timer &= - ~(R300_MC_DISP1R_INIT_LAT_MASK << -R300_MC_DISP1R_INIT_LAT_SHIFT ); - mc_init_misc_lat_timer &= - ~(R300_MC_DISP0R_INIT_LAT_MASK << -R300_MC_DISP0R_INIT_LAT_SHIFT ); - -if (mode2) - mc_init_misc_lat_timer |= - (1 <<R300_MC_DISP1R_INIT_LAT_SHIFT ); -if (mode1) - mc_init_misc_lat_timer |= - (1 <<R300_MC_DISP0R_INIT_LAT_SHIFT ); - -if (rdev->family ==CHIP_RV515 ) -WREG32_MC (RV515_MC_INIT_MISC_LAT_TIMER , - mc_init_misc_lat_timer); -else if (rdev->family ==CHIP_RS690 ) -WREG32_MC (RS690_MC_INIT_MISC_LAT_TIMER , - mc_init_misc_lat_timer); - } - -/* -* determine is there is enough bw for current mode -*/ - temp_ff.full =rfixed_const (100 ); - mclk_ff.full =rfixed_const (rdev->clock.default_mclk); - mclk_ff.full =rfixed_div (mclk_ff, temp_ff); - sclk_ff.full =rfixed_const (rdev->clock.default_sclk); - sclk_ff.full =rfixed_div (sclk_ff, temp_ff); - - temp = (rdev->mc.vram_width /8 ) * (rdev->mc.vram_is_ddr ?2 :1 ); - temp_ff.full =rfixed_const (temp); - mem_bw.full =rfixed_mul (mclk_ff, temp_ff); - mem_bw.full =rfixed_mul (mem_bw, min_mem_eff); - - pix_clk.full =0 ; - pix_clk2.full =0 ; - peak_disp_bw.full =0 ; -if (mode1) { - temp_ff.full =rfixed_const (1000 ); - pix_clk.full =rfixed_const (mode1->clock);/* convert to fixed point */ - pix_clk.full =rfixed_div (pix_clk, temp_ff); - temp_ff.full =rfixed_const (pixel_bytes1); - peak_disp_bw.full +=rfixed_mul (pix_clk, temp_ff); - } -if (mode2) { - temp_ff.full =rfixed_const (1000 ); - pix_clk2.full =rfixed_const (mode2->clock);/* convert to fixed point */ - pix_clk2.full =rfixed_div (pix_clk2, temp_ff); - temp_ff.full =rfixed_const (pixel_bytes2); - peak_disp_bw.full +=rfixed_mul (pix_clk2, temp_ff); - } - -if (peak_disp_bw.full >= mem_bw.full) { -DRM_ERROR - ("You may not have enough display bandwidth for current mode\n" -"If you have flickering problem, try to lower resolution, refresh rate, or color depth\n" ); -printk ("peak disp bw %d, mem_bw %d\n" , -rfixed_trunc (peak_disp_bw),rfixed_trunc (mem_bw)); - } - -/* -* Line Buffer Setup -* There is a single line buffer shared by both display controllers. -* DC_LB_MEMORY_SPLIT controls how that line buffer is shared between the display -* controllers. The paritioning can either be done manually or via one of four -* preset allocations specified in bits 1:0: -* 0 - line buffer is divided in half and shared between each display controller -* 1 - D1 gets 3/4 of the line buffer, D2 gets 1/4 -* 2 - D1 gets the whole buffer -* 3 - D1 gets 1/4 of the line buffer, D2 gets 3/4 -* Setting bit 2 of DC_LB_MEMORY_SPLIT controls switches to manual allocation mode. -* In manual allocation mode, D1 always starts at 0, D1 end/2 is specified in bits -* 14:4; D2 allocation follows D1. -*/ - -/* is auto or manual better ? */ - dc_lb_memory_split = -RREG32 (AVIVO_DC_LB_MEMORY_SPLIT ) & ~AVIVO_DC_LB_MEMORY_SPLIT_MASK ; - dc_lb_memory_split &= ~AVIVO_DC_LB_MEMORY_SPLIT_SHIFT_MODE ; -#if 1 -/* auto */ -if (mode1 && mode2) { -if (mode1->hdisplay > mode2->hdisplay) { -if (mode1->hdisplay >2560 ) - dc_lb_memory_split |= -AVIVO_DC_LB_MEMORY_SPLIT_D1_3Q_D2_1Q ; -else - dc_lb_memory_split |= -AVIVO_DC_LB_MEMORY_SPLIT_D1HALF_D2HALF ; - }else if (mode2->hdisplay > mode1->hdisplay) { -if (mode2->hdisplay >2560 ) - dc_lb_memory_split |= -AVIVO_DC_LB_MEMORY_SPLIT_D1_1Q_D2_3Q ; -else - dc_lb_memory_split |= -AVIVO_DC_LB_MEMORY_SPLIT_D1HALF_D2HALF ; - }else - dc_lb_memory_split |= -AVIVO_DC_LB_MEMORY_SPLIT_D1HALF_D2HALF ; - }else if (mode1) { - dc_lb_memory_split |=AVIVO_DC_LB_MEMORY_SPLIT_D1_ONLY ; - }else if (mode2) { - dc_lb_memory_split |=AVIVO_DC_LB_MEMORY_SPLIT_D1_1Q_D2_3Q ; - } -#else -/* manual */ - dc_lb_memory_split |=AVIVO_DC_LB_MEMORY_SPLIT_SHIFT_MODE ; - dc_lb_memory_split &= - ~(AVIVO_DC_LB_DISP1_END_ADR_MASK << -AVIVO_DC_LB_DISP1_END_ADR_SHIFT ); -if (mode1) { - dc_lb_memory_split |= - ((((mode1->hdisplay /2 ) +64 ) &AVIVO_DC_LB_DISP1_END_ADR_MASK ) - <<AVIVO_DC_LB_DISP1_END_ADR_SHIFT ); - }else if (mode2) { - dc_lb_memory_split |= (0 <<AVIVO_DC_LB_DISP1_END_ADR_SHIFT ); - } -#endif -WREG32 (AVIVO_DC_LB_MEMORY_SPLIT , dc_lb_memory_split); -}
drivers/gpu/drm/radeon/r100.c +483 -0
486 lines not on this page · raw message
drivers/gpu/drm/radeon/r300.c +1 -0
@@ -30,6 +30,7 @@#include "drm.h" #include "radeon_reg.h" #include "radeon.h" +#include "radeon_share.h" /* r300,r350,rv350,rv370,rv380 depends on : */ void r100_hdp_reset (struct radeon_device *rdev);
drivers/gpu/drm/radeon/r520.c +14 -0
@@ -28,6 +28,7 @@#include "drmP.h" #include "radeon_reg.h" #include "radeon.h" +#include "radeon_share.h" /* r520,rv530,rv560,rv570,r580 depends on : */ void r100_hdp_reset (struct radeon_device *rdev);
@@ -226,7 +227,20 @@ static void r520_vram_get_type(struct radeon_device *rdev)void r520_vram_info (struct radeon_device *rdev) { +fixed20_12 a; +r520_vram_get_type (rdev);r100_vram_init_sizes (rdev); +/* FIXME: we should enforce default clock in case GPU is not in +* default setup +*/ + a.full =rfixed_const (100 ); + rdev->pm.sclk.full =rfixed_const (rdev->clock.default_sclk); + rdev->pm.sclk.full =rfixed_div (rdev->pm.sclk, a); +} + +void r520_bandwidth_update (struct radeon_device *rdev) +{ +rv515_bandwidth_avivo_update (rdev); }
drivers/gpu/drm/radeon/radeon.h +37 -2
@@ -113,6 +113,7 @@ enum radeon_family {CHIP_RV770 ,CHIP_RV730 ,CHIP_RV710 , +CHIP_RS880 , CHIP_LAST, };
@@ -474,6 +475,39 @@ struct radeon_wb {uint64_t gpu_addr; }; +/** +* struct radeon_pm - power management datas +* @max_bandwidth: maximum bandwidth the gpu has (MByte/s) +* @igp_sideport_mclk: sideport memory clock Mhz (rs690,rs740,rs780,rs880) +* @igp_system_mclk: system clock Mhz (rs690,rs740,rs780,rs880) +* @igp_ht_link_clk: ht link clock Mhz (rs690,rs740,rs780,rs880) +* @igp_ht_link_width: ht link width in bits (rs690,rs740,rs780,rs880) +* @k8_bandwidth: k8 bandwidth the gpu has (MByte/s) (IGP) +* @sideport_bandwidth: sideport bandwidth the gpu has (MByte/s) (IGP) +* @ht_bandwidth: ht bandwidth the gpu has (MByte/s) (IGP) +* @core_bandwidth: core GPU bandwidth the gpu has (MByte/s) (IGP) +* @sclk: GPU clock Mhz (core bandwith depends of this clock) +* @needed_bandwidth: current bandwidth needs +* +* It keeps track of various data needed to take powermanagement decision. +* Bandwith need is used to determine minimun clock of the GPU and memory. +* Equation between gpu/memory clock and available bandwidth is hw dependent +* (type of memory, bus size, efficiency, ...) +*/ +struct radeon_pm { +fixed20_12 max_bandwidth; +fixed20_12 igp_sideport_mclk; +fixed20_12 igp_system_mclk; +fixed20_12 igp_ht_link_clk; +fixed20_12 igp_ht_link_width; +fixed20_12 k8_bandwidth; +fixed20_12 sideport_bandwidth; +fixed20_12 ht_bandwidth; +fixed20_12 core_bandwidth; +fixed20_12 sclk; +fixed20_12 needed_bandwidth; +}; +/* * Benchmarking
@@ -535,14 +569,13 @@ struct radeon_asic {void (*set_memory_clock)(struct radeon_device *rdev,uint32_t mem_clock);void (*set_pcie_lanes)(struct radeon_device *rdev,int lanes);void (*set_clock_gating)(struct radeon_device *rdev,int enable); +void (*bandwidth_update)(struct radeon_device *rdev); };union radeon_asic_config {struct r300_asic r300; }; -/* r100 */ -void r100_vram_init_sizes (struct radeon_device *rdev);/* * IOCTL.
@@ -621,6 +654,7 @@ struct radeon_device {struct radeon_irq irq;struct radeon_asic *asic;struct radeon_gem gem; +struct radeon_pm pm;struct mutex cs_mutex;struct radeon_wb wb;bool gpu_lockup;
@@ -801,5 +835,6 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)#define radeon_set_memory_clock (rdev, e) (rdev)->asic->set_engine_clock((rdev), (e))#define radeon_set_pcie_lanes (rdev, l) (rdev)->asic->set_pcie_lanes((rdev), (l))#define radeon_set_clock_gating (rdev, e) (rdev)->asic->set_clock_gating((rdev), (e)) +#define radeon_bandwidth_update (rdev) (rdev)->asic->bandwidth_update((rdev))#endif
drivers/gpu/drm/radeon/radeon_asic.h +13 -0
@@ -71,6 +71,7 @@ int r100_copy_blit(struct radeon_device *rdev,uint64_t dst_offset, unsigned num_pages, struct radeon_fence *fence); +void r100_bandwidth_update (struct radeon_device *rdev);static struct radeon_asic r100_asic = { .init = &r100_init,
@@ -100,6 +101,7 @@ static struct radeon_asic r100_asic = { .set_memory_clock = NULL, .set_pcie_lanes = NULL, .set_clock_gating = &radeon_legacy_set_clock_gating, + .bandwidth_update = &r100_bandwidth_update, };
@@ -156,6 +158,7 @@ static struct radeon_asic r300_asic = { .set_memory_clock = NULL, .set_pcie_lanes = &rv370_set_pcie_lanes, .set_clock_gating = &radeon_legacy_set_clock_gating, + .bandwidth_update = &r100_bandwidth_update, };/*
@@ -193,6 +196,7 @@ static struct radeon_asic r420_asic = { .set_memory_clock = &radeon_atom_set_memory_clock, .set_pcie_lanes = &rv370_set_pcie_lanes, .set_clock_gating = &radeon_atom_set_clock_gating, + .bandwidth_update = &r100_bandwidth_update, };
@@ -237,6 +241,7 @@ static struct radeon_asic rs400_asic = { .set_memory_clock = NULL, .set_pcie_lanes = NULL, .set_clock_gating = &radeon_legacy_set_clock_gating, + .bandwidth_update = &r100_bandwidth_update, };
@@ -254,6 +259,7 @@ void rs600_gart_tlb_flush(struct radeon_device *rdev);int rs600_gart_set_page (struct radeon_device *rdev,int i,uint64_t addr);uint32_t rs600_mc_rreg (struct radeon_device *rdev,uint32_t reg);void rs600_mc_wreg (struct radeon_device *rdev,uint32_t reg,uint32_t v); +void rs600_bandwidth_update (struct radeon_device *rdev);static struct radeon_asic rs600_asic = { .init = &r300_init, .errata = &rs600_errata,
@@ -282,6 +288,7 @@ static struct radeon_asic rs600_asic = { .set_memory_clock = &radeon_atom_set_memory_clock, .set_pcie_lanes = NULL, .set_clock_gating = &radeon_atom_set_clock_gating, + .bandwidth_update = &rs600_bandwidth_update, };
@@ -294,6 +301,7 @@ int rs690_mc_init(struct radeon_device *rdev);void rs690_mc_fini (struct radeon_device *rdev);uint32_t rs690_mc_rreg (struct radeon_device *rdev,uint32_t reg);void rs690_mc_wreg (struct radeon_device *rdev,uint32_t reg,uint32_t v); +void rs690_bandwidth_update (struct radeon_device *rdev);static struct radeon_asic rs690_asic = { .init = &r300_init, .errata = &rs690_errata,
@@ -322,6 +330,7 @@ static struct radeon_asic rs690_asic = { .set_memory_clock = &radeon_atom_set_memory_clock, .set_pcie_lanes = NULL, .set_clock_gating = &radeon_atom_set_clock_gating, + .bandwidth_update = &rs690_bandwidth_update, };
@@ -339,6 +348,7 @@ void rv515_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);void rv515_ring_start (struct radeon_device *rdev);uint32_t rv515_pcie_rreg (struct radeon_device *rdev,uint32_t reg);void rv515_pcie_wreg (struct radeon_device *rdev,uint32_t reg,uint32_t v); +void rv515_bandwidth_update (struct radeon_device *rdev);static struct radeon_asic rv515_asic = { .init = &rv515_init, .errata = &rv515_errata,
@@ -367,6 +377,7 @@ static struct radeon_asic rv515_asic = { .set_memory_clock = &radeon_atom_set_memory_clock, .set_pcie_lanes = &rv370_set_pcie_lanes, .set_clock_gating = &radeon_atom_set_clock_gating, + .bandwidth_update = &rv515_bandwidth_update, };
@@ -377,6 +388,7 @@ void r520_errata(struct radeon_device *rdev);void r520_vram_info (struct radeon_device *rdev);int r520_mc_init (struct radeon_device *rdev);void r520_mc_fini (struct radeon_device *rdev); +void r520_bandwidth_update (struct radeon_device *rdev);static struct radeon_asic r520_asic = { .init = &rv515_init, .errata = &r520_errata,
@@ -405,6 +417,7 @@ static struct radeon_asic r520_asic = { .set_memory_clock = &radeon_atom_set_memory_clock, .set_pcie_lanes = &rv370_set_pcie_lanes, .set_clock_gating = &radeon_atom_set_clock_gating, + .bandwidth_update = &r520_bandwidth_update, };/*
drivers/gpu/drm/radeon/radeon_device.c +5 -5
@@ -559,6 +559,11 @@ int radeon_device_init(struct radeon_device *rdev,radeon_combios_asic_init (rdev->ddev); } } +/* Initialize clocks */ + r =radeon_clocks_init (rdev); +if (r) { +return r; + }/* Get vram informations */ radeon_vram_info (rdev);
@@ -570,11 +575,6 @@ int radeon_device_init(struct radeon_device *rdev, (unsigned)rdev->mc.aper_size >> 20);DRM_INFO ("RAM width %dbits %cDR\n" , rdev->mc.vram_width, rdev->mc.vram_is_ddr ?'D' :'S' ); -/* Initialize clocks */ - r =radeon_clocks_init (rdev); -if (r) { -return r; - }/* Initialize memory controller (also test AGP) */ r =radeon_mc_init (rdev);if (r) {
drivers/gpu/drm/radeon/radeon_display.c +42 -26
84 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_encoders.c +4 -365
417 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_legacy_crtc.c +181 -480
687 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_legacy_encoders.c +4 -184
254 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_mode.h +24 -24
71 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_share.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* Copyright 2008 Advanced Micro Devices, Inc. +* Copyright 2008 Red Hat Inc. +* Copyright 2009 Jerome Glisse. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: Dave Airlie +* Alex Deucher +* Jerome Glisse +*/ +#ifndef __RADEON_SHARE_H__ +#define __RADEON_SHARE_H__ + +void r100_vram_init_sizes (struct radeon_device *rdev); + +void rs690_line_buffer_adjust (struct radeon_device *rdev, +struct drm_display_mode *mode1, +struct drm_display_mode *mode2); + +void rv515_bandwidth_avivo_update (struct radeon_device *rdev); + +#endif
drivers/gpu/drm/radeon/rs400.c +1 -0
@@ -29,6 +29,7 @@#include <drm/drmP.h> #include "radeon_reg.h" #include "radeon.h" +#include "radeon_share.h" /* rs400,rs480 depends on : */ void r100_hdp_reset (struct radeon_device *rdev);
drivers/gpu/drm/radeon/rs600.c +5 -0
@@ -301,6 +301,11 @@ void rs600_vram_info(struct radeon_device *rdev) rdev->mc.vram_width =128 ; } +void rs600_bandwidth_update (struct radeon_device *rdev) +{ +/* FIXME: implement, should this be like rs690 ? */ +} +/* * Indirect registers accessor
drivers/gpu/drm/radeon/rs690.c +472 -0
426 lines not on this page · raw message
drivers/gpu/drm/radeon/rs690r.h new file +99 -0
99 lines not on this page · raw message
drivers/gpu/drm/radeon/rv515.c +652 -122
774 lines not on this page · raw message
drivers/gpu/drm/radeon/rv515r.h new file +170 -0
170 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.6.2.2
Part of the diff is not shown here. View the raw message.