From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mario Kleiner Subject: [PATCH] Add Option "DRI3" to allow to disable DRI3 under EXA. Date: Tue, 30 Jun 2015 05:30:43 +0200 Message-ID: <1435635043-3738-1-git-send-email-mario.kleiner.de@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: mario.kleiner.de-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, bskeggs-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org List-Id: nouveau.vger.kernel.org WC1TZXJ2ZXIgdmVyc2lvbnMgb2xkZXIgdGhhbiAxLjE2LjMgaGF2ZSBidWdzIGluIHRoZWlyCkRS STMvUHJlc2VudCBpbXBsZW1lbnRhdGlvbiB3aGljaCBpbXBhaXIgbm91dmVhdSwgc28KaXQgaXMg YmV0dGVyIHRvIHN0aWNrIHRvIGdvb2Qgb2xkIERSSTIgYnkgZGVmYXVsdCBvbgpzdWNoIHNlcnZl cnMuIEUuZy4sIHBhZ2UgZmxpcHBpbmcgZG9lc24ndCB3b3JrIGF0IGFsbAp1bmRlciBEUkkzL1By ZXNlbnQgd2l0aCBvbGRlciBzZXJ2ZXJzLCBhbmQgdXNlIG9mCmV4dGVuc2lvbnMgbGlrZSBPTUxf c3luY19jb250cm9sLCBTR0lfdmlkZW9fc3luYyBvcgpJTlRFTF9zd2FwX2V2ZW50cyBhbHNvIGNh dXNlcyBmYWlsdXJlIG9mIFByZXNlbnQuCgpub3V2ZWF1J3MgZ2xhbW9yIGFjY2VsIGJhY2tlbmQg Y3VycmVudGx5IGRvZXNuJ3Qgd29yayB1bmRlcgpEUkkyLCBzbyBjb250aW51ZSB0byB1c2UgRFJJ MyB3aGVuZXZlciBpdCBpcyBzdXBwb3J0ZWQuCgpVbmRlciB0aGUgZXhhIGFjY2VsIGJhY2tlbmQs IERSSTIgd29ya3MganVzdCBmaW5lLCBzbwpkaXNhYmxlIERSSTMgYW5kIGNob29zZSBEUkkyIGJ5 IGRlZmF1bHQgd2hlbiBub3V2ZWF1CmlzIGJ1aWx0IGZvciBYLVNlcnZlciA8IDEuMTYuMywgYW5k IGVuYWJsZSBEUkkzIGlmCmJ1aWxkaW5nIG9uIGxhdGVyIFgtU2VydmVycyB3aGljaCB3b3JrIHJl YXNvbmFibHkgd2VsbAp1bmRlciBEUkkzL1ByZXNlbnQuCgpBIG5ldyBib29sZWFuIHhvcmcuY29u ZiBPcHRpb24gIkRSSTMiIGFsbG93cyB0byBlbmZvcmNlIG9yCnByZXZlbnQgdXNlIG9mIERSSTMv UHJlc2VudCB1bmRlciBFWEEgYWNjZWxlcmF0aW9uIGZvcgp0ZXN0aW5nLgoKQWxzbyBhZGQgYSBi aXQgbW9yZSBvdXRwdXQgYWJvdXQgc3RhdHVzIG9mIFByZXNlbnQgYW5kCkRSSTMgdG8gYWlkIGRl YnVnZ2luZy4KClNpZ25lZC1vZmYtYnk6IE1hcmlvIEtsZWluZXIgPG1hcmlvLmtsZWluZXIuZGVA Z21haWwuY29tPgotLS0KIG1hbi9ub3V2ZWF1Lm1hbiAgICB8ICA2ICsrKysrKwogc3JjL25vdXZl YXVfZHJpMi5jIHwgMTEgKysrKysrKysrKy0KIHNyYy9udl9jb25zdC5oICAgICB8ICAyICsrCiBz cmMvbnZfZHJpdmVyLmMgICAgfCAxNyArKysrKysrKysrKysrKystLQogNCBmaWxlcyBjaGFuZ2Vk LCAzMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL21hbi9ub3V2 ZWF1Lm1hbiBiL21hbi9ub3V2ZWF1Lm1hbgppbmRleCAxMjliYjdmLi4xMmNmYmMwIDEwMDY0NAot LS0gYS9tYW4vbm91dmVhdS5tYW4KKysrIGIvbWFuL25vdXZlYXUubWFuCkBAIC0xMjUsNiArMTI1 LDEyIEBAIHRoYXQgcmVsaWVzIG9uIGNvcnJlY3QgcHJlc2VudGF0aW9uIHRpbWluZyBiZWhhdmlv dXIgYXMgZGVmaW5lZCBpbiB0aGF0CiBzcGVjaWZpY2F0aW9uLgogLmJyCiBEZWZhdWx0OiAxLgor LlRQCisuQkkgIk9wdGlvbiBcKnFEUkkzXCpxIFwqcSIgYm9vbGVhbiBcKnEKK0VuYWJsZSB0aGUg RFJJMyBleHRlbnNpb24gdW5kZXIgZXhhIGFjY2VsZXJhdGlvbiBpZiBzdXBwb3J0ZWQgYnkgc2Vy dmVyLgorQSBzZXR0aW5nIG9mICJvZmYiIHdpbGwgb25seSB1c2UgRFJJMiBpbnN0ZWFkLiBVbmRl ciBnbGFtb3IgYWNjZWxlcmF0aW9uLAorRFJJMyBpcyBhbHdheXMgZW5hYmxlZCBpZiBzdXBwb3J0 ZWQuIERlZmF1bHQ6IG9uIGZvciBYT3JnID49IDEuMTYuMywgb2ZmIGZvcgorZWFybGllciB2ZXJz aW9ucy4KIC5TSCAiU0VFIEFMU08iCiBfX3hzZXJ2ZXJuYW1lX18oX19hcHBtYW5zdWZmaXhfXyks IF9feGNvbmZpZ2ZpbGVfXyhfX2ZpbGVtYW5zdWZmaXhfXyksIFhzZXJ2ZXIoX19hcHBtYW5zdWZm aXhfXyksIFgoX19taXNjbWFuc3VmZml4X18pCiAuU0ggQVVUSE9SUwpkaWZmIC0tZ2l0IGEvc3Jj L25vdXZlYXVfZHJpMi5jIGIvc3JjL25vdXZlYXVfZHJpMi5jCmluZGV4IGYyMmUzMTkuLmQ4MTg5 NzYgMTAwNjQ0Ci0tLSBhL3NyYy9ub3V2ZWF1X2RyaTIuYworKysgYi9zcmMvbm91dmVhdV9kcmky LmMKQEAgLTExMzAsNyArMTEzMCwxNiBAQCBub3V2ZWF1X2RyaTNfc2NyZWVuX2luaXQoU2NyZWVu UHRyIHNjcmVlbikKIAlpZiAoYnVmICYmIHN0YXQoYnVmLCAmcmVuZGVyKSA9PSAwICYmCiAJICAg IG1hc3Rlci5zdF9tb2RlID09IHJlbmRlci5zdF9tb2RlKSB7CiAJCXBOdi0+cmVuZGVyX25vZGUg PSBidWY7Ci0JCXJldHVybiBkcmkzX3NjcmVlbl9pbml0KHNjcmVlbiwgJm5vdXZlYXVfZHJpM19z Y3JlZW5faW5mbyk7CisJCWlmIChkcmkzX3NjcmVlbl9pbml0KHNjcmVlbiwgJm5vdXZlYXVfZHJp M19zY3JlZW5faW5mbykpIHsKKwkJCXhmODZEcnZNc2cocFNjcm4tPnNjcm5JbmRleCwgWF9JTkZP LAorCQkJCSAgICJEUkkzIG9uIEVYQSBlbmFibGVkXG4iKTsKKwkJCXJldHVybiBUUlVFOworCQl9 CisJCWVsc2UgeworCQkJeGY4NkRydk1zZyhwU2Nybi0+c2NybkluZGV4LCBYX1dBUk5JTkcsCisJ CQkJICAgIkRSSTMgb24gRVhBIGluaXRpYWxpemF0aW9uIGZhaWxlZFxuIik7CisJCQlyZXR1cm4g RkFMU0U7CisJCX0KIAl9IGVsc2UKIAkJZnJlZShidWYpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9z cmMvbnZfY29uc3QuaCBiL3NyYy9udl9jb25zdC5oCmluZGV4IGYxYjRlOWIuLmRmMWUzOTggMTAw NjQ0Ci0tLSBhL3NyYy9udl9jb25zdC5oCisrKyBiL3NyYy9udl9jb25zdC5oCkBAIC0xOCw2ICsx OCw3IEBAIHR5cGVkZWYgZW51bSB7CiAgICAgT1BUSU9OX1NXQVBfTElNSVQsCiAgICAgT1BUSU9O X0FTWU5DX0NPUFksCiAgICAgT1BUSU9OX0FDQ0VMTUVUSE9ELAorICAgIE9QVElPTl9EUkkzLAog fSBOVk9wdHM7CiAKIApAQCAtMzQsNiArMzUsNyBAQCBzdGF0aWMgY29uc3QgT3B0aW9uSW5mb1Jl YyBOVk9wdGlvbnNbXSA9IHsKICAgICB7IE9QVElPTl9TV0FQX0xJTUlULAkiU3dhcExpbWl0IiwJ T1BUVl9JTlRFR0VSLAl7MH0sIEZBTFNFIH0sCiAgICAgeyBPUFRJT05fQVNZTkNfQ09QWSwJIkFz eW5jVVRTREZTIiwJT1BUVl9CT09MRUFOLAl7MH0sIEZBTFNFIH0sCiAgICAgeyBPUFRJT05fQUND RUxNRVRIT0QsCSJBY2NlbE1ldGhvZCIsCU9QVFZfU1RSSU5HLAl7MH0sIEZBTFNFIH0sCisgICAg eyBPUFRJT05fRFJJMywJCSJEUkkzIiwJCU9QVFZfQk9PTEVBTiwJezB9LCBGQUxTRSB9LAogICAg IHsgLTEsICAgICAgICAgICAgICAgICAgICAgICBOVUxMLCAgICAgICAgICAgT1BUVl9OT05FLCAg ICAgIHswfSwgRkFMU0UgfQogfTsKIApkaWZmIC0tZ2l0IGEvc3JjL252X2RyaXZlci5jIGIvc3Jj L252X2RyaXZlci5jCmluZGV4IDhlMmFlMDMuLjMyZjA0ZDggMTAwNjQ0Ci0tLSBhL3NyYy9udl9k cml2ZXIuYworKysgYi9zcmMvbnZfZHJpdmVyLmMKQEAgLTE0NzAsNyArMTQ3MCwxMyBAQCBOVlNj cmVlbkluaXQoU0NSRUVOX0lOSVRfQVJHU19ERUNMKQogCiAJeGY4NlNldEJsYWNrV2hpdGVQaXhl bHMocFNjcmVlbik7CiAKLQlub3V2ZWF1X3ByZXNlbnRfaW5pdChwU2NyZWVuKTsKKwlpZiAobm91 dmVhdV9wcmVzZW50X2luaXQocFNjcmVlbikgPD0gMCkKKwkJeGY4NkRydk1zZyhwU2Nybi0+c2Ny bkluZGV4LCBYX0lORk8sCisJCQkgICAiSGFyZHdhcmUgc3VwcG9ydCBmb3IgUHJlc2VudCBkaXNh YmxlZFxuIik7CisJZWxzZQorCQl4Zjg2RHJ2TXNnKHBTY3JuLT5zY3JuSW5kZXgsIFhfSU5GTywK KwkJCSAgICJIYXJkd2FyZSBzdXBwb3J0IGZvciBQcmVzZW50IGVuYWJsZWRcbiIpOworCiAJbm91 dmVhdV9zeW5jX2luaXQocFNjcmVlbik7CiAJbm91dmVhdV9kcmkyX2luaXQocFNjcmVlbik7CiAJ aWYgKHBOdi0+QWNjZWxNZXRob2QgPT0gR0xBTU9SKSB7CkBAIC0xNDc4LDcgKzE0ODQsMTQgQEAg TlZTY3JlZW5Jbml0KFNDUkVFTl9JTklUX0FSR1NfREVDTCkKIAkJCXJldHVybiBGQUxTRTsKIAl9 IGVsc2UKIAlpZiAocE52LT5BY2NlbE1ldGhvZCA9PSBFWEEpIHsKLQkJaWYgKCFub3V2ZWF1X2Ry aTNfc2NyZWVuX2luaXQocFNjcmVlbikpCisJCS8qIERlZmF1bHQgdG8gRFJJMy9QcmVzZW50IG9u IFhPcmcgPj0gMS4xNi4zLCBEUkkyIG9uIG9sZGVyCisJCSAqIHNlcnZlcnMsIGFzIG9sZGVyIHNl cnZlcnMgaGF2ZSBEUkkzL1ByZXNlbnQgYnVncyBhZmZlY3RpbmcKKwkJICogbm91dmVhdS4KKwkJ ICovCisJCXJldCA9IHhmODZSZXR1cm5PcHRWYWxCb29sKHBOdi0+T3B0aW9ucywgT1BUSU9OX0RS STMsCisJCQkJCSAgIFhPUkdfVkVSU0lPTl9DVVJSRU5UID49CisJCQkJCSAgIFhPUkdfVkVSU0lP Tl9OVU1FUklDKDEsMTYsMywwLDApKTsKKwkJaWYgKHJldCAmJiAhbm91dmVhdV9kcmkzX3NjcmVl bl9pbml0KHBTY3JlZW4pKQogCQkJcmV0dXJuIEZBTFNFOwogCiAJCWlmICghbm91dmVhdV9leGFf aW5pdChwU2NyZWVuKSkKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpOb3V2ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v bm91dmVhdQo=