drm/radeon/kms: implement reading active PCIE lanes on R600+
Subsystems (2)
PATCH v2 1/1 drm/radeon/kms: implement reading active PCIE lanes on R600+
Signed-off-by Rafał Miłecki <[email protected]>
---
V2: use already implemented functions for reading/writing PCIE PORT
Thanks Alex for reviewing!
--- drivers/gpu/drm/radeon/r300.c | 5 ++++- drivers/gpu/drm/radeon/radeon.h | 2 ++ drivers/gpu/drm/radeon/radeon_asic.h | 4 ++-- drivers/gpu/drm/radeon/radeon_pm.c | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/r300.c +4 -1
@@ -549,7 +549,10 @@ int rv370_get_pcie_lanes(struct radeon_device *rdev)/* FIXME wait for idle */ - link_width_cntl =RREG32_PCIE (RADEON_PCIE_LC_LINK_WIDTH_CNTL ); +if (rdev->family <CHIP_R600 ) + link_width_cntl =RREG32_PCIE (RADEON_PCIE_LC_LINK_WIDTH_CNTL ); +else + link_width_cntl =RREG32_PCIE_P (RADEON_PCIE_LC_LINK_WIDTH_CNTL );switch ((link_width_cntl &RADEON_PCIE_LC_LINK_WIDTH_RD_MASK ) >>RADEON_PCIE_LC_LINK_WIDTH_RD_SHIFT ) {case RADEON_PCIE_LC_LINK_WIDTH_X0 :
drivers/gpu/drm/radeon/radeon.h +2 -0
@@ -1014,6 +1014,8 @@ static inline void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32#define WREG32_MC (reg, v) rdev->mc_wreg(rdev, (reg), (v))#define RREG32_PCIE (reg) rv370_pcie_rreg(rdev, (reg))#define WREG32_PCIE (reg, v) rv370_pcie_wreg(rdev, (reg), (v)) +#define RREG32_PCIE_P (reg) rdev->pciep_rreg(rdev, (reg)) +#define WREG32_PCIE_P (reg, v) rdev->pciep_rreg(rdev, (reg), (v))#define WREG32_P (reg, val, mask) \ do { \ uint32_t tmp_ = RREG32(reg); \
drivers/gpu/drm/radeon/radeon_asic.h +2 -2
@@ -626,7 +626,7 @@ static struct radeon_asic r600_asic = { .set_engine_clock = &radeon_atom_set_engine_clock, .get_memory_clock = &radeon_atom_get_memory_clock, .set_memory_clock = &radeon_atom_set_memory_clock, - .get_pcie_lanes = NULL, + .get_pcie_lanes = &rv370_get_pcie_lanes, .set_pcie_lanes = NULL, .set_clock_gating = NULL, .set_surface_reg = r600_set_surface_reg,
@@ -672,7 +672,7 @@ static struct radeon_asic rv770_asic = { .set_engine_clock = &radeon_atom_set_engine_clock, .get_memory_clock = &radeon_atom_get_memory_clock, .set_memory_clock = &radeon_atom_set_memory_clock, - .get_pcie_lanes = NULL, + .get_pcie_lanes = &rv370_get_pcie_lanes, .set_pcie_lanes = NULL, .set_clock_gating = &radeon_atom_set_clock_gating, .set_surface_reg = r600_set_surface_reg,
drivers/gpu/drm/radeon/radeon_pm.c +2 -0
@@ -442,6 +442,8 @@ static int radeon_debugfs_pm_info(struct seq_file *m, void *data)seq_printf (m,"default memory clock: %u0 kHz\n" , rdev->clock.default_mclk);if (rdev->asic->get_memory_clock)seq_printf (m,"current memory clock: %u0 kHz\n" ,radeon_get_memory_clock (rdev)); +if (rdev->asic->get_pcie_lanes) +seq_printf (m,"PCIE lanes: %d\n" ,radeon_get_pcie_lanes (rdev));return 0 ; }
Signature · 14 lines
1.6.4.2 ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev -- _______________________________________________ Dri-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/dri-devel