diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-07-15 04:13:50 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-02 02:00:09 +0200 |
| commit | 4c712e6c7ef19e7e8e1f38b27bb65290def39b40 (patch) | |
| tree | c2f5d3663f849f445ff1154762188904e0633c2d /drivers/gpu/drm/radeon/r520.c | |
| parent | drm/radeon: fall back to GTT if bo creation/validation in VRAM fails. (diff) | |
| download | linux-4c712e6c7ef19e7e8e1f38b27bb65290def39b40.tar.xz linux-4c712e6c7ef19e7e8e1f38b27bb65290def39b40.zip | |
drm/radeon/kms: check/restore sanity before doing anything else with GPU.
On systems using kexec, the new kernel is booted straight from the old kernel, without any warning to the graphics driver. So the GPU is basically left as-is in a running state, however the CPU side is completly reset.
Without stating the saneness of anyone using kexec on live systems, we should at least try not to crash the GPU. This patch resets 3 registers to 0 that could cause bad things to happen to the running system.
This allows kexec to work on a Power6/RN50 system.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r520.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r520.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c index 34330df28483..213e2e0027a3 100644 --- a/drivers/gpu/drm/radeon/r520.c +++ b/drivers/gpu/drm/radeon/r520.c @@ -230,6 +230,8 @@ int r520_init(struct radeon_device *rdev) radeon_scratch_init(rdev); /* Initialize surface registers */ radeon_surface_init(rdev); + /* restore some register to sane defaults */ + r100_restore_sanity(rdev); /* TODO: disable VGA need to use VGA request */ /* BIOS*/ if (!radeon_get_bios(rdev)) { |