Browse Source

drm/radeon/kms: Fix R600/RV770 disable acceleration path

When acceleration doesn't work we should free associated memory
and stop GPU block responsible for hardware acceleration so we
don't waste resource or let think one component of the driver that
a GPU feature is working/running while it doesn't actualy work.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Jerome Glisse 15 years ago
parent
commit
75c8129893
2 changed files with 10 additions and 0 deletions
  1. 5 0
      drivers/gpu/drm/radeon/r600.c
  2. 5 0
      drivers/gpu/drm/radeon/rv770.c

+ 5 - 0
drivers/gpu/drm/radeon/r600.c

@@ -1605,6 +1605,11 @@ int r600_init(struct radeon_device *rdev)
 			rdev->flags &= ~RADEON_IS_AGP;
 			rdev->flags &= ~RADEON_IS_AGP;
 			return r600_init(rdev);
 			return r600_init(rdev);
 		}
 		}
+		r600_suspend(rdev);
+		r600_wb_fini(rdev);
+		radeon_ib_pool_fini(rdev);
+		radeon_ring_fini(rdev);
+		r600_pcie_gart_fini(rdev);
 		rdev->accel_working = false;
 		rdev->accel_working = false;
 	}
 	}
 	if (rdev->accel_working) {
 	if (rdev->accel_working) {

+ 5 - 0
drivers/gpu/drm/radeon/rv770.c

@@ -968,6 +968,11 @@ int rv770_init(struct radeon_device *rdev)
 			rdev->flags &= ~RADEON_IS_AGP;
 			rdev->flags &= ~RADEON_IS_AGP;
 			return rv770_init(rdev);
 			return rv770_init(rdev);
 		}
 		}
+		rv770_suspend(rdev);
+		r600_wb_fini(rdev);
+		radeon_ib_pool_fini(rdev);
+		radeon_ring_fini(rdev);
+		rv770_pcie_gart_fini(rdev);
 		rdev->accel_working = false;
 		rdev->accel_working = false;
 	}
 	}
 	if (rdev->accel_working) {
 	if (rdev->accel_working) {