Skip to contentSkip to conversation

drm/radeon/kms: R3XX/R4XX AGP asic use PCI GART not PCIE GART

PATCH In review Jerome Glisse 2 participants 2 messages Sep 9, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/radeon/kms: R3XX/R4XX AGP asic use PCI GART not PCIE GART

R3XX/R4XX AGP asic use the old PCI GART block, not the new PCIE GART. Make sure we pick the right GART when disabling AGP.

---
 drivers/gpu/drm/radeon/r300.c          |    6 ++++++
 drivers/gpu/drm/radeon/r420.c          |    9 +++++++--
 drivers/gpu/drm/radeon/radeon.h        |    4 ++++
 drivers/gpu/drm/radeon/radeon_device.c |    5 +----
 4 files changed, 18 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/r300.c +6 -0
index a5f82f7..9c17b78 100644
@@ -181,6 +181,12 @@ int r300_gart_enable(struct radeon_device *rdev)
 		rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
 		return rv370_pcie_gart_enable(rdev);
 	}
+	if (rdev->flags & RADEON_IS_PCI) {
+		rdev->asic->gart_disable = &r100_pci_gart_disable;
+		rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;
+		rdev->asic->gart_set_page = &r100_pci_gart_set_page;
+		return r100_pci_gart_enable(rdev);
+	}
 	return r100_pci_gart_enable(rdev);
 }
 
drivers/gpu/drm/radeon/r420.c +7 -2
index 97426a6..029cee2 100644
@@ -100,8 +100,13 @@ int r420_mc_init(struct radeon_device *rdev)
 
 void r420_mc_fini(struct radeon_device *rdev)
 {
-	rv370_pcie_gart_disable(rdev);
-	radeon_gart_table_vram_free(rdev);
+	if (rdev->flags & RADEON_IS_PCIE) {
+		rv370_pcie_gart_disable(rdev);
+		radeon_gart_table_vram_free(rdev);
+	} else {
+		r100_pci_gart_disable(rdev);
+		radeon_gart_table_ram_free(rdev);
+	}
 	radeon_gart_fini(rdev);
 }
 
drivers/gpu/drm/radeon/radeon.h +4 -0
index 24574bc..fe86b20 100644
@@ -935,5 +935,9 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
 
 /* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */
 void r100_cp_disable(struct radeon_device *rdev);
+void r100_pci_gart_disable(struct radeon_device *rdev);
+int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr);
+int r100_pci_gart_enable(struct radeon_device *rdev);
+void r100_pci_gart_tlb_flush(struct radeon_device *rdev);
 
 #endif
drivers/gpu/drm/radeon/radeon_device.c +1 -4
index f2469c5..da8646a 100644
@@ -499,10 +499,7 @@ int radeon_device_init(struct radeon_device *rdev,
 
 	if (radeon_agpmode == -1) {
 		rdev->flags &= ~RADEON_IS_AGP;
-		if (rdev->family > CHIP_RV515 ||
-		    rdev->family == CHIP_RV380 ||
-		    rdev->family == CHIP_RV410 ||
-		    rdev->family == CHIP_R423) {
+		if (rdev->family >= CHIP_RV515) {
 			DRM_INFO("Forcing AGP to PCIE mode\n");
 			rdev->flags |= RADEON_IS_PCIE;
 		} else {
Signature · 1 line
1.6.4.1
#1 lore raw
Quoted 3 lines · Jerome Glisse

R3XX/R4XX AGP asic use the old PCI GART block, not the new PCIE GART. Make sure we pick the right GART when disabling AGP.

Just to clarify which gart block is on what r3xx/r4xx asic; If the card is chip family CHIP_R300, CHIP_R350, CHIP_RV350, or CHIP_R420, it uses the AIC PCI gart. If the chip family is CHIP_RV380, CHIP_R423, or CHIP_RV410, then it uses PCIE gart.

Alex

Quoted 90 lines

---
 drivers/gpu/drm/radeon/r300.c          |    6 ++++++ drivers/gpu/drm/radeon/r420.c          |    9 +++++++-- drivers/gpu/drm/radeon/radeon.h        |    4 ++++ drivers/gpu/drm/radeon/radeon_device.c |    5 +----

 4 files changed, 18 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/r300.c +6 -0
index a5f82f7..9c17b78 100644
@@ -181,6 +181,12 @@ int r300_gart_enable(struct radeon_device *rdev)
                rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
                return rv370_pcie_gart_enable(rdev);
        }
+       if (rdev->flags & RADEON_IS_PCI) {
+               rdev->asic->gart_disable = &r100_pci_gart_disable;
+               rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;
+               rdev->asic->gart_set_page = &r100_pci_gart_set_page;
+               return r100_pci_gart_enable(rdev);
+       }
        return r100_pci_gart_enable(rdev);
  }
 
drivers/gpu/drm/radeon/r420.c +7 -2
index 97426a6..029cee2 100644
@@ -100,8 +100,13 @@ int r420_mc_init(struct radeon_device *rdev)
 
  void r420_mc_fini(struct radeon_device *rdev)
  {
-       rv370_pcie_gart_disable(rdev);
-       radeon_gart_table_vram_free(rdev);
+       if (rdev->flags & RADEON_IS_PCIE) {
+               rv370_pcie_gart_disable(rdev);
+               radeon_gart_table_vram_free(rdev);
+       } else {
+               r100_pci_gart_disable(rdev);
+               radeon_gart_table_ram_free(rdev);
+       }
        radeon_gart_fini(rdev);
  }
 
drivers/gpu/drm/radeon/radeon.h +4 -0
index 24574bc..fe86b20 100644
@@ -935,5 +935,9 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
 
  /* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */
  void r100_cp_disable(struct radeon_device *rdev);
+void r100_pci_gart_disable(struct radeon_device *rdev);
+int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr);
+int r100_pci_gart_enable(struct radeon_device *rdev);
+void r100_pci_gart_tlb_flush(struct radeon_device *rdev);
 
  #endif
drivers/gpu/drm/radeon/radeon_device.c +1 -5
index f2469c5..da8646a 100644
@@ -499,10 +499,7 @@ int radeon_device_init(struct radeon_device *rdev,
 
        if (radeon_agpmode == -1) {
                rdev->flags &= ~RADEON_IS_AGP;
-               if (rdev->family > CHIP_RV515 ||
-                   rdev->family == CHIP_RV380 ||
-                   rdev->family == CHIP_RV410 ||
-                   rdev->family == CHIP_R423) {
+               if (rdev->family >= CHIP_RV515) {
                        DRM_INFO("Forcing AGP to PCIE mode\n");
                        rdev->flags |= RADEON_IS_PCIE;
                } else {
--

1.6.4.1

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now.  http://p.sf.net/sfu/bobj-july
--
_______________________________________________
Dri-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel