Skip to contentSkip to conversation

drm/radeon/kms: implement reading PCIE lanes on R600+

PATCH Superseded Rafał Miłecki 3 participants 6 messages Feb 17, 2010 – Feb 18, 2010

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/radeon/kms: implement reading PCIE lanes on R600+

Ported from DDX

---
 drivers/gpu/drm/radeon/r300.c        |    5 ++++-
 drivers/gpu/drm/radeon/radeon.h      |   14 ++++++++++++++
 drivers/gpu/drm/radeon/radeon_asic.h |    4 ++--
 drivers/gpu/drm/radeon/radeon_pm.c   |    2 ++
 4 files changed, 22 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/r300.c +4 -1
index 654aca1..cd92880 100644
@@ -593,7 +593,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 +14 -0
index b533411..db98924 100644
@@ -1009,6 +1009,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) r600_pcie_port_rreg(rdev, (reg))
+#define WREG32_PCIE_P(reg, v) r600_pcie_port_wreg(rdev, (reg), (v))
 #define WREG32_P(reg, val, mask)				\
 	do {							\
 		uint32_t tmp_ = RREG32(reg);			\
@@ -1043,6 +1045,18 @@ static inline void rv370_pcie_wreg(struct radeon_device *rdev, uint32_t reg, uin
 	WREG32(RADEON_PCIE_DATA, (v));
 }
 
+static inline uint32_t r600_pcie_port_rreg(struct radeon_device *rdev, uint32_t reg)
+{
+	WREG32(R600_PCIE_PORT_INDEX, ((reg) & rdev->pcie_reg_mask));
+	return RREG32(R600_PCIE_PORT_DATA);
+}
+
+static inline void r600_pcie_port_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
+{
+	WREG32(R600_PCIE_PORT_INDEX, ((reg) & rdev->pcie_reg_mask));
+	WREG32(R600_PCIE_PORT_DATA, (v));
+}
+
 void r100_pll_errata_after_index(struct radeon_device *rdev);
 
 
drivers/gpu/drm/radeon/radeon_asic.h +2 -2
index 4b0cb67..735d594 100644
@@ -547,7 +547,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,
@@ -593,7 +593,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
index 8426aff..3b00202 100644
@@ -441,6 +441,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&reg; 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
maintainer
#1 lore raw

2010/2/18 Rafał Miłecki <[email protected]>:

Quoted 2 lines

Ported from DDX

The PCIE regs on r600 are the same offsets at the ones on rv370 from what I can see
probably don't need to add a new PCIE_P struct at all I think the rv370 functions should work.

Dave.

------------------------------------------------------------------------------
Download Intel&reg; 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

#2 lore raw
Quoted 8 lines · W dniu 18 lutego 2010 05:57 użytkownik Dave Airlie <[email protected]> napisał:

2010/2/18 Rafał Miłecki <[email protected]>:

Quoted 2 lines

Ported from DDX

The PCIE regs on r600 are the same offsets at the ones on rv370 from what I can see
probably don't need to add a new PCIE_P struct at all I think the rv370 functions should work.

Err, not really?

# egrep --color "define.*PCIE_(PORT_)?INDEX" ./*h
./r600_reg.h:#define R600_PCIE_PORT_INDEX                0x0038
./radeon_reg.h:#define RADEON_PCIE_INDEX               0x0030
# egrep --color "define.*PCIE_(PORT_)?DATA" ./*h
./r600_reg.h:#define R600_PCIE_PORT_DATA                 0x003c
./radeon_reg.h:#define RADEON_PCIE_DATA                0x0034
Signature · 13 lines
Rafał

------------------------------------------------------------------------------
Download Intel&reg; 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
#3 lore raw
In reply to Dave Airlie

2010/2/17 Dave Airlie <[email protected]>:

Quoted 9 lines

2010/2/18 Rafał Miłecki <[email protected]>:

Quoted 2 lines

Ported from DDX

The PCIE regs on r600 are the same offsets at the ones on rv370 from what I can see
probably don't need to add a new PCIE_P struct at all I think the rv370 functions should work.

There are PCIE index regs at the same offset, but the PCIE lane controls moved to the PCIE PORT index.

Alex

Quoted 14 lines

Dave.

------------------------------------------------------------------------------
Download Intel&reg; 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

------------------------------------------------------------------------------
Download Intel&reg; 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

#4 lore raw
In reply to Rafał Miłecki

2010/2/17 Rafał Miłecki <[email protected]>:

Quoted 45 lines

Ported from DDX

---
 drivers/gpu/drm/radeon/r300.c        |    5 ++++- drivers/gpu/drm/radeon/radeon.h      |   14 ++++++++++++++ drivers/gpu/drm/radeon/radeon_asic.h |    4 ++-- drivers/gpu/drm/radeon/radeon_pm.c   |    2 ++

 4 files changed, 22 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/r300.c +4 -1
index 654aca1..cd92880 100644
@@ -593,7 +593,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 +4 -0
index b533411..db98924 100644
@@ -1009,6 +1009,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) r600_pcie_port_rreg(rdev, (reg))
+#define WREG32_PCIE_P(reg, v) r600_pcie_port_wreg(rdev, (reg), (v))
  #define WREG32_P(reg, val, mask)                               \
        do {                                                    \
                uint32_t tmp_ = RREG32(reg);                    \
@@ -1043,6 +1045,18 @@ static inline void rv370_pcie_wreg(struct radeon_device *rdev, uint32_t reg, uin
        WREG32(RADEON_PCIE_DATA, (v));
  }
 
+static inline uint32_t r600_pcie_port_rreg(struct radeon_device *rdev, uint32_t reg)
+{

drivers/gpu/drm/radeon/radeon.h static inline void rv370_pcie_wreg(struct radeon_device *rdev, uint32_t reg, uin · line 1059

Quoted 10 lines
drivers/gpu/drm/radeon/radeon.h +10 -0
+       WREG32(R600_PCIE_PORT_INDEX, ((reg) & rdev->pcie_reg_mask));
+       return RREG32(R600_PCIE_PORT_DATA);
+}
+
+static inline void r600_pcie_port_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
+{
+       WREG32(R600_PCIE_PORT_INDEX, ((reg) & rdev->pcie_reg_mask));
+       WREG32(R600_PCIE_PORT_DATA, (v));
+}
+

These already exist in r600.c:
r600_pciep_rreg
r600_pciep_wreg

Alex

Quoted 42 lines
drivers/gpu/drm/radeon/radeon.h +0 -0
  void r100_pll_errata_after_index(struct radeon_device *rdev);
 
 
drivers/gpu/drm/radeon/radeon_asic.h +2 -2
index 4b0cb67..735d594 100644
@@ -547,7 +547,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,
@@ -593,7 +593,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 -1
index 8426aff..3b00202 100644
@@ -441,6 +441,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;
  }
--

1.6.4.2

Quoted 12 lines

------------------------------------------------------------------------------
Download Intel&reg; 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

------------------------------------------------------------------------------
Download Intel&reg; 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

#5 lore raw

W dniu 18 lutego 2010 16:20 użytkownik Alex Deucher

Quoted 44 lines · <[email protected]> napisał:

2010/2/17 Rafał Miłecki <[email protected]>:

Quoted 43 lines

Ported from DDX

---
 drivers/gpu/drm/radeon/r300.c        |    5 ++++- drivers/gpu/drm/radeon/radeon.h      |   14 ++++++++++++++ drivers/gpu/drm/radeon/radeon_asic.h |    4 ++-- drivers/gpu/drm/radeon/radeon_pm.c   |    2 ++

 4 files changed, 22 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/r300.c +4 -1
index 654aca1..cd92880 100644
@@ -593,7 +593,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
index b533411..db98924 100644
@@ -1009,6 +1009,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) r600_pcie_port_rreg(rdev, (reg))
+#define WREG32_PCIE_P(reg, v) r600_pcie_port_wreg(rdev, (reg), (v))
  #define WREG32_P(reg, val, mask)                               \
        do {                                                    \
                uint32_t tmp_ = RREG32(reg);                    \
@@ -1043,6 +1045,18 @@ static inline void rv370_pcie_wreg(struct radeon_device *rdev, uint32_t reg, uin
        WREG32(RADEON_PCIE_DATA, (v));
  }
 
Quoted 16 lines

drivers/gpu/drm/radeon/radeon.h static inline void rv370_pcie_wreg(struct radeon_device *rdev, uint32_t reg, uin · line 1059

Quoted 12 lines
drivers/gpu/drm/radeon/radeon.h +12 -0
+static inline uint32_t r600_pcie_port_rreg(struct radeon_device *rdev, uint32_t reg)
+{
+       WREG32(R600_PCIE_PORT_INDEX, ((reg) & rdev->pcie_reg_mask));
+       return RREG32(R600_PCIE_PORT_DATA);
+}
+
+static inline void r600_pcie_port_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
+{
+       WREG32(R600_PCIE_PORT_INDEX, ((reg) & rdev->pcie_reg_mask));
+       WREG32(R600_PCIE_PORT_DATA, (v));
+}
+

These already exist in r600.c:
r600_pciep_rreg
r600_pciep_wreg

Oh, didn't notice that because it uses duplicated definition:
./r600d.h:#define PCIE_PORT_INDEX 0x0038
./r600_reg.h:#define R600_PCIE_PORT_INDEX 0x0038

Signature · 13 lines
Rafał

------------------------------------------------------------------------------
Download Intel&#174; 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