From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9869EB71BF for ; Fri, 20 May 2011 11:10:45 +1000 (EST) Subject: Re: [PATCH] agp/uninorth: Fix lockups with radeon KMS and >1x. From: Benjamin Herrenschmidt To: Michel =?ISO-8859-1?Q?D=E4nzer?= In-Reply-To: <1305814119-32288-1-git-send-email-michel@daenzer.net> References: <1305814119-32288-1-git-send-email-michel@daenzer.net> Content-Type: text/plain; charset="UTF-8" Date: Fri, 20 May 2011 11:10:33 +1000 Message-ID: <1305853833.7481.112.camel@pasglop> Mime-Version: 1.0 Cc: linuxppc-dev@lists.ozlabs.org, Dave Airlie , dri-devel@lists.freedesktop.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Thu, 2011-05-19 at 16:08 +0200, Michel Dänzer wrote: > From: Michel Dänzer > > 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 Oops. I do have a pile of patches, but I never got something "stable" enough and got distracted by more important stuff. Dave, please merge this for now. Acked-by: Benjamin Herrenschmidt Thanks ! Cheers, Ben. > --- > drivers/char/agp/uninorth-agp.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c > index 47c2218..55af723 100644 > --- a/drivers/char/agp/uninorth-agp.c > +++ b/drivers/char/agp/uninorth-agp.c > @@ -80,7 +80,7 @@ static void uninorth_tlbflush(struct agp_memory *mem) > ctrl | UNI_N_CFG_GART_INVAL); > pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL, ctrl); > > - if (uninorth_rev <= 0x30) { > + if (!mem && uninorth_rev <= 0x30) { > pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL, > ctrl | UNI_N_CFG_GART_2xRESET); > pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL, From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Herrenschmidt Subject: Re: [PATCH] agp/uninorth: Fix lockups with radeon KMS and >1x. Date: Fri, 20 May 2011 11:10:33 +1000 Message-ID: <1305853833.7481.112.camel@pasglop> References: <1305814119-32288-1-git-send-email-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1305814119-32288-1-git-send-email-michel@daenzer.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org To: Michel =?ISO-8859-1?Q?D=E4nzer?= Cc: linuxppc-dev@lists.ozlabs.org, Dave Airlie , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCAyMDExLTA1LTE5IGF0IDE2OjA4ICswMjAwLCBNaWNoZWwgRMOkbnplciB3cm90ZToK PiBGcm9tOiBNaWNoZWwgRMOkbnplciA8ZGFlbnplckB2bXdhcmUuY29tPgo+IAo+IFRoaXMgd2Fz IGJhc2VkIG9uIGEgZGVzY3JpcHRpb24gYnkgQmVuIEhlcnJlbnNjaG1pZHQ6Cj4gCj4gPiBJJ3Zl IHJlbW92ZWQgdGhhdCBTQkEgcmVzZXQgZnJvbSB0aGUgbm9ybWFsIFRMQiBpbnZhbGlkYXRpb24g cGF0aCBhbmQKPiA+IGxlZnQgaXQgb25seSBvbmNlIGFmdGVyIHR1cm5pbmcgQUdQIG9uLgo+IAo+ IEFib3V0IHNpeCBtb250aHMgYWdvLCBoZSBzYWlkOgo+IAo+ID4gSSBkaWQgaXQgYSBiaXQgZGlm ZmVyZW50bHksIGJ1dCB5ZWFoLCB5b3UgZ2V0IHRoZSBpZGVhLiBJJ20gZG9pbmcgYQo+ID4gcGF0 Y2ggc2VyaWVzIHNvIGRvbid0IGJvdGhlciBwdXNoaW5nIHRoaW5ncyB0b28gaGFyZCB5ZXQuCj4g Cj4gQnV0IEkgaGF2ZW4ndCBzZWVuIGFueXRoaW5nIGZyb20gaGltIGFib3V0IHRoaXMgc2luY2Ug dGhlbiwgYW5kIHBlb3BsZSBhcmUKPiByZWd1bGFybHkgaGl0dGluZyB0aGVzZSBsb2NrdXBzLCBz byBoZXJlIHdlIGFyZS4uLgo+IAo+IFNpZ25lZC1vZmYtYnk6IE1pY2hlbCBEw6RuemVyIDxkYWVu emVyQHZtd2FyZS5jb20+CgpPb3BzLiBJIGRvIGhhdmUgYSBwaWxlIG9mIHBhdGNoZXMsIGJ1dCBJ IG5ldmVyIGdvdCBzb21ldGhpbmcgInN0YWJsZSIKZW5vdWdoIGFuZCBnb3QgZGlzdHJhY3RlZCBi eSBtb3JlIGltcG9ydGFudCBzdHVmZi4gRGF2ZSwgcGxlYXNlIG1lcmdlCnRoaXMgZm9yIG5vdy4K CkFja2VkLWJ5OiBCZW5qYW1pbiBIZXJyZW5zY2htaWR0IDxiZW5oQGtlcm5lbC5jcmFzaGluZy5v cmc+CgpUaGFua3MgIQoKQ2hlZXJzLApCZW4uCgo+IC0tLQo+ICBkcml2ZXJzL2NoYXIvYWdwL3Vu aW5vcnRoLWFncC5jIHwgICAgMiArLQo+ICAxIGZpbGVzIGNoYW5nZWQsIDEgaW5zZXJ0aW9ucygr KSwgMSBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9jaGFyL2FncC91bmlu b3J0aC1hZ3AuYyBiL2RyaXZlcnMvY2hhci9hZ3AvdW5pbm9ydGgtYWdwLmMKPiBpbmRleCA0N2My MjE4Li41NWFmNzIzIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvY2hhci9hZ3AvdW5pbm9ydGgtYWdw LmMKPiArKysgYi9kcml2ZXJzL2NoYXIvYWdwL3VuaW5vcnRoLWFncC5jCj4gQEAgLTgwLDcgKzgw LDcgQEAgc3RhdGljIHZvaWQgdW5pbm9ydGhfdGxiZmx1c2goc3RydWN0IGFncF9tZW1vcnkgKm1l bSkKPiAgCQkJICAgICAgIGN0cmwgfCBVTklfTl9DRkdfR0FSVF9JTlZBTCk7Cj4gIAlwY2lfd3Jp dGVfY29uZmlnX2R3b3JkKGFncF9icmlkZ2UtPmRldiwgVU5JX05fQ0ZHX0dBUlRfQ1RSTCwgY3Ry bCk7Cj4gIAo+IC0JaWYgKHVuaW5vcnRoX3JldiA8PSAweDMwKSB7Cj4gKwlpZiAoIW1lbSAmJiB1 bmlub3J0aF9yZXYgPD0gMHgzMCkgewo+ICAJCXBjaV93cml0ZV9jb25maWdfZHdvcmQoYWdwX2Jy aWRnZS0+ZGV2LCBVTklfTl9DRkdfR0FSVF9DVFJMLAo+ICAJCQkJICAgICAgIGN0cmwgfCBVTklf Tl9DRkdfR0FSVF8yeFJFU0VUKTsKPiAgCQlwY2lfd3JpdGVfY29uZmlnX2R3b3JkKGFncF9icmlk Z2UtPmRldiwgVU5JX05fQ0ZHX0dBUlRfQ1RSTCwKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpMaW51eHBwYy1kZXYgbWFpbGluZyBsaXN0CkxpbnV4cHBj LWRldkBsaXN0cy5vemxhYnMub3JnCmh0dHBzOi8vbGlzdHMub3psYWJzLm9yZy9saXN0aW5mby9s aW51eHBwYy1kZXY=