Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 189349
b: refs/heads/master
c: f927456
h: refs/heads/master
i:
  189347: 8fe808d
v: v3
  • Loading branch information
Jerome Glisse authored and Dave Airlie committed Mar 31, 2010
1 parent df65d34 commit 7919e12
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 97f23b3d85a4d734a8584dade3a34579931c8f8d
refs/heads/master: f9274562026558ab54a29331cf13e9ebec8cc890
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/radeon/r100.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@ int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)

void r100_pci_gart_fini(struct radeon_device *rdev)
{
radeon_gart_fini(rdev);
r100_pci_gart_disable(rdev);
radeon_gart_table_ram_free(rdev);
radeon_gart_fini(rdev);
}

int r100_irq_set(struct radeon_device *rdev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/radeon/r300.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ void rv370_pcie_gart_disable(struct radeon_device *rdev)

void rv370_pcie_gart_fini(struct radeon_device *rdev)
{
radeon_gart_fini(rdev);
rv370_pcie_gart_disable(rdev);
radeon_gart_table_vram_free(rdev);
radeon_gart_fini(rdev);
}

void r300_fence_ring_emit(struct radeon_device *rdev,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/radeon/r600.c
Original file line number Diff line number Diff line change
Expand Up @@ -492,9 +492,9 @@ void r600_pcie_gart_disable(struct radeon_device *rdev)

void r600_pcie_gart_fini(struct radeon_device *rdev)
{
radeon_gart_fini(rdev);
r600_pcie_gart_disable(rdev);
radeon_gart_table_vram_free(rdev);
radeon_gart_fini(rdev);
}

void r600_agp_enable(struct radeon_device *rdev)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/radeon/rs400.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ void rs400_gart_disable(struct radeon_device *rdev)

void rs400_gart_fini(struct radeon_device *rdev)
{
radeon_gart_fini(rdev);
rs400_gart_disable(rdev);
radeon_gart_table_ram_free(rdev);
radeon_gart_fini(rdev);
}

int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/radeon/rs600.c
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,9 @@ void rs600_gart_disable(struct radeon_device *rdev)

void rs600_gart_fini(struct radeon_device *rdev)
{
radeon_gart_fini(rdev);
rs600_gart_disable(rdev);
radeon_gart_table_vram_free(rdev);
radeon_gart_fini(rdev);
}

#define R600_PTE_VALID (1 << 0)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/radeon/rv770.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ void rv770_pcie_gart_disable(struct radeon_device *rdev)

void rv770_pcie_gart_fini(struct radeon_device *rdev)
{
radeon_gart_fini(rdev);
rv770_pcie_gart_disable(rdev);
radeon_gart_table_vram_free(rdev);
radeon_gart_fini(rdev);
}


Expand Down

0 comments on commit 7919e12

Please sign in to comment.