summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Glisse2010-04-16 18:46:35 +0200
committerDave Airlie2010-04-19 03:26:13 +0200
commit30f69f3fb20bd719b5e1bf879339914063d38f47 (patch)
tree5cce2bcf64dbfac73c56289696a280a03907866a
parentdrm/radeon/kms: print GPU family and device id when loading (diff)
downloadkernel-qcow2-linux-30f69f3fb20bd719b5e1bf879339914063d38f47.tar.gz
kernel-qcow2-linux-30f69f3fb20bd719b5e1bf879339914063d38f47.tar.xz
kernel-qcow2-linux-30f69f3fb20bd719b5e1bf879339914063d38f47.zip
drm/radeon/kms: fix rs600 tlb flush
Typo in in flush leaded to no flush of the RS600 tlb which ultimately leaded to massive system ram corruption, with this patch everythings seems to work properly. Signed-off-by: Jerome Glisse <jglisse@redhat.com> Cc: stable <stable@kernel.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/rs600.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index abf824c2123d..a81bc7a21e14 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -159,7 +159,7 @@ void rs600_gart_tlb_flush(struct radeon_device *rdev)
WREG32_MC(R_000100_MC_PT0_CNTL, tmp);
tmp = RREG32_MC(R_000100_MC_PT0_CNTL);
- tmp |= S_000100_INVALIDATE_ALL_L1_TLBS(1) & S_000100_INVALIDATE_L2_CACHE(1);
+ tmp |= S_000100_INVALIDATE_ALL_L1_TLBS(1) | S_000100_INVALIDATE_L2_CACHE(1);
WREG32_MC(R_000100_MC_PT0_CNTL, tmp);
tmp = RREG32_MC(R_000100_MC_PT0_CNTL);