Skip to contentSkip to conversation

drm/radeon: free uvd ring on unload

PATCH Applied [email protected] 3 participants 3 messages Feb 27, 2014

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

PATCH 1/1 drm/radeon: free uvd ring on unload

From: Jerome Glisse <[email protected]>

Need to free the uvd ring. Also reshuffle gart tear down to happen after uvd tear down.

---
 drivers/gpu/drm/radeon/evergreen.c  | 2 +-
 drivers/gpu/drm/radeon/radeon_uvd.c | 2 ++
 drivers/gpu/drm/radeon/rv770.c      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +1 -1
index 5623e75..8a2c010 100644
@@ -5475,9 +5475,9 @@ void evergreen_fini(struct radeon_device *rdev)
 	radeon_wb_fini(rdev);
 	radeon_ib_pool_fini(rdev);
 	radeon_irq_kms_fini(rdev);
-	evergreen_pcie_gart_fini(rdev);
 	uvd_v1_0_fini(rdev);
 	radeon_uvd_fini(rdev);
+	evergreen_pcie_gart_fini(rdev);
 	r600_vram_scratch_fini(rdev);
 	radeon_gem_fini(rdev);
 	radeon_fence_driver_fini(rdev);
drivers/gpu/drm/radeon/radeon_uvd.c +2 -0
index 6781fee..3e6804b 100644
@@ -171,6 +171,8 @@ void radeon_uvd_fini(struct radeon_device *rdev)
 
 	radeon_bo_unref(&rdev->uvd.vcpu_bo);
 
+	radeon_ring_fini(rdev, &rdev->ring[R600_RING_TYPE_UVD_INDEX]);
+
 	release_firmware(rdev->uvd_fw);
 }
 
drivers/gpu/drm/radeon/rv770.c +1 -1
index 6c772e5..4e37a42 100644
@@ -1955,9 +1955,9 @@ void rv770_fini(struct radeon_device *rdev)
 	radeon_wb_fini(rdev);
 	radeon_ib_pool_fini(rdev);
 	radeon_irq_kms_fini(rdev);
-	rv770_pcie_gart_fini(rdev);
 	uvd_v1_0_fini(rdev);
 	radeon_uvd_fini(rdev);
+	rv770_pcie_gart_fini(rdev);
 	r600_vram_scratch_fini(rdev);
 	radeon_gem_fini(rdev);
 	radeon_fence_driver_fini(rdev);
Signature · 1 line
1.8.3.1
Reviewed-by on v1 1/1
#1 lore raw

Am 27.02.2014 01:22, schrieb [email protected]:

Quoted 7 lines

From: Jerome Glisse <[email protected]>

Need to free the uvd ring. Also reshuffle gart tear down to happen after uvd tear down.

Quoted 39 lines
---
  drivers/gpu/drm/radeon/evergreen.c  | 2 +-
  drivers/gpu/drm/radeon/radeon_uvd.c | 2 ++
  drivers/gpu/drm/radeon/rv770.c      | 2 +-
  3 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +1 -1
index 5623e75..8a2c010 100644
@@ -5475,9 +5475,9 @@ void evergreen_fini(struct radeon_device *rdev)
  	radeon_wb_fini(rdev);
  	radeon_ib_pool_fini(rdev);
  	radeon_irq_kms_fini(rdev);
-	evergreen_pcie_gart_fini(rdev);
  	uvd_v1_0_fini(rdev);
  	radeon_uvd_fini(rdev);
+	evergreen_pcie_gart_fini(rdev);
  	r600_vram_scratch_fini(rdev);
  	radeon_gem_fini(rdev);
  	radeon_fence_driver_fini(rdev);
drivers/gpu/drm/radeon/radeon_uvd.c +2 -0
index 6781fee..3e6804b 100644
@@ -171,6 +171,8 @@ void radeon_uvd_fini(struct radeon_device *rdev)
 
  	radeon_bo_unref(&rdev->uvd.vcpu_bo);
 
+	radeon_ring_fini(rdev, &rdev->ring[R600_RING_TYPE_UVD_INDEX]);
+
  	release_firmware(rdev->uvd_fw);
  }
 
drivers/gpu/drm/radeon/rv770.c +0 -0
index 6c772e5..4e37a42 100644

drivers/gpu/drm/radeon/rv770.c void rv770_fini(struct radeon_device *rdev) · line 1963

Quoted 10 lines
drivers/gpu/drm/radeon/rv770.c +1 -1
@@ -1955,9 +1955,9 @@ void rv770_fini(struct radeon_device *rdev)
  	radeon_wb_fini(rdev);
  	radeon_ib_pool_fini(rdev);
  	radeon_irq_kms_fini(rdev);
-	rv770_pcie_gart_fini(rdev);
  	uvd_v1_0_fini(rdev);
  	radeon_uvd_fini(rdev);
+	rv770_pcie_gart_fini(rdev);
  	r600_vram_scratch_fini(rdev);
  	radeon_gem_fini(rdev);
  	radeon_fence_driver_fini(rdev);

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Applied
#2 lore raw
In reply to [email protected]

Applied to my -fixes tree. thanks!

Quoted 63 lines · On Wed, Feb 26, 2014 at 7:22 PM, <[email protected]> wrote:

From: Jerome Glisse <[email protected]>

Need to free the uvd ring. Also reshuffle gart tear down to happen after uvd tear down.

---
 drivers/gpu/drm/radeon/evergreen.c  | 2 +-
 drivers/gpu/drm/radeon/radeon_uvd.c | 2 ++
 drivers/gpu/drm/radeon/rv770.c      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +1 -1
index 5623e75..8a2c010 100644
@@ -5475,9 +5475,9 @@ void evergreen_fini(struct radeon_device *rdev)
        radeon_wb_fini(rdev);
        radeon_ib_pool_fini(rdev);
        radeon_irq_kms_fini(rdev);
-       evergreen_pcie_gart_fini(rdev);
        uvd_v1_0_fini(rdev);
        radeon_uvd_fini(rdev);
+       evergreen_pcie_gart_fini(rdev);
        r600_vram_scratch_fini(rdev);
        radeon_gem_fini(rdev);
        radeon_fence_driver_fini(rdev);
drivers/gpu/drm/radeon/radeon_uvd.c +2 -0
index 6781fee..3e6804b 100644
@@ -171,6 +171,8 @@ void radeon_uvd_fini(struct radeon_device *rdev)
 
        radeon_bo_unref(&rdev->uvd.vcpu_bo);
 
+       radeon_ring_fini(rdev, &rdev->ring[R600_RING_TYPE_UVD_INDEX]);
+
        release_firmware(rdev->uvd_fw);
 }
 
drivers/gpu/drm/radeon/rv770.c +1 -2
index 6c772e5..4e37a42 100644
@@ -1955,9 +1955,9 @@ void rv770_fini(struct radeon_device *rdev)
        radeon_wb_fini(rdev);
        radeon_ib_pool_fini(rdev);
        radeon_irq_kms_fini(rdev);
-       rv770_pcie_gart_fini(rdev);
        uvd_v1_0_fini(rdev);
        radeon_uvd_fini(rdev);
+       rv770_pcie_gart_fini(rdev);
        r600_vram_scratch_fini(rdev);
        radeon_gem_fini(rdev);
        radeon_fence_driver_fini(rdev);
--

1.8.3.1

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel