Date: Sat, 5 Jun 2010 02:53:09 -0700 From: Brian Somers <brian@FreeBSD.org> To: Robert Noland <rnoland@FreeBSD.org> Cc: x11@FreeBSD.org Subject: Re: xf86-video-mga patch Message-ID: <20100605025309.44f8c115@dev.lan.Awfulhak.org> In-Reply-To: <4C0541B1.5000707@FreeBSD.org> References: <20100531011111.22064479@dev.lan.Awfulhak.org> <4C0541B1.5000707@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Sig_/XH/XdZ5AoPL7v5u/9sU9F3P Content-Type: multipart/mixed; boundary="MP_/V9xYhwgrCiRoDVK4xNmPznI" --MP_/V9xYhwgrCiRoDVK4xNmPznI Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Tue, 01 Jun 2010 12:21:53 -0500 Robert Noland <rnoland@FreeBSD.org> wrot= e: >=20 >=20 > Brian Somers wrote: > > Hi, > >=20 > > Since upgrading to xorg-7.5 (on -current) my dual-head matrox g450 conf= iguration > > has broken with the following error: > >=20 > > "MGA(0): Unable to map BAR 0. Invalid argument (22)" > >=20 > > This is talked about on various forums and can be fixed with the attach= ed patch. > >=20 > > This patch is a (slightly) modified version of "mga-driver-3.patch" whi= ch was against > > the 1.4.9-r1 version of the mga driver. There is a "mga-driver-4.patch= " available that > > is against the 1.4.11 version of the mga driver (which we have in the p= orts tree), but > > it doesn't build on FreeBSD. As my patch works, I'd like to submit it = to the tree pending > > any updates from xorg. You can read more about these patches by googli= ng the above > > error message. > >=20 > > BTW, I chose not to merge it with the other mga_driver.c patch as it's = easier to pull > > if and when the xorg folks produce an official fix. > >=20 > > So is it ok to submit this as "patch-mga-driver-3"? >=20 > The attachment was stripped. >=20 > robert. Just in case you didn't get the attachment, here it is. Cheers. --=20 Brian Somers <brian@Awfulhak.org> Don't _EVER_ lose your sense of humour ! <brian@FreeBSD.org> --MP_/V9xYhwgrCiRoDVK4xNmPznI Content-Type: application/octet-stream; name=patch-mga-driver-3 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=patch-mga-driver-3 ZGlmZiAtdXJOIG9sZC1zcmMvbWdhX2RyaXZlci5jIHNyYy9tZ2FfZHJpdmVyLmMKLS0tIG9sZC1z cmMvbWdhX2RyaXZlci5jCTIwMDgtMTEtMTMgMTU6MTE6MzUuMDAwMDAwMDAwICswMDAwCisrKyBz cmMvbWdhX2RyaXZlci5jCTIwMDgtMTEtMTMgMTU6MTc6MjQuMDAwMDAwMDAwICswMDAwCkBAIC0y OTkwLDMwICsyOTk0LDU3IEBACiAjaWZkZWYgWFNFUlZFUl9MSUJQQ0lBQ0NFU1MKICAgICBzdHJ1 Y3QgcGNpX2RldmljZSAqY29uc3QgZGV2ID0gcE1nYS0+UGNpSW5mbzsKICAgICBzdHJ1Y3QgcGNp X21lbV9yZWdpb24gKnJlZ2lvbjsKLSAgICB2b2lkICoqbWVtb3J5WzJdOwogICAgIGludCBpLCBl cnI7CiAjZW5kaWYKIAogCiAgICAgaWYgKCFwTWdhLT5GQkRldikgewogI2lmZGVmIFhTRVJWRVJf TElCUENJQUNDRVNTCi0gICAgICAgIG1lbW9yeVtwTWdhLT5pb19iYXJdID0gJnBNZ2EtPklPQmFz ZTsKLSAgICAgICAgbWVtb3J5W3BNZ2EtPmZyYW1lYnVmZmVyX2Jhcl0gPSAmcE1nYS0+RmJCYXNl OwogCi0gICAgICAgIGZvciAoaSA9IDA7IGkgPCAyOyBpKyspIHsKLSAgICAgICAgICAgIHJlZ2lv biA9ICZkZXYtPnJlZ2lvbnNbaV07Ci0gICAgICAgICAgICBlcnIgPSBwY2lfZGV2aWNlX21hcF9y YW5nZShkZXYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWdpb24t PmJhc2VfYWRkciwgcmVnaW9uLT5zaXplLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgUENJX0RFVl9NQVBfRkxBR19XUklUQUJMRSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1lbW9yeVtpXSk7CisJICAgIHBjaWFkZHJfdCBmYmFkZHIgPSBw TWdhLT5GYkFkZHJlc3M7CisJICAgIHBjaWFkZHJfdCBmYnNpemUgPSBwTWdhLT5GYk1hcFNpemU7 CisJZXJyID0gcGNpX2RldmljZV9tYXBfcmFuZ2UoZGV2LAorCQkJCSAgIGZiYWRkciwgZmJzaXpl LAorCQkJCSAgIFBDSV9ERVZfTUFQX0ZMQUdfV1JJVEFCTEUsCisJCQkJICAgKHZvaWQgKiopJnBN Z2EtPkZiQmFzZSk7CiAKLSAgICAgICAgICAgIGlmIChlcnIpIHsKKwlpZiAoZXJyKSB7CiAgICAg ICAgICAgICAgICAgeGY4NkRydk1zZyhwU2Nybi0+c2NybkluZGV4LCBYX0VSUk9SLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIlVuYWJsZSB0byBtYXAgQkFSICVpLiAgJXMgKCVkKVxuIiwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgIGksIHN0cmVycm9yKGVyciksIGVycik7CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAiVW5hYmxlIHRvIG1hcCBGcmFtZWJ1ZmZlciAlMDhsbFgg JWxseC4gICVzICglZClcbiIsIChsb25nIGxvbmcpZmJhZGRyLCAobG9uZyBsb25nKWZic2l6ZSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cmVycm9yKGVyciksIGVycik7CiAgICAgICAg ICAgICAgICAgcmV0dXJuIEZBTFNFOwotICAgICAgICAgICAgfQotICAgICAgICB9CisJfQorCWVs c2UKKyAgICAgICAgICAgICAgICB4Zjg2RHJ2TXNnKHBTY3JuLT5zY3JuSW5kZXgsIFhfSU5GTywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICJNQVBQRUQgRnJhbWVidWZmZXIgJTA4bGxYICVs bHggdG8gJTA4bGxYLlxuIiwgKGxvbmcgbG9uZylmYmFkZHIsIChsb25nIGxvbmcpZmJzaXplLCAo bG9uZyBsb25nKXBNZ2EtPkZiQmFzZSk7CisKKwkKKwlpZihwTWdhLT5lbnRpdHlQcml2YXRlID09 IE5VTEwgfHwgcE1nYS0+ZW50aXR5UHJpdmF0ZS0+bWFwcGVkSU9Vc2FnZSA9PSAwKQorCXsKKwkJ cmVnaW9uID0gJmRldi0+cmVnaW9uc1twTWdhLT5pb19iYXJdOworCQllcnIgPSBwY2lfZGV2aWNl X21hcF9yYW5nZShkZXYsCisJCQkJICAgcmVnaW9uLT5iYXNlX2FkZHIsIHJlZ2lvbi0+c2l6ZSwK KwkJCQkgICBQQ0lfREVWX01BUF9GTEFHX1dSSVRBQkxFLAorCQkJCSAgICZwTWdhLT5JT0Jhc2Up OworCisJCWlmIChlcnIpIHsKKwkJCXhmODZEcnZNc2cocFNjcm4tPnNjcm5JbmRleCwgWF9FUlJP UiwKKwkJCQkgICAiVW5hYmxlIHRvIG1hcCBJTyBSZWdpb24gJWkuICAlcyAoJWQpXG4iLAorCQkJ CSAgIHBNZ2EtPmlvX2Jhciwgc3RyZXJyb3IoZXJyKSwgZXJyKTsKKwkJCXJldHVybiBGQUxTRTsK KwkJfQorCisJCWlmKHBNZ2EtPmVudGl0eVByaXZhdGUgIT0gTlVMTCkKKwkJeworCQkJcE1nYS0+ ZW50aXR5UHJpdmF0ZS0+bWFwcGVkSU9CYXNlID0gcE1nYS0+SU9CYXNlOworCQl9CisJfQorCWVs c2UKKwkJcE1nYS0+SU9CYXNlID0gcE1nYS0+ZW50aXR5UHJpdmF0ZS0+bWFwcGVkSU9CYXNlOwor CisJaWYocE1nYS0+ZW50aXR5UHJpdmF0ZSAhPSBOVUxMKQkJCisJCXBNZ2EtPmVudGl0eVByaXZh dGUtPm1hcHBlZElPVXNhZ2UgKys7CisKICNlbHNlCiAJLyoKIAkgKiBGb3IgQWxwaGEsIHdlIG5l ZWQgdG8gbWFwIFNQQVJTRSBtZW1vcnksIHNpbmNlIHdlIG5lZWQKQEAgLTMwNTUsMTYgKzMwODYs MjggQEAKICAgICBpZiAocE1nYS0+aWxvYWRfYmFyICE9IC0xKSB7CiAjaWZkZWYgWFNFUlZFUl9M SUJQQ0lBQ0NFU1MKICAgICAgICAgcmVnaW9uID0gJmRldi0+cmVnaW9uc1twTWdhLT5pbG9hZF9i YXJdOwotICAgICAgICBlcnIgPSBwY2lfZGV2aWNlX21hcF9yYW5nZShkZXYsCisKKwlpZihwTWdh LT5lbnRpdHlQcml2YXRlID09IE5VTEwgfHwgcE1nYS0+ZW50aXR5UHJpdmF0ZS0+bWFwcGVkSUxP QURVc2FnZSA9PSAwKQorCXsKKwkJZXJyID0gcGNpX2RldmljZV9tYXBfcmFuZ2UoZGV2LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWdpb24tPmJhc2VfYWRkciwgcmVnaW9u LT5zaXplLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQQ0lfREVWX01BUF9G TEFHX1dSSVRBQkxFLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAodm9pZCAq KSAmcE1nYS0+SUxPQURCYXNlKTsKLQlpZiAoZXJyKSB7Ci0JICAgIHhmODZEcnZNc2cocFNjcm4t PnNjcm5JbmRleCwgWF9FUlJPUiwKLQkJICAgICAgICJVbmFibGUgdG8gbWFwIEJBUiAyIChJTE9B RCByZWdpb24pLiAgJXMgKCVkKVxuIiwKLQkJICAgICAgIHN0cmVycm9yKGVyciksIGVycik7Ci0J ICAgIHJldHVybiBGQUxTRTsKKwkJaWYgKGVycikgeworCQkJeGY4NkRydk1zZyhwU2Nybi0+c2Ny bkluZGV4LCBYX0VSUk9SLAorCQkJCSAgICJVbmFibGUgdG8gbWFwIEJBUiAyIChJTE9BRCByZWdp b24pLiAgJXMgKCVkKVxuIiwKKwkJCQkgICBzdHJlcnJvcihlcnIpLCBlcnIpOworCQkJcmV0dXJu IEZBTFNFOworCQl9CisKKwkJaWYocE1nYS0+ZW50aXR5UHJpdmF0ZSAhPSBOVUxMKQorCQkJcE1n YS0+ZW50aXR5UHJpdmF0ZS0+bWFwcGVkSUxPQURCYXNlID0gcE1nYS0+SUxPQURCYXNlOwogCX0K KwllbHNlCisJCXBNZ2EtPklMT0FEQmFzZSA9IHBNZ2EtPmVudGl0eVByaXZhdGUtPm1hcHBlZElM T0FEQmFzZTsKKworCWlmKHBNZ2EtPmVudGl0eVByaXZhdGUgIT0gTlVMTCkKKwkJcE1nYS0+ZW50 aXR5UHJpdmF0ZS0+bWFwcGVkSUxPQURVc2FnZSArKzsKICNlbHNlCiAJcE1nYS0+SUxPQURCYXNl ID0geGY4Nk1hcFBjaU1lbShwU2Nybi0+c2NybkluZGV4LAogCQkJCQlWSURNRU1fTU1JTyB8IFZJ RE1FTV9NTUlPXzMyQklUIHwKQEAgLTMwOTQsMTAgKzMxMzcsMjEgQEAKICAgICAKICAgICBpZiAo IXBNZ2EtPkZCRGV2KSB7CiAjaWZkZWYgWFNFUlZFUl9MSUJQQ0lBQ0NFU1MKLSAgICAgICAgcGNp X2RldmljZV91bm1hcF9yYW5nZShkZXYsIHBNZ2EtPklPQmFzZSwgCi0JCQkgICAgICAgZGV2LT5y ZWdpb25zW3BNZ2EtPmlvX2Jhcl0uc2l6ZSk7CisJICAgIGlmKHBNZ2EtPmVudGl0eVByaXZhdGUg IT0gTlVMTCkKKwkJICAgIHBNZ2EtPmVudGl0eVByaXZhdGUtPm1hcHBlZElPVXNhZ2UgLS07CisK KwkgICAgaWYocE1nYS0+ZW50aXR5UHJpdmF0ZSA9PSBOVUxMIHx8IHBNZ2EtPmVudGl0eVByaXZh dGUtPm1hcHBlZElPVXNhZ2UgPT0gMCkKKwkgICAgeworCQkgICAgcGNpX2RldmljZV91bm1hcF9y YW5nZShkZXYsIHBNZ2EtPklPQmFzZSwgCisJCQkJCSAgIGRldi0+cmVnaW9uc1twTWdhLT5pb19i YXJdLnNpemUpOworCisJCSAgICBpZihwTWdhLT5lbnRpdHlQcml2YXRlICE9IE5VTEwpCisJCQkg ICAgcE1nYS0+ZW50aXR5UHJpdmF0ZS0+bWFwcGVkSU9CYXNlID0gTlVMTDsKKwkgICAgfQorCisJ ICAgIHhmODZEcnZNc2cocFNjcm4tPnNjcm5JbmRleCwgWF9JTkZPLCAiVU5NQVBQSU5HIGZyYW1l YnVmZmVyIDB4JTA4bGxYLCAweCVsbFguXG4iLCAobG9uZyBsb25nKXBNZ2EtPkZiQmFzZSwgKGxv bmcgbG9uZylwTWdhLT5GYk1hcFNpemUpOwogICAgICAgICBwY2lfZGV2aWNlX3VubWFwX3Jhbmdl KGRldiwgcE1nYS0+RmJCYXNlLCAKLQkJCSAgICAgICBkZXYtPnJlZ2lvbnNbcE1nYS0+ZnJhbWVi dWZmZXJfYmFyXS5zaXplKTsKKwkJCSAgICAgICBwTWdhLT5GYk1hcFNpemUpOwogI2Vsc2UKIAl4 Zjg2VW5NYXBWaWRNZW0ocFNjcm4tPnNjcm5JbmRleCwgKHBvaW50ZXIpcE1nYS0+SU9CYXNlLCAw eDQwMDApOwogCXhmODZVbk1hcFZpZE1lbShwU2Nybi0+c2NybkluZGV4LCAocG9pbnRlcilwTWdh LT5GYkJhc2UsIHBNZ2EtPkZiTWFwU2l6ZSk7CkBAIC0zMTEwLDggKzMxNjQsMTggQEAKIAogICAg IGlmICgocE1nYS0+aWxvYWRfYmFyICE9IC0xKSAmJiAocE1nYS0+SUxPQURCYXNlICE9IE5VTEwp KSB7CiAjaWZkZWYgWFNFUlZFUl9MSUJQQ0lBQ0NFU1MKLSAgICAgICAgcGNpX2RldmljZV91bm1h cF9yYW5nZShkZXYsIHBNZ2EtPklMT0FEQmFzZSwKKwkgICAgaWYocE1nYS0+ZW50aXR5UHJpdmF0 ZSAhPSBOVUxMKQorCQkgICAgcE1nYS0+ZW50aXR5UHJpdmF0ZS0+bWFwcGVkSUxPQURVc2FnZSAt LTsKKworCSAgICBpZihwTWdhLT5lbnRpdHlQcml2YXRlID09IE5VTEwgfHwgcE1nYS0+ZW50aXR5 UHJpdmF0ZS0+bWFwcGVkSUxPQURVc2FnZSA9PSAwKQorCSAgICB7CisJCSAgICBwY2lfZGV2aWNl X3VubWFwX3JhbmdlKGRldiwgcE1nYS0+SUxPQURCYXNlLAogCQkJICAgICAgIGRldi0+cmVnaW9u c1twTWdhLT5pbG9hZF9iYXJdLnNpemUpOworCisJCSAgICBpZihwTWdhLT5lbnRpdHlQcml2YXRl ICE9IE5VTEwpCisJCQkgICAgcE1nYS0+ZW50aXR5UHJpdmF0ZS0+bWFwcGVkSUxPQURCYXNlID0g TlVMTDsKKwkgICAgfQorCiAjZWxzZQogCXhmODZVbk1hcFZpZE1lbShwU2Nybi0+c2NybkluZGV4 LCAocG9pbnRlcilwTWdhLT5JTE9BREJhc2UsIDB4ODAwMDAwKTsKICNlbmRpZgpkaWZmIC11ck4g b2xkLXNyYy9tZ2EuaCBzcmMvbWdhLmgKLS0tIG9sZC1zcmMvbWdhLmgJMjAwOC0xMS0xMyAxNTox MTozNS4wMDAwMDAwMDAgKzAwMDAKKysrIHNyYy9tZ2EuaAkyMDA4LTExLTEzIDE1OjE3OjEzLjAw MDAwMDAwMCArMDAwMApAQCAtMzMzLDYgKzMzMywxMyBAQAogICAgIGludAkJCW1hc3RlcnZpZGVv UmFtOwogICAgIGludAkJCXNsYXZldmlkZW9SYW07CiAgICAgQm9vbAkJZGlyZWN0UmVuZGVyaW5n RW5hYmxlZDsKKworICAgIHZvaWQgICoJCW1hcHBlZElPQmFzZTsKKyAgICBpbnQJCQltYXBwZWRJ T1VzYWdlOworCisgICAgdm9pZCAgKgkJbWFwcGVkSUxPQURCYXNlOworICAgIGludAkJCW1hcHBl ZElMT0FEVXNhZ2U7CisKICAgICBTY3JuSW5mb1B0ciAJcFNjcm5fMTsKICAgICBTY3JuSW5mb1B0 ciAJcFNjcm5fMjsKIH0gTUdBRW50UmVjLCAqTUdBRW50UHRyOwo= --MP_/V9xYhwgrCiRoDVK4xNmPznI-- --Sig_/XH/XdZ5AoPL7v5u/9sU9F3P Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iQCVAwUBTAoeiw7tvOdmanQhAQL+LAQAhPAsEW9qbYOM2huoWidGnG5xBZZfGxX5 EAOqjV7IstWcz+WKXqTvkJsQw/zxnm20/hPQzGIIM7lRR4zH/OcxrtTYlCzzQBaY 2KiAna7UUnXXL50GSI+5KkG31F6uFaphTc5Takd5lXX2JymutfhZkwn3DhBDdd8S RWxjn4CTiCc= =Y/8g -----END PGP SIGNATURE----- --Sig_/XH/XdZ5AoPL7v5u/9sU9F3P--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100605025309.44f8c115>