From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcin Slusarz Subject: [PATCH v3 2/2] xorg/nouveau: blacklist all pre NV30 cards Date: Sun, 5 Jun 2011 22:31:59 +0200 Message-ID: <20110605203159.GA26259@joi.lan> References: <20110516195110.GB5456@joi.lan> <20110516222014.GH5456@joi.lan> <20110605190626.GE22091@joi.lan> <20110605194652.GA22358@joi.lan> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: mesa-dev-bounces+gcvmd-mesa3d-493=gmane.org@lists.freedesktop.org Errors-To: mesa-dev-bounces+gcvmd-mesa3d-493=gmane.org@lists.freedesktop.org To: Maarten Maathuis Cc: mesa-dev@lists.freedesktop.org, nouveau@lists.freedesktop.org List-Id: nouveau.vger.kernel.org T24gU3VuLCBKdW4gMDUsIDIwMTEgYXQgMDk6NTQ6MzFQTSArMDIwMCwgTWFhcnRlbiBNYWF0aHVp cyB3cm90ZToKPiBPbiBTdW4sIEp1biA1LCAyMDExIGF0IDk6NDYgUE0sIE1hcmNpbiBTbHVzYXJ6 IDxtYXJjaW4uc2x1c2FyekBnbWFpbC5jb20+IHdyb3RlOgo+ID4gT24gU3VuLCBKdW4gMDUsIDIw MTEgYXQgMDk6MTU6NDdQTSArMDIwMCwgTWFhcnRlbiBNYWF0aHVpcyB3cm90ZToKPiA+PiAyMDEx LzYvNSBTdMOpcGhhbmUgTWFyY2hlc2luIDxzdGVwaGFuZS5tYXJjaGVzaW5AZ21haWwuY29tPjoK PiA+PiA+IE9uIFN1biwgSnVuIDUsIDIwMTEgYXQgMTI6MDYsIE1hcmNpbiBTbHVzYXJ6IDxtYXJj aW4uc2x1c2FyekBnbWFpbC5jb20+IHdyb3RlOgo+ID4+ID4+IE9uIFR1ZSwgTWF5IDE3LCAyMDEx IGF0IDEyOjIwOjE0QU0gKzAyMDAsIE1hcmNpbiBTbHVzYXJ6IHdyb3RlOgo+ID4+ID4+PiBCYWls IG91dCBlYXJseSBpbiBwcm9iZSwgc28gb3RoZXIgZHJpdmVyIGNhbiB0YWtlIGNvbnRyb2wgb2Yg dGhlIGNhcmQuCj4gPj4gPj4+IERvaW5nIGl0IGluIHNjcmVlbl9jcmVhdGUgd291bGQgYmUgdG9v IGxhdGUuCj4gPj4gPj4+IC0tLQo+ID4+ID4+PiDCoHNyYy9nYWxsaXVtL3RhcmdldHMveG9yZy1u b3V2ZWF1L25vdXZlYXVfeG9yZy5jIHwgwqAgNDQgKysrKysrKysrKysrKysrKysrLS0tLS0KPiA+ PiA+Pj4gwqAxIGZpbGVzIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0p Cj4gPj4gPj4KPiA+PiA+PiBwaW5nCj4gPj4gPj4KPiA+PiA+Cj4gPj4gPiBXaHkgZG8geW91IG5l ZWQgYSBsaXN0IG9mIGNhcmRzIGZvciB0aGF0LCBhcyBvcHBvc2VkIHRvIHJlYWRpbmcgdGhlIHJl Zz8KPiA+PiA+Cj4gPj4KPiA+PiBJIGFncmVlIHdpdGggU3RlcGhhbmUsIGNoZWNraW5nIHJlZ2lz dGVyIDAgc2hvdWxkIHdvcmsgZmluZS4gRmlyc3QKPiA+PiBjaGVjayBmb3IgTlYwNC8wNSwgdGhl biBmb3IgTlYxMC1OVjJGLgo+ID4+Cj4gPgo+ID4gSSBkaWQgaXQgdGhpcyB3YXkgYmVjYXVzZSBJ IGRpZG4ndCBoYXZlIGFjY2VzcyB0byBkZXZpY2UgZmlsZSBkZXNjcmlwdG9yIC0gaXQncyBjcmVh dGVkCj4gPiBzb21ld2hlcmUgbmVhciBJbml0U2NyZWVuIGFuZCBwYXNzZWQgdG8gbm91dmVhdV9k cm1fc2NyZWVuX2NyZWF0ZSAtIHRvbyBsYXRlIHRvCj4gPiBleGl0IGdyYWNlZnVsbHkgKHNvbWV0 aGluZyB3aGljaCBJIGJlbGlldmUgaXMgYSBidWcsIGJ1dCBJIGNvdWxkbid0IHRyYWNrIGl0KS4K PiA+Cj4gPiBCdXQgbm93IEkgc2VlIHhmODYtdmlkZW8tbm91dmVhdSBpcyBpbiBleGFjdGx5IHRo ZSBzYW1lIHNpdHVhdGlvbiAtIGl0IG9wZW5zIGZkCj4gPiB0ZW1wb3JhcmlseSBpbiBQY2lQcm9i ZS4gSSdsbCBhZGFwdCBpdHMgY29kZSB0byB0YXJnZXQveG9yZy1ub3V2ZWF1Lgo+IAo+IEkgd2Fz IGluY29ycmVjdCBpbiBzYXlpbmcgdGhhdCB5b3Ugc2hvdWxkIGNoZWNrIHJlZ2lzdGVycyB5b3Vy c2VsZgo+ICh3aGljaCB3b3VsZCByZXF1aXJlIHJvb3QpLCBidXQgb3BlbmluZyB0aGUgZGV2aWNl IHNob3VsZCBnaXZlIHlvdSB0aGUKPiBjaGlwc2V0IHR5cGUuCj4gCgpZZWFoLiBOZXcgcGF0Y2gg YmVsb3cuClRoYW5rcyEKCi0tLQpGcm9tOiBNYXJjaW4gU2x1c2FyeiA8bWFyY2luLnNsdXNhcnpA Z21haWwuY29tPgpTdWJqZWN0OiBbUEFUQ0hdIHhvcmcvbm91dmVhdTogYmxhY2tsaXN0IGFsbCBw cmUgTlYzMCBjYXJkcwoKQmFpbCBvdXQgZWFybHkgaW4gcHJvYmUsIHNvIG90aGVyIGRyaXZlciAo eGY4Ni12aWRlby1ub3V2ZWF1KSBjYW4gdGFrZSBjb250cm9sCm9mIHRoZSBjYXJkLiBEb2luZyBp dCBpbiBzY3JlZW5fY3JlYXRlIHdvdWxkIGJlIHRvbyBsYXRlLgotLS0KIHNyYy9nYWxsaXVtL3Rh cmdldHMveG9yZy1ub3V2ZWF1L01ha2VmaWxlICAgICAgIHwgICAgMyArCiBzcmMvZ2FsbGl1bS90 YXJnZXRzL3hvcmctbm91dmVhdS9ub3V2ZWF1X3hvcmcuYyB8ICAgNjMgKysrKysrKysrKysrKysr KysrKy0tLQogMiBmaWxlcyBjaGFuZ2VkLCA1NyBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3NyYy9nYWxsaXVtL3RhcmdldHMveG9yZy1ub3V2ZWF1L01ha2VmaWxl IGIvc3JjL2dhbGxpdW0vdGFyZ2V0cy94b3JnLW5vdXZlYXUvTWFrZWZpbGUKaW5kZXggMTZhYzk1 NC4uNzU1OTY5YyAxMDA2NDQKLS0tIGEvc3JjL2dhbGxpdW0vdGFyZ2V0cy94b3JnLW5vdXZlYXUv TWFrZWZpbGUKKysrIGIvc3JjL2dhbGxpdW0vdGFyZ2V0cy94b3JnLW5vdXZlYXUvTWFrZWZpbGUK QEAgLTIzLDQgKzIzLDcgQEAgRFJJVkVSX1BJUEVTID0gXAogRFJJVkVSX0xJTktTID0gXAogCSQo c2hlbGwgcGtnLWNvbmZpZyAtLWxpYnMgbGliZHJtIGxpYmRybV9ub3V2ZWF1KQogCitEUklWRVJf SU5DTFVERVMgPSBcCisJJChzaGVsbCBwa2ctY29uZmlnIC0tY2ZsYWdzLW9ubHktSSBsaWJkcm0g bGliZHJtX25vdXZlYXUgeGY4NmRyaXByb3RvKQorCiBpbmNsdWRlIC4uL01ha2VmaWxlLnhvcmcK ZGlmZiAtLWdpdCBhL3NyYy9nYWxsaXVtL3RhcmdldHMveG9yZy1ub3V2ZWF1L25vdXZlYXVfeG9y Zy5jIGIvc3JjL2dhbGxpdW0vdGFyZ2V0cy94b3JnLW5vdXZlYXUvbm91dmVhdV94b3JnLmMKaW5k ZXggYTI1MjU0YS4uNDM0NzBhMSAxMDA2NDQKLS0tIGEvc3JjL2dhbGxpdW0vdGFyZ2V0cy94b3Jn LW5vdXZlYXUvbm91dmVhdV94b3JnLmMKKysrIGIvc3JjL2dhbGxpdW0vdGFyZ2V0cy94b3JnLW5v dXZlYXUvbm91dmVhdV94b3JnLmMKQEAgLTI5LDYgKzI5LDkgQEAKICAqLwogCiAjaW5jbHVkZSAi Li4vLi4vc3RhdGVfdHJhY2tlcnMveG9yZy94b3JnX3dpbnN5cy5oIgorI2luY2x1ZGUgPG5vdXZl YXVfZHJtaWYuaD4KKyNpbmNsdWRlIDx4b3JnL2RyaS5oPgorI2luY2x1ZGUgPHhmODZkcm1Nb2Rl Lmg+CiAKIHN0YXRpYyB2b2lkIG5vdXZlYXVfeG9yZ19pZGVudGlmeShpbnQgZmxhZ3MpOwogc3Rh dGljIEJvb2wgbm91dmVhdV94b3JnX3BjaV9wcm9iZShEcml2ZXJQdHIgZHJpdmVyLCBpbnQgZW50 aXR5X251bSwKQEAgLTM4LDE2ICs0MSw5IEBAIHN0YXRpYyBCb29sIG5vdXZlYXVfeG9yZ19wY2lf cHJvYmUoRHJpdmVyUHRyIGRyaXZlciwgaW50IGVudGl0eV9udW0sCiBzdGF0aWMgY29uc3Qgc3Ry dWN0IHBjaV9pZF9tYXRjaCBub3V2ZWF1X3hvcmdfZGV2aWNlX21hdGNoW10gPSB7CiAgICAgeyAw eDEwZGUsIFBDSV9NQVRDSF9BTlksIFBDSV9NQVRDSF9BTlksIFBDSV9NQVRDSF9BTlksCiAgICAg ICAweDAwMDMwMDAwLCAweDAwZmZmZmZmLCAwIH0sCi0gICAgeyAweDEyZDIsIFBDSV9NQVRDSF9B TlksIFBDSV9NQVRDSF9BTlksIFBDSV9NQVRDSF9BTlksCi0gICAgICAweDAwMDMwMDAwLCAweDAw ZmZmZmZmLCAwIH0sCiAgICAgezAsIDAsIDB9LAogfTsKIAotc3RhdGljIFN5bVRhYlJlYyBub3V2 ZWF1X3hvcmdfY2hpcHNldHNbXSA9IHsKLSAgICB7UENJX01BVENIX0FOWSwgIk5WSURJQSBHcmFw aGljcyBEZXZpY2UifSwKLSAgICB7LTEsIE5VTEx9Ci19OwotCiBzdGF0aWMgUGNpQ2hpcHNldHMg bm91dmVhdV94b3JnX3BjaV9kZXZpY2VzW10gPSB7CiAgICAge1BDSV9NQVRDSF9BTlksIFBDSV9N QVRDSF9BTlksIE5VTEx9LAogICAgIHstMSwgLTEsIE5VTEx9CkBAIC0xMjEsOCArMTE3LDcgQEAg bm91dmVhdV94b3JnX3NldHVwKHBvaW50ZXIgbW9kdWxlLCBwb2ludGVyIG9wdHMsIGludCAqZXJy bWFqLCBpbnQgKmVycm1pbikKIHN0YXRpYyB2b2lkCiBub3V2ZWF1X3hvcmdfaWRlbnRpZnkoaW50 IGZsYWdzKQogewotICAgIHhmODZQcmludENoaXBzZXRzKCJub3V2ZWF1MiIsICJEcml2ZXIgZm9y IE1vZGVzZXR0aW5nIEtlcm5lbCBEcml2ZXJzIiwKLQkJICAgICAgbm91dmVhdV94b3JnX2NoaXBz ZXRzKTsKKyAgICB4Zjg2RHJ2TXNnKDAsIFhfSU5GTywgIm5vdXZlYXUyOiBHYWxsaXVtM0QgYmFz ZWQgMkQgZHJpdmVyIGZvciBOVjMwKyBOVklESUEgY2hpcHNldHNcbiIpOwogfQogCiBzdGF0aWMg Qm9vbApAQCAtMTMxLDYgKzEyNiw1NiBAQCBub3V2ZWF1X3hvcmdfcGNpX3Byb2JlKERyaXZlclB0 ciBkcml2ZXIsCiB7CiAgICAgU2NybkluZm9QdHIgc2NybiA9IE5VTEw7CiAgICAgRW50aXR5SW5m b1B0ciBlbnRpdHk7CisgICAgc3RydWN0IG5vdXZlYXVfZGV2aWNlICpkZXYgPSBOVUxMOworICAg IGNoYXIgKmJ1c2lkOworICAgIGludCBjaGlwc2V0LCByZXQ7CisKKyAgICBpZiAoZGV2aWNlLT52 ZW5kb3JfaWQgIT0gMHgxMERFKQorCXJldHVybiBGQUxTRTsKKworICAgIGlmICgheGY4NkxvYWRl ckNoZWNrU3ltYm9sKCJEUklDcmVhdGVQQ0lCdXNJRCIpKSB7CisJeGY4NkRydk1zZygtMSwgWF9F UlJPUiwgIltkcm1dIE5vIERSSUNyZWF0ZVBDSUJ1c0lEIHN5bWJvbFxuIik7CisJcmV0dXJuIEZB TFNFOworICAgIH0KKyAgICBidXNpZCA9IERSSUNyZWF0ZVBDSUJ1c0lEKGRldmljZSk7CisKKyAg ICByZXQgPSBub3V2ZWF1X2RldmljZV9vcGVuKCZkZXYsIGJ1c2lkKTsKKyAgICBpZiAocmV0KSB7 CisJeGY4NkRydk1zZygtMSwgWF9FUlJPUiwgIltkcm1dIGZhaWxlZCB0byBvcGVuIGRldmljZVxu Iik7CisJZnJlZShidXNpZCk7CisJcmV0dXJuIEZBTFNFOworICAgIH0KKworICAgIGNoaXBzZXQg PSBkZXYtPmNoaXBzZXQ7CisgICAgbm91dmVhdV9kZXZpY2VfY2xvc2UoJmRldik7CisKKyAgICBy ZXQgPSBkcm1DaGVja01vZGVzZXR0aW5nU3VwcG9ydGVkKGJ1c2lkKTsKKyAgICBmcmVlKGJ1c2lk KTsKKyAgICBpZiAocmV0KSB7CisJeGY4NkRydk1zZygtMSwgWF9FUlJPUiwgIltkcm1dIEtNUyBu b3QgZW5hYmxlZFxuIik7CisJcmV0dXJuIEZBTFNFOworICAgIH0KKworICAgIHN3aXRjaCAoY2hp cHNldCAmIDB4ZjApIHsKKyAgICBjYXNlIDB4MDA6CisgICAgY2FzZSAweDEwOgorICAgIGNhc2Ug MHgyMDoKKwl4Zjg2RHJ2TXNnKC0xLCBYX05PVElDRSwgIlRvbyBvbGQgY2hpcHNldDogTlYlMDJ4 XG4iLCBjaGlwc2V0KTsKKwlyZXR1cm4gRkFMU0U7CisgICAgY2FzZSAweDMwOgorICAgIGNhc2Ug MHg0MDoKKyAgICBjYXNlIDB4NjA6CisgICAgY2FzZSAweDUwOgorICAgIGNhc2UgMHg4MDoKKyAg ICBjYXNlIDB4OTA6CisgICAgY2FzZSAweGEwOgorICAgIGNhc2UgMHhjMDoKKwl4Zjg2RHJ2TXNn KC0xLCBYX0lORk8sICJEZXRlY3RlZCBjaGlwc2V0OiBOViUwMnhcbiIsIGNoaXBzZXQpOworCWJy ZWFrOworICAgIGRlZmF1bHQ6CisJeGY4NkRydk1zZygtMSwgWF9FUlJPUiwgIlVua25vd24gY2hp cHNldDogTlYlMDJ4XG4iLCBjaGlwc2V0KTsKKwlyZXR1cm4gRkFMU0U7CisgICAgfQogCiAgICAg c2NybiA9IHhmODZDb25maWdQY2lFbnRpdHkoc2NybiwgMCwgZW50aXR5X251bSwgbm91dmVhdV94 b3JnX3BjaV9kZXZpY2VzLAogCQkJICAgICAgIE5VTEwsIE5VTEwsIE5VTEwsIE5VTEwsIE5VTEwp OwotLSAKMS43LjQuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCm1lc2EtZGV2IG1haWxpbmcgbGlzdAptZXNhLWRldkBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL21lc2EtZGV2 Cg==