From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH libdrm] libdrm: Allow dynamic drm majors on linux Date: Fri, 31 Aug 2018 13:54:19 +0200 Message-ID: <20180831115419.4922-1-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0047.outbound.protection.outlook.com [104.47.33.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id B3E5A6E8CD for ; Fri, 31 Aug 2018 11:54:48 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, linux-graphics-maintainer@vmware.com Cc: Thomas Hellstrom List-Id: dri-devel@lists.freedesktop.org VG8gZGV0ZXJtaW5lIHdoZXRoZXIgYSBkZXZpY2Ugbm9kZSBpcyBhIGRybSBkZXZpY2Ugbm9kZSBv ciBub3QsIHRoZSBjb2RlCmN1cnJlbnRseSBjb21wYXJlcyB0aGUgbm9kZSdzIG1ham9yIG51bWJl ciB0byB0aGUgc3RhdGljIGRybSBtYWpvciBkZXZpY2UKbnVtYmVyLgoKVGhpcyBicmVha3MgdGhl IHN0YW5kYWxvbmUgdm13Z2Z4IGRyaXZlciBvbiBYV2F5bGFuZCBkcmkgY2xpZW50cywKaHR0cHM6 Ly9jZ2l0LmZyZWVkZXNrdG9wLm9yZy9tZXNhL3Ztd2dmeAphbmQgYW55IGZ1dHVyZSBhdHRlbXB0 IHRvIGludHJvZHVjZSBkeW5hbWljIGRldmljZSBudW1iZXJzIGZvciBkcm0uCgpTbyBpbnN0ZWFk IG9mIGNoZWNraW5nIGZvciB0aGUgZGV2aWNlIG1ham9yLCBpbnN0ZWFkIGNoZWNrIGZvciB0aGUg cHJlc2VuY2UKb2YgdGhlIC9zeXMvZGV2L2NoYXIvPG1ham9yPjo8bWlub3I+L2RldmljZS9kcm0g ZGlyZWN0b3J5LgoKU2lnbmVkLW9mZi1ieTogVGhvbWFzIEhlbGxzdHJvbSA8dGhlbGxzdHJvbUB2 bXdhcmUuY29tPgotLS0KIHhmODZkcm0uYyB8IDMxICsrKysrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL3hmODZkcm0uYyBiL3hmODZkcm0uYwppbmRleCA3ODA3ZGNlOS4uNGNmYzVk M2UgMTAwNjQ0Ci0tLSBhL3hmODZkcm0uYworKysgYi94Zjg2ZHJtLmMKQEAgLTI3NjEsNiArMjc2 MSwyMSBAQCBjaGFyICpkcm1HZXREZXZpY2VOYW1lRnJvbUZkKGludCBmZCkKICAgICByZXR1cm4g c3RyZHVwKG5hbWUpOwogfQogCitzdGF0aWMgYm9vbAorZHJtTm9kZUlzRFJNKGludCBtYWosIGlu dCBtaW4pCit7CisjaWZkZWYgX19saW51eF9fCisgIGNoYXIgcGF0aFs2NF07CisgIHN0cnVjdCBz dGF0IHNidWY7CisKKyAgc25wcmludGYocGF0aCwgc2l6ZW9mKHBhdGgpLCAiL3N5cy9kZXYvY2hh ci8lZDolZC9kZXZpY2UvZHJtIiwKKwkgICBtYWosIG1pbik7CisgIHJldHVybiBzdGF0KHBhdGgs ICZzYnVmKSA9PSAwOworI2Vsc2UKKyAgcmV0dXJuIG1haiA9PSBEUk1fTUFKT1I7CisjZW5kaWYK K30KKwogaW50IGRybUdldE5vZGVUeXBlRnJvbUZkKGludCBmZCkKIHsKICAgICBzdHJ1Y3Qgc3Rh dCBzYnVmOwpAQCAtMjc3Miw3ICsyNzg3LDcgQEAgaW50IGRybUdldE5vZGVUeXBlRnJvbUZkKGlu dCBmZCkKICAgICBtYWogPSBtYWpvcihzYnVmLnN0X3JkZXYpOwogICAgIG1pbiA9IG1pbm9yKHNi dWYuc3RfcmRldik7CiAKLSAgICBpZiAobWFqICE9IERSTV9NQUpPUiB8fCAhU19JU0NIUihzYnVm LnN0X21vZGUpKSB7CisgICAgaWYgKCFkcm1Ob2RlSXNEUk0obWFqLCBtaW4pIHx8ICFTX0lTQ0hS KHNidWYuc3RfbW9kZSkpIHsKICAgICAgICAgZXJybm8gPSBFSU5WQUw7CiAgICAgICAgIHJldHVy biAtMTsKICAgICB9CkBAIC0yODM3LDcgKzI4NTIsNyBAQCBzdGF0aWMgY2hhciAqZHJtR2V0TWlu b3JOYW1lRm9yRkQoaW50IGZkLCBpbnQgdHlwZSkKICAgICBtYWogPSBtYWpvcihzYnVmLnN0X3Jk ZXYpOwogICAgIG1pbiA9IG1pbm9yKHNidWYuc3RfcmRldik7CiAKLSAgICBpZiAobWFqICE9IERS TV9NQUpPUiB8fCAhU19JU0NIUihzYnVmLnN0X21vZGUpKQorICAgIGlmICghZHJtTm9kZUlzRFJN KG1haiwgbWluKSB8fCAhU19JU0NIUihzYnVmLnN0X21vZGUpKQogICAgICAgICByZXR1cm4gTlVM TDsKIAogICAgIHNucHJpbnRmKGJ1Ziwgc2l6ZW9mKGJ1ZiksICIvc3lzL2Rldi9jaGFyLyVkOiVk L2RldmljZS9kcm0iLCBtYWosIG1pbik7CkBAIC0yODcxLDcgKzI4ODYsNyBAQCBzdGF0aWMgY2hh ciAqZHJtR2V0TWlub3JOYW1lRm9yRkQoaW50IGZkLCBpbnQgdHlwZSkKICAgICBtYWogPSBtYWpv cihzYnVmLnN0X3JkZXYpOwogICAgIG1pbiA9IG1pbm9yKHNidWYuc3RfcmRldik7CiAKLSAgICBp ZiAobWFqICE9IERSTV9NQUpPUiB8fCAhU19JU0NIUihzYnVmLnN0X21vZGUpKQorICAgIGlmICgh ZHJtTm9kZUlzRFJNKG1haiwgbWluKSB8fCAhU19JU0NIUihzYnVmLnN0X21vZGUpKQogICAgICAg ICByZXR1cm4gTlVMTDsKIAogICAgIHN3aXRjaCAodHlwZSkgewpAQCAtMzczMSw3ICszNzQ2LDcg QEAgcHJvY2Vzc19kZXZpY2UoZHJtRGV2aWNlUHRyICpkZXZpY2UsIGNvbnN0IGNoYXIgKmRfbmFt ZSwKICAgICBtYWogPSBtYWpvcihzYnVmLnN0X3JkZXYpOwogICAgIG1pbiA9IG1pbm9yKHNidWYu c3RfcmRldik7CiAKLSAgICBpZiAobWFqICE9IERSTV9NQUpPUiB8fCAhU19JU0NIUihzYnVmLnN0 X21vZGUpKQorICAgIGlmICghZHJtTm9kZUlzRFJNKG1haiwgbWluKSB8fCAhU19JU0NIUihzYnVm LnN0X21vZGUpKQogICAgICAgICByZXR1cm4gLTE7CiAKICAgICBzdWJzeXN0ZW1fdHlwZSA9IGRy bVBhcnNlU3Vic3lzdGVtVHlwZShtYWosIG1pbik7CkBAIC0zODQ1LDcgKzM4NjAsNyBAQCBpbnQg ZHJtR2V0RGV2aWNlMihpbnQgZmQsIHVpbnQzMl90IGZsYWdzLCBkcm1EZXZpY2VQdHIgKmRldmlj ZSkKICAgICBtYWogPSBtYWpvcihzYnVmLnN0X3JkZXYpOwogICAgIG1pbiA9IG1pbm9yKHNidWYu c3RfcmRldik7CiAKLSAgICBpZiAobWFqICE9IERSTV9NQUpPUiB8fCAhU19JU0NIUihzYnVmLnN0 X21vZGUpKQorICAgIGlmICghZHJtTm9kZUlzRFJNKG1haiwgbWluKSB8fCAhU19JU0NIUihzYnVm LnN0X21vZGUpKQogICAgICAgICByZXR1cm4gLUVJTlZBTDsKIAogICAgIG5vZGVfdHlwZSA9IGRy bUdldE1pbm9yVHlwZShtaW4pOwpAQCAtMzkxMSw3ICszOTI2LDcgQEAgaW50IGRybUdldERldmlj ZTIoaW50IGZkLCB1aW50MzJfdCBmbGFncywgZHJtRGV2aWNlUHRyICpkZXZpY2UpCiAgICAgbWFq ID0gbWFqb3Ioc2J1Zi5zdF9yZGV2KTsKICAgICBtaW4gPSBtaW5vcihzYnVmLnN0X3JkZXYpOwog Ci0gICAgaWYgKG1haiAhPSBEUk1fTUFKT1IgfHwgIVNfSVNDSFIoc2J1Zi5zdF9tb2RlKSkKKyAg ICBpZiAoIWRybU5vZGVJc0RSTShtYWosIG1pbikgfHwgIVNfSVNDSFIoc2J1Zi5zdF9tb2RlKSkK ICAgICAgICAgcmV0dXJuIC1FSU5WQUw7CiAKICAgICBzdWJzeXN0ZW1fdHlwZSA9IGRybVBhcnNl U3Vic3lzdGVtVHlwZShtYWosIG1pbik7CkBAIC00MDcxLDcgKzQwODYsNyBAQCBjaGFyICpkcm1H ZXREZXZpY2VOYW1lRnJvbUZkMihpbnQgZmQpCiAgICAgbWFqID0gbWFqb3Ioc2J1Zi5zdF9yZGV2 KTsKICAgICBtaW4gPSBtaW5vcihzYnVmLnN0X3JkZXYpOwogCi0gICAgaWYgKG1haiAhPSBEUk1f TUFKT1IgfHwgIVNfSVNDSFIoc2J1Zi5zdF9tb2RlKSkKKyAgICBpZiAoIWRybU5vZGVJc0RSTSht YWosIG1pbikgfHwgIVNfSVNDSFIoc2J1Zi5zdF9tb2RlKSkKICAgICAgICAgcmV0dXJuIE5VTEw7 CiAKICAgICBzbnByaW50ZihwYXRoLCBzaXplb2YocGF0aCksICIvc3lzL2Rldi9jaGFyLyVkOiVk IiwgbWFqLCBtaW4pOwpAQCAtNDA5Nyw3ICs0MTEyLDcgQEAgY2hhciAqZHJtR2V0RGV2aWNlTmFt ZUZyb21GZDIoaW50IGZkKQogICAgIG1haiA9IG1ham9yKHNidWYuc3RfcmRldik7CiAgICAgbWlu ID0gbWlub3Ioc2J1Zi5zdF9yZGV2KTsKIAotICAgIGlmIChtYWogIT0gRFJNX01BSk9SIHx8ICFT X0lTQ0hSKHNidWYuc3RfbW9kZSkpCisgICAgaWYgKCFkcm1Ob2RlSXNEUk0obWFqLCBtaW4pIHx8 ICFTX0lTQ0hSKHNidWYuc3RfbW9kZSkpCiAgICAgICAgIHJldHVybiBOVUxMOwogCiAgICAgbm9k ZV90eXBlID0gZHJtR2V0TWlub3JUeXBlKG1pbik7Ci0tIAoyLjE4LjAucmMxCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK