xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/radeon/kms: move around new init path code to avoid posting at init

Browse Source 
We really don't want to post the card at init, it takes a relatively
long time and isn't required, so split the resume path into
a startup path called by both init/resume and separate resume
entry point to do posting.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2009-09-18 15:19:37 +10:00
committed by Dave Airlie
parent bc1a631e51
commit fc30b8efbe
3 changed files with 101 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/gpu/drm/radeon/r600.c
View File

@@ -1466,7 +1466,7 @@ bool r600_card_posted(struct radeon_device *rdev)
return false;
}
int r600_resume(struct radeon_device *rdev)
int r600_startup(struct radeon_device *rdev)
{
int r;
@@ -1499,6 +1499,40 @@ int r600_resume(struct radeon_device *rdev)
return 0;
}
int r600_resume(struct radeon_device *rdev)
{
int r;
if (radeon_gpu_reset(rdev)) {
/* FIXME: what do we want to do here ? */
}
/* post card */
if (rdev->is_atom_bios) {
atom_asic_init(rdev->mode_info.atom_context);
} else {
radeon_combios_asic_init(rdev->ddev);
}
/* Initialize clocks */
r = radeon_clocks_init(rdev);
if (r) {
return r;
}
r = r600_startup(rdev);
if (r) {
DRM_ERROR("r600 startup failed on resume\n");
return r;
}
r = radeon_ib_test(rdev);
if (r) {
DRM_ERROR("radeon: failled testing IB (%d).\n", r);
return r;
}
return r;
}
int r600_suspend(struct radeon_device *rdev)
{
/* FIXME: we should wait for ring to be empty */
@@ -1596,7 +1630,7 @@ int r600_init(struct radeon_device *rdev)
return r;
}
r = r600_resume(rdev);
r = r600_startup(rdev);
if (r) {
if (rdev->flags & RADEON_IS_AGP) {
/* Retry with disabling AGP */