From owner-freebsd-x11@FreeBSD.ORG Mon May 31 20:38:36 2010 Return-Path: Delivered-To: x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6D7B106566B for ; Mon, 31 May 2010 20:38:36 +0000 (UTC) (envelope-from prvs=176095df4f=brian@FreeBSD.org) Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10]) by mx1.freebsd.org (Postfix) with ESMTP id A46958FC18 for ; Mon, 31 May 2010 20:38:36 +0000 (UTC) Received: from pd2ml1so-ssvc.prod.shaw.ca ([10.0.141.139]) by pd2mo1so-svcs.prod.shaw.ca with ESMTP; 31 May 2010 14:38:35 -0600 X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.0 c=1 a=zNANCjgXmV0A:10 a=VphdPIyG4kEA:10 a=ORa4HqFjfvEA:10 a=MJPcHhXccCG8eBs0us8XwA==:17 a=mK_AVkanAAAA:8 a=6I5d2MoRAAAA:8 a=MMwg4So0AAAA:8 a=wCO4d6t7FeX4ZqGKdisA:9 a=UBWBJl0cGzBUaW7tAckpkjKIMSYA:4 a=CjuIK1q_8ugA:10 a=9xyTavCNlvEA:10 a=SV7veod9ZcQA:10 a=WJ3hkfHDukgA:10 a=3ZjZWZurihkrJfVgr_gA:9 a=bmvayrgOwZxWQ-zr9tUA:7 a=W3IbhcOaPZXZrcdUoiBYJdH1JXIA:4 Received: from unknown (HELO store.lan.Awfulhak.org) ([70.79.162.198]) by pd2ml1so-dmz.prod.shaw.ca with ESMTP; 31 May 2010 14:38:35 -0600 Received: from store.lan.Awfulhak.org (localhost.localdomain [127.0.0.1]) by localhost (Email Security Appliance) with SMTP id DB723C433B1_C041E4AB; Mon, 31 May 2010 20:38:34 +0000 (GMT) Received: from gw.Awfulhak.org (gw.lan.Awfulhak.org [172.16.0.1]) by store.lan.Awfulhak.org (Sophos Email Appliance) with ESMTP id 01579C460FB_C041E46F; Mon, 31 May 2010 20:38:29 +0000 (GMT) Received: from localhost (brian@gw.lan.Awfulhak.org [172.16.0.1]) by gw.Awfulhak.org (8.14.4/8.14.4) with ESMTP id o4VKcTgT007181; Mon, 31 May 2010 13:38:29 -0700 (PDT) (envelope-from brian@FreeBSD.org) Date: Mon, 31 May 2010 13:39:29 -0700 From: Brian Somers To: gljennjohn@googlemail.com Message-ID: <20100531133929.0f035c0c@FreeBSD.org> In-Reply-To: <20100531115939.06d6eea5@ernst.jennejohn.org> References: <20100531011111.22064479@dev.lan.Awfulhak.org> <20100531115939.06d6eea5@ernst.jennejohn.org> X-Mailer: Claws Mail 3.7.5 (GTK+ 2.18.7; i386-portbld-freebsd9.0) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/NGnUAFP4z1_5h6D+CG3Su+m" Cc: x11@FreeBSD.org Subject: Re: xf86-video-mga patch X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 20:38:37 -0000 --MP_/NGnUAFP4z1_5h6D+CG3Su+m Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Mon, 31 May 2010 11:59:39 +0200, Gary Jennejohn wrote: > On Mon, 31 May 2010 01:11:11 -0700 > Brian Somers wrote: > > > Hi, > > > > Since upgrading to xorg-7.5 (on -current) my dual-head matrox g450 configuration > > has broken with the following error: > > > > "MGA(0): Unable to map BAR 0. Invalid argument (22)" > > > > This is talked about on various forums and can be fixed with the attached patch. > > > > ENPOATCH > > -- > Gary Jennejohn Oops, what a moron. I've attached it this time! -- Brian Somers Don't _EVER_ lose your sense of humour ! --MP_/NGnUAFP4z1_5h6D+CG3Su+m 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_/NGnUAFP4z1_5h6D+CG3Su+m--