Commit 6b7746e8 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie

drm/radeon/kms: properly set accel working flag and bailout when false

If accel is not working many subsystem such as the ib pool might not be
initialized properly that can lead to segfault inside kernel when cs
ioctl is call with non working acceleration. To avoid this make sure
the accel working flag is false when an error in GPU startup happen and
return EBUSY from cs ioctl if accel is not working.
Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f0d14daa
...@@ -3223,6 +3223,7 @@ int evergreen_resume(struct radeon_device *rdev) ...@@ -3223,6 +3223,7 @@ int evergreen_resume(struct radeon_device *rdev)
r = evergreen_startup(rdev); r = evergreen_startup(rdev);
if (r) { if (r) {
DRM_ERROR("evergreen startup failed on resume\n"); DRM_ERROR("evergreen startup failed on resume\n");
rdev->accel_working = false;
return r; return r;
} }
......
...@@ -1547,6 +1547,7 @@ int cayman_resume(struct radeon_device *rdev) ...@@ -1547,6 +1547,7 @@ int cayman_resume(struct radeon_device *rdev)
r = cayman_startup(rdev); r = cayman_startup(rdev);
if (r) { if (r) {
DRM_ERROR("cayman startup failed on resume\n"); DRM_ERROR("cayman startup failed on resume\n");
rdev->accel_working = false;
return r; return r;
} }
return r; return r;
......
...@@ -3928,6 +3928,8 @@ static int r100_startup(struct radeon_device *rdev) ...@@ -3928,6 +3928,8 @@ static int r100_startup(struct radeon_device *rdev)
int r100_resume(struct radeon_device *rdev) int r100_resume(struct radeon_device *rdev)
{ {
int r;
/* Make sur GART are not working */ /* Make sur GART are not working */
if (rdev->flags & RADEON_IS_PCI) if (rdev->flags & RADEON_IS_PCI)
r100_pci_gart_disable(rdev); r100_pci_gart_disable(rdev);
...@@ -3947,7 +3949,11 @@ int r100_resume(struct radeon_device *rdev) ...@@ -3947,7 +3949,11 @@ int r100_resume(struct radeon_device *rdev)
radeon_surface_init(rdev); radeon_surface_init(rdev);
rdev->accel_working = true; rdev->accel_working = true;
return r100_startup(rdev); r = r100_startup(rdev);
if (r) {
rdev->accel_working = false;
}
return r;
} }
int r100_suspend(struct radeon_device *rdev) int r100_suspend(struct radeon_device *rdev)
......
...@@ -1431,6 +1431,8 @@ static int r300_startup(struct radeon_device *rdev) ...@@ -1431,6 +1431,8 @@ static int r300_startup(struct radeon_device *rdev)
int r300_resume(struct radeon_device *rdev) int r300_resume(struct radeon_device *rdev)
{ {
int r;
/* Make sur GART are not working */ /* Make sur GART are not working */
if (rdev->flags & RADEON_IS_PCIE) if (rdev->flags & RADEON_IS_PCIE)
rv370_pcie_gart_disable(rdev); rv370_pcie_gart_disable(rdev);
...@@ -1452,7 +1454,11 @@ int r300_resume(struct radeon_device *rdev) ...@@ -1452,7 +1454,11 @@ int r300_resume(struct radeon_device *rdev)
radeon_surface_init(rdev); radeon_surface_init(rdev);
rdev->accel_working = true; rdev->accel_working = true;
return r300_startup(rdev); r = r300_startup(rdev);
if (r) {
rdev->accel_working = false;
}
return r;
} }
int r300_suspend(struct radeon_device *rdev) int r300_suspend(struct radeon_device *rdev)
......
...@@ -291,6 +291,8 @@ static int r420_startup(struct radeon_device *rdev) ...@@ -291,6 +291,8 @@ static int r420_startup(struct radeon_device *rdev)
int r420_resume(struct radeon_device *rdev) int r420_resume(struct radeon_device *rdev)
{ {
int r;
/* Make sur GART are not working */ /* Make sur GART are not working */
if (rdev->flags & RADEON_IS_PCIE) if (rdev->flags & RADEON_IS_PCIE)
rv370_pcie_gart_disable(rdev); rv370_pcie_gart_disable(rdev);
...@@ -316,7 +318,11 @@ int r420_resume(struct radeon_device *rdev) ...@@ -316,7 +318,11 @@ int r420_resume(struct radeon_device *rdev)
radeon_surface_init(rdev); radeon_surface_init(rdev);
rdev->accel_working = true; rdev->accel_working = true;
return r420_startup(rdev); r = r420_startup(rdev);
if (r) {
rdev->accel_working = false;
}
return r;
} }
int r420_suspend(struct radeon_device *rdev) int r420_suspend(struct radeon_device *rdev)
......
...@@ -218,6 +218,8 @@ static int r520_startup(struct radeon_device *rdev) ...@@ -218,6 +218,8 @@ static int r520_startup(struct radeon_device *rdev)
int r520_resume(struct radeon_device *rdev) int r520_resume(struct radeon_device *rdev)
{ {
int r;
/* Make sur GART are not working */ /* Make sur GART are not working */
if (rdev->flags & RADEON_IS_PCIE) if (rdev->flags & RADEON_IS_PCIE)
rv370_pcie_gart_disable(rdev); rv370_pcie_gart_disable(rdev);
...@@ -237,7 +239,11 @@ int r520_resume(struct radeon_device *rdev) ...@@ -237,7 +239,11 @@ int r520_resume(struct radeon_device *rdev)
radeon_surface_init(rdev); radeon_surface_init(rdev);
rdev->accel_working = true; rdev->accel_working = true;
return r520_startup(rdev); r = r520_startup(rdev);
if (r) {
rdev->accel_working = false;
}
return r;
} }
int r520_init(struct radeon_device *rdev) int r520_init(struct radeon_device *rdev)
......
...@@ -2529,6 +2529,7 @@ int r600_resume(struct radeon_device *rdev) ...@@ -2529,6 +2529,7 @@ int r600_resume(struct radeon_device *rdev)
r = r600_startup(rdev); r = r600_startup(rdev);
if (r) { if (r) {
DRM_ERROR("r600 startup failed on resume\n"); DRM_ERROR("r600 startup failed on resume\n");
rdev->accel_working = false;
return r; return r;
} }
......
...@@ -453,6 +453,10 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) ...@@ -453,6 +453,10 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
int r; int r;
radeon_mutex_lock(&rdev->cs_mutex); radeon_mutex_lock(&rdev->cs_mutex);
if (!rdev->accel_working) {
radeon_mutex_unlock(&rdev->cs_mutex);
return -EBUSY;
}
/* initialize parser */ /* initialize parser */
memset(&parser, 0, sizeof(struct radeon_cs_parser)); memset(&parser, 0, sizeof(struct radeon_cs_parser));
parser.filp = filp; parser.filp = filp;
......
...@@ -442,6 +442,8 @@ static int rs400_startup(struct radeon_device *rdev) ...@@ -442,6 +442,8 @@ static int rs400_startup(struct radeon_device *rdev)
int rs400_resume(struct radeon_device *rdev) int rs400_resume(struct radeon_device *rdev)
{ {
int r;
/* Make sur GART are not working */ /* Make sur GART are not working */
rs400_gart_disable(rdev); rs400_gart_disable(rdev);
/* Resume clock before doing reset */ /* Resume clock before doing reset */
...@@ -462,7 +464,11 @@ int rs400_resume(struct radeon_device *rdev) ...@@ -462,7 +464,11 @@ int rs400_resume(struct radeon_device *rdev)
radeon_surface_init(rdev); radeon_surface_init(rdev);
rdev->accel_working = true; rdev->accel_working = true;
return rs400_startup(rdev); r = rs400_startup(rdev);
if (r) {
rdev->accel_working = false;
}
return r;
} }
int rs400_suspend(struct radeon_device *rdev) int rs400_suspend(struct radeon_device *rdev)
......
...@@ -876,6 +876,8 @@ static int rs600_startup(struct radeon_device *rdev) ...@@ -876,6 +876,8 @@ static int rs600_startup(struct radeon_device *rdev)
int rs600_resume(struct radeon_device *rdev) int rs600_resume(struct radeon_device *rdev)
{ {
int r;
/* Make sur GART are not working */ /* Make sur GART are not working */
rs600_gart_disable(rdev); rs600_gart_disable(rdev);
/* Resume clock before doing reset */ /* Resume clock before doing reset */
...@@ -894,7 +896,11 @@ int rs600_resume(struct radeon_device *rdev) ...@@ -894,7 +896,11 @@ int rs600_resume(struct radeon_device *rdev)
radeon_surface_init(rdev); radeon_surface_init(rdev);
rdev->accel_working = true; rdev->accel_working = true;
return rs600_startup(rdev); r = rs600_startup(rdev);
if (r) {
rdev->accel_working = false;
}
return r;
} }
int rs600_suspend(struct radeon_device *rdev) int rs600_suspend(struct radeon_device *rdev)
......
...@@ -659,6 +659,8 @@ static int rs690_startup(struct radeon_device *rdev) ...@@ -659,6 +659,8 @@ static int rs690_startup(struct radeon_device *rdev)
int rs690_resume(struct radeon_device *rdev) int rs690_resume(struct radeon_device *rdev)
{ {
int r;
/* Make sur GART are not working */ /* Make sur GART are not working */
rs400_gart_disable(rdev); rs400_gart_disable(rdev);
/* Resume clock before doing reset */ /* Resume clock before doing reset */
...@@ -677,7 +679,11 @@ int rs690_resume(struct radeon_device *rdev) ...@@ -677,7 +679,11 @@ int rs690_resume(struct radeon_device *rdev)
radeon_surface_init(rdev); radeon_surface_init(rdev);
rdev->accel_working = true; rdev->accel_working = true;
return rs690_startup(rdev); r = rs690_startup(rdev);
if (r) {
rdev->accel_working = false;
}
return r;
} }
int rs690_suspend(struct radeon_device *rdev) int rs690_suspend(struct radeon_device *rdev)
......
...@@ -424,6 +424,8 @@ static int rv515_startup(struct radeon_device *rdev) ...@@ -424,6 +424,8 @@ static int rv515_startup(struct radeon_device *rdev)
int rv515_resume(struct radeon_device *rdev) int rv515_resume(struct radeon_device *rdev)
{ {
int r;
/* Make sur GART are not working */ /* Make sur GART are not working */
if (rdev->flags & RADEON_IS_PCIE) if (rdev->flags & RADEON_IS_PCIE)
rv370_pcie_gart_disable(rdev); rv370_pcie_gart_disable(rdev);
...@@ -443,7 +445,11 @@ int rv515_resume(struct radeon_device *rdev) ...@@ -443,7 +445,11 @@ int rv515_resume(struct radeon_device *rdev)
radeon_surface_init(rdev); radeon_surface_init(rdev);
rdev->accel_working = true; rdev->accel_working = true;
return rv515_startup(rdev); r = rv515_startup(rdev);
if (r) {
rdev->accel_working = false;
}
return r;
} }
int rv515_suspend(struct radeon_device *rdev) int rv515_suspend(struct radeon_device *rdev)
......
...@@ -1139,6 +1139,7 @@ int rv770_resume(struct radeon_device *rdev) ...@@ -1139,6 +1139,7 @@ int rv770_resume(struct radeon_device *rdev)
r = rv770_startup(rdev); r = rv770_startup(rdev);
if (r) { if (r) {
DRM_ERROR("r600 startup failed on resume\n"); DRM_ERROR("r600 startup failed on resume\n");
rdev->accel_working = false;
return r; return r;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment