Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 5613beb46d54da6ef7f1c4589e9f2e60eeb10721

Authored by Michel Dänzer
Committed by Dave Airlie
1 parent 2307790f0c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

agp/uninorth: Fix lockups with radeon KMS and >1x. 

This was based on a description by Ben Herrenschmidt:

> I've removed that SBA reset from the normal TLB invalidation path and
> left it only once after turning AGP on.

About six months ago, he said:

> I did it a bit differently, but yeah, you get the idea. I'm doing a
> patch series so don't bother pushing things too hard yet.

But I haven't seen anything from him about this since then, and people are
regularly hitting these lockups, so here we are...

Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied@gmail.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/char/agp/uninorth-agp.c
Diff comments   View file @ 5613beb
... ... @@ -80,7 +80,7 @@
80 80 ctrl | UNI_N_CFG_GART_INVAL);
81 81 pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL, ctrl);
82 82  
83   - if (uninorth_rev <= 0x30) {
  83 + if (!mem && uninorth_rev <= 0x30) {
84 84 pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL,
85 85 ctrl | UNI_N_CFG_GART_2xRESET);
86 86 pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL,