diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2015-07-03 10:02:27 +0900 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-12 16:33:22 +0200 |
| commit | 6cb5225f5fb2fcb2978e9650812975619b24e477 (patch) | |
| tree | 5d33327cb571c7c52c0dd923d664c2d4605f6acf | |
| parent | 6f26afc900c8c346f39e2088cbfea7f5db373928 (diff) | |
| download | kernel_samsung_smdk4412-6cb5225f5fb2fcb2978e9650812975619b24e477.zip kernel_samsung_smdk4412-6cb5225f5fb2fcb2978e9650812975619b24e477.tar.gz kernel_samsung_smdk4412-6cb5225f5fb2fcb2978e9650812975619b24e477.tar.bz2 | |
drm/radeon: Don't flush the GART TLB if rdev->gart.ptr == NULL
commit 233709d2cd6bbaaeda0aeb8d11f6ca7f98563b39 upstream.
This can be the case when the GPU is powered off, e.g. via vgaswitcheroo
or runpm. When the GPU is powered up again, radeon_gart_table_vram_pin
flushes the TLB after setting rdev->gart.ptr to non-NULL.
Fixes panic on powering off R7xx GPUs.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=61529
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_gart.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c index ba7ab79..d257210 100644 --- a/drivers/gpu/drm/radeon/radeon_gart.c +++ b/drivers/gpu/drm/radeon/radeon_gart.c @@ -171,8 +171,10 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset, } } } - mb(); - radeon_gart_tlb_flush(rdev); + if (rdev->gart.ptr) { + mb(); + radeon_gart_tlb_flush(rdev); + } } int radeon_gart_bind(struct radeon_device *rdev, unsigned offset, @@ -217,8 +219,10 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset, } } } - mb(); - radeon_gart_tlb_flush(rdev); + if (rdev->gart.ptr) { + mb(); + radeon_gart_tlb_flush(rdev); + } return 0; } |