From: Jean-Francois Thibert Subject: [PATCH] Add PCI device based GPU selection with --pci Date: Thu, 22 Jun 2017 16:36:38 -0400 Message-ID: <20170622203638.68560-1-jfthibert@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Jean-Francois Thibert VGhpcyBhbGxvd3Mgc2VsZWN0aW5nIHRoZSBHUFUgYnkgaXRzIFBDSSBkZXZpY2UgYm90aCB3aXRo IGFuZAp3aXRob3V0IGtlcm5lbCBtb2RlIHN1cHBvcnQuIFRoZSBpbnN0YW5jZSBpcyBwb3B1bGF0 ZWQgYXV0b21hdGljYWxseQpzbyB0aGF0IHRoZSBwcm9wZXIgY29ycmVzcG9uZGluZyBkZWJ1Z2Zz IGZpbGVzIGFyZSB1c2VkIGlmIHByZXNlbnQuCgpTaWduZWQtb2ZmLWJ5OiBKZWFuLUZyYW5jb2lz IFRoaWJlcnQgPGpmdGhpYmVydEBnb29nbGUuY29tPgotLS0KIHNyYy9hcHAvbWFpbi5jICAgICB8 ICA5ICsrKysrKwogc3JjL2xpYi9kaXNjb3Zlci5jIHwgODUgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBzcmMvdW1yLmggICAgICAgICAgfCAg NiArKystCiAzIGZpbGVzIGNoYW5nZWQsIDk2IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvc3JjL2FwcC9tYWluLmMgYi9zcmMvYXBwL21haW4uYwppbmRleCAxZDll ZjllLi5hYTYzMGY1IDEwMDY0NAotLS0gYS9zcmMvYXBwL21haW4uYworKysgYi9zcmMvYXBwL21h aW4uYwpAQCAtMTc0LDYgKzE3NCwxNSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3Yp CiAJCQkJcHJpbnRmKCItLWZvcmNlIHJlcXVpcmVzIGEgbnVtYmVyL25hbWVcbiIpOwogCQkJCXJl dHVybiBFWElUX0ZBSUxVUkU7CiAJCQl9CisJCX0gZWxzZSBpZiAoIXN0cmNtcChhcmd2W2ldLCAi LS1wY2kiKSkgeworCQkJaWYgKGkgKyAxIDwgYXJnYyAmJiBzc2NhbmYoYXJndltpKzFdLCAiJTA0 eDolMDJ4OiUwMnguJTAxeCIsCisJCQkJJm9wdGlvbnMucGNpX2RvbWFpbiwgJm9wdGlvbnMucGNp X2J1cywgJm9wdGlvbnMucGNpX3Nsb3QsCisJCQkJJm9wdGlvbnMucGNpX2Z1bmMgKSA+PSA0KSB7 CisJCQkJKytpOworCQkJfSBlbHNlIHsKKwkJCQlwcmludGYoIi0tcGNpIHJlcXVpcmVzIGRvbWFp bjpidXM6c2xvdC5mdW5jdGlvblxuIik7CisJCQkJcmV0dXJuIEVYSVRfRkFJTFVSRTsKKwkJCX0K IAkJfSBlbHNlIGlmICghc3RyY21wKGFyZ3ZbaV0sICItLXByaW50IikgfHwgIXN0cmNtcChhcmd2 W2ldLCAiLXAiKSkgewogCQkJb3B0aW9ucy5wcmludCA9IDE7CiAJCQlvcHRpb25zLm5lZWRfc2Nh biA9IDE7CmRpZmYgLS1naXQgYS9zcmMvbGliL2Rpc2NvdmVyLmMgYi9zcmMvbGliL2Rpc2NvdmVy LmMKaW5kZXggOTY2MmQwNS4uOGFiMzIxZiAxMDA2NDQKLS0tIGEvc3JjL2xpYi9kaXNjb3Zlci5j CisrKyBiL3NyYy9saWIvZGlzY292ZXIuYwpAQCAtMjIsNiArMjIsOSBAQAogICogQXV0aG9yczog VG9tIFN0IERlbmlzIDx0b20uc3RkZW5pc0BhbWQuY29tPgogICoKICAqLworI2luY2x1ZGUgPGRp cmVudC5oPgorI2luY2x1ZGUgPHN5cy90eXBlcy5oPgorCiAjaW5jbHVkZSAidW1yLmgiCiAKIHN0 YXRpYyBpbnQgaXNfZGlkX21hdGNoKHN0cnVjdCB1bXJfYXNpYyAqYXNpYywgdW5zaWduZWQgZGlk KQpAQCAtNDQsNiArNDcsNDMgQEAgc3RhdGljIGludCBpc19kaWRfbWF0Y2goc3RydWN0IHVtcl9h c2ljICphc2ljLCB1bnNpZ25lZCBkaWQpCiAJcmV0dXJuIHI7CiB9CiAKK3N0YXRpYyBpbnQgZmlu ZF9wY2lfaW5zdGFuY2UoY29uc3QgY2hhciogcGNpX3N0cmluZykgeworCURJUiogZGlyOworCWRp ciA9IG9wZW5kaXIoIi9zeXMva2VybmVsL2RlYnVnL2RyaSIpOworCWlmIChkaXIgPT0gTlVMTCkg eworCQlwZXJyb3IoIkNvdWxkbid0IG9wZW4gRFJJIHVuZGVyIGRlYnVnZnMiKTsKKwkJcmV0dXJu IC0xOworCX0KKwlzdHJ1Y3QgZGlyZW50ICpkaXJfZW50cnk7CisJd2hpbGUgKChkaXJfZW50cnkg PSByZWFkZGlyKGRpcikpICE9IE5VTEwpIHsKKwkJLy8gaWdub3JlIC4gYW5kIC4uCisJCWlmIChz dHJjbXAoZGlyX2VudHJ5LT5kX25hbWUsICIuIikgPT0gMCB8fCBzdHJjbXAoZGlyX2VudHJ5LT5k X25hbWUsCisJCQkiLi4iKSA9PSAwKSB7CisJCQljb250aW51ZTsKKwkJfQorCQljaGFyIG5hbWVb MjU2XTsKKwkJc25wcmludGYobmFtZSwgc2l6ZW9mKG5hbWUpIC0gMSwgIi9zeXMva2VybmVsL2Rl YnVnL2RyaS8lcy9uYW1lIiwKKwkJCWRpcl9lbnRyeS0+ZF9uYW1lKTsKKwkJRklMRSAqZiA9IGZv cGVuKG5hbWUsICJyIik7CisJCWlmICghZikgeworCQkJY29udGludWU7CisJCX0KKwkJY2hhciBk ZXZpY2VbMjU2XSA9IHt9OworCQlpbnQgcGFyc2VkX2RldmljZSA9IGZzY2FuZihmLCAiJSpzICUy NTVzIiwgZGV2aWNlKTsKKwkJZmNsb3NlKGYpOworCQlpZiAocGFyc2VkX2RldmljZSAhPSAxKQor CQkJY29udGludWU7CisJCS8vIHN0cmlwIG9mZiBkZXY9IGZvciBrZXJuZWxzID4gNC43CisJCWlm IChzdHJzdHIoZGV2aWNlLCAiZGV2PSIpKQorCQkJbWVtbW92ZShkZXZpY2UsIGRldmljZSs0LCBz dHJsZW4oZGV2aWNlKS0zKTsKKwkJaWYgKHN0cmNtcChwY2lfc3RyaW5nLCBkZXZpY2UpID09IDAp IHsKKwkJCWNsb3NlZGlyKGRpcik7CisJCQlyZXR1cm4gYXRvaShkaXJfZW50cnktPmRfbmFtZSk7 CisJCX0KKwl9CisJY2xvc2VkaXIoZGlyKTsKKwlyZXR1cm4gLTE7Cit9CiAKIHN0cnVjdCB1bXJf YXNpYyAqdW1yX2Rpc2NvdmVyX2FzaWMoc3RydWN0IHVtcl9vcHRpb25zICpvcHRpb25zKQogewpA QCAtNTMsNiArOTMsMjkgQEAgc3RydWN0IHVtcl9hc2ljICp1bXJfZGlzY292ZXJfYXNpYyhzdHJ1 Y3QgdW1yX29wdGlvbnMgKm9wdGlvbnMpCiAJc3RydWN0IHVtcl9hc2ljICphc2ljOwogCWxvbmcg dHJ5ZGlkID0gb3B0aW9ucy0+Zm9yY2VkaWQ7CiAKKwkvLyBUcnkgdG8gbWFwIHRvIGluc3RhbmNl IGlmIHdlIGhhdmUgYSBzcGVjaWZpYyBwY2kgZGV2aWNlCisJaWYgKG9wdGlvbnMtPnBjaV9kb21h aW4gfHwgb3B0aW9ucy0+cGNpX2J1cyB8fAorCQlvcHRpb25zLT5wY2lfc2xvdCB8fCBvcHRpb25z LT5wY2lfZnVuYykgeworCQljaGFyIHBjaV9zdHJpbmdbMTZdOworCQlzbnByaW50ZihwY2lfc3Ry aW5nLCBzaXplb2YocGNpX3N0cmluZykgLSAxLCAiJTA0eDolMDJ4OiUwMnguJXgiLAorCQkJb3B0 aW9ucy0+cGNpX2RvbWFpbiwgb3B0aW9ucy0+cGNpX2J1cywgb3B0aW9ucy0+cGNpX3Nsb3QsCisJ CQlvcHRpb25zLT5wY2lfZnVuYyk7CisJCWlmICghb3B0aW9ucy0+bm9fa2VybmVsKSB7CisJCQlv cHRpb25zLT5pbnN0YW5jZSA9IGZpbmRfcGNpX2luc3RhbmNlKHBjaV9zdHJpbmcpOworCQl9CisJ CXNucHJpbnRmKGRyaXZlciwgc2l6ZW9mKGRyaXZlciktMSwgIi9zeXMvYnVzL3BjaS9kZXZpY2Vz LyVzL2RldmljZSIsIHBjaV9zdHJpbmcpOworCQlmID0gZm9wZW4oZHJpdmVyLCAiciIpOworCQlp ZiAoIWYpIHsKKwkJCWlmICghb3B0aW9ucy0+cXVpZXQpIHBlcnJvcigiQ2Fubm90IG9wZW4gUENJ IGRldmljZSBuYW1lIHVuZGVyIHN5c2ZzIChpcyBhIGRpc3BsYXkgYXR0YWNoZWQ/KSIpOworCQkJ cmV0dXJuIE5VTEw7CisJCX0KKwkJaW50IGZvdW5kX2RpZCA9IGZzY2FuZihmLCAiMHglMDRseCIs ICZ0cnlkaWQpOworCQlmY2xvc2UoZik7CisJCWlmIChmb3VuZF9kaWQgIT0gMSkgeworCQkJaWYg KCFvcHRpb25zLT5xdWlldCkgcHJpbnRmKCJDb3VsZCBub3QgcmVhZCBkZXZpY2UgaWQiKTsKKwkJ CXJldHVybiBOVUxMOworCQl9CisJfQogCS8vIHRyeSB0byBzY2FuIHZpYSBkZWJ1Z2ZzCiAJYXNp YyA9IGNhbGxvYygxLCBzaXplb2YgKmFzaWMpOwogCWlmIChhc2ljKSB7CkBAIC02NCw3ICsxMjcs NiBAQCBzdHJ1Y3QgdW1yX2FzaWMgKnVtcl9kaXNjb3Zlcl9hc2ljKHN0cnVjdCB1bXJfb3B0aW9u cyAqb3B0aW9ucykKIAkJdW1yX2ZyZWVfYXNpYyhhc2ljKTsKIAkJYXNpYyA9IE5VTEw7CiAJfQot CiAJaWYgKHRyeWRpZCA8IDApIHsKIAkJc25wcmludGYobmFtZSwgc2l6ZW9mKG5hbWUpLTEsICIv c3lzL2tlcm5lbC9kZWJ1Zy9kcmkvJWQvbmFtZSIsIG9wdGlvbnMtPmluc3RhbmNlKTsKIAkJZiA9 IGZvcGVuKG5hbWUsICJyIik7CkBAIC04Niw4ICsxNDgsMTIgQEAgc3RydWN0IHVtcl9hc2ljICp1 bXJfZGlzY292ZXJfYXNpYyhzdHJ1Y3QgdW1yX29wdGlvbnMgKm9wdGlvbnMpCiAJCQl9CiAJCQly ZXR1cm4gTlVMTDsKIAkJfQotCQlmc2NhbmYoZiwgIiVzICVzICVzXG4iLCBkcml2ZXIsIG5hbWUs IGRyaXZlcik7CisJCWludCBwYXJzZWRfcGNpX2lkID0gZnNjYW5mKGYsICIlKnMgJXMiLCBuYW1l KTsKIAkJZmNsb3NlKGYpOworCQlpZiAocGFyc2VkX3BjaV9pZCAhPSAxKSB7CisJCQlpZiAoIW9w dGlvbnMtPnF1aWV0KSBwcmludGYoIkNhbm5vdCByZWFkIHBjaSBkZXZpY2UgaWRcbiIpOworCQkJ cmV0dXJuIE5VTEw7CisJCX0KIAogCQkvLyBzdHJpcCBvZmYgZGV2PSBmb3Iga2VybmVscyA+IDQu NwogCQlpZiAoc3Ryc3RyKG5hbWUsICJkZXY9IikpCkBAIC05OSw4ICsxNjUsMTIgQEAgc3RydWN0 IHVtcl9hc2ljICp1bXJfZGlzY292ZXJfYXNpYyhzdHJ1Y3QgdW1yX29wdGlvbnMgKm9wdGlvbnMp CiAJCQlpZiAoIW9wdGlvbnMtPnF1aWV0KSBwZXJyb3IoIkNhbm5vdCBvcGVuIFBDSSBkZXZpY2Ug bmFtZSB1bmRlciBzeXNmcyAoaXMgYSBkaXNwbGF5IGF0dGFjaGVkPykiKTsKIAkJCXJldHVybiBO VUxMOwogCQl9Ci0JCWZzY2FuZihmLCAiMHglMDR4IiwgJmRpZCk7CisJCWludCBwYXJzZWRfZGlk ID0gZnNjYW5mKGYsICIweCUwNHgiLCAmZGlkKTsKIAkJZmNsb3NlKGYpOworCQlpZiAocGFyc2Vk X2RpZCAhPSAxKSB7CisJCQlpZiAoIW9wdGlvbnMtPnF1aWV0KSBwcmludGYoIkNvdWxkIG5vdCBy ZWFkIGRldmljZSBpZCIpOworCQkJcmV0dXJuIE5VTEw7CisJCX0KIAkJYXNpYyA9IHVtcl9kaXNj b3Zlcl9hc2ljX2J5X2RpZChvcHRpb25zLCBkaWQpOwogCX0gZWxzZSB7CiAJCWlmIChvcHRpb25z LT5kZXZfbmFtZVswXSkKQEAgLTE1OCw2ICsyMjgsMTUgQEAgc3RydWN0IHVtcl9hc2ljICp1bXJf ZGlzY292ZXJfYXNpYyhzdHJ1Y3QgdW1yX29wdGlvbnMgKm9wdGlvbnMpCiAJCQl9CiAJCQlkbyB7 CiAJCQkJYXNpYy0+cGNpLnBkZXZpY2UgPSBwY2lfZGV2aWNlX25leHQocGNpX2l0ZXIpOworCQkJ CWlmIChvcHRpb25zLT5wY2lfZG9tYWluIHx8IG9wdGlvbnMtPnBjaV9idXMgfHwgb3B0aW9ucy0+ cGNpX3Nsb3QgfHwgb3B0aW9ucy0+cGNpX2Z1bmMpIHsKKwkJCQkJd2hpbGUgKGFzaWMtPnBjaS5w ZGV2aWNlICYmICgKKwkJCQkJCW9wdGlvbnMtPnBjaV9kb21haW4gIT0gYXNpYy0+cGNpLnBkZXZp Y2UtPmRvbWFpbiB8fAorCQkJCQkJb3B0aW9ucy0+cGNpX2J1cyAhPSBhc2ljLT5wY2kucGRldmlj ZS0+YnVzIHx8CisJCQkJCQlvcHRpb25zLT5wY2lfc2xvdCAhPSBhc2ljLT5wY2kucGRldmljZS0+ ZGV2IHx8CisJCQkJCQlvcHRpb25zLT5wY2lfZnVuYyAhPSBhc2ljLT5wY2kucGRldmljZS0+ZnVu YykpIHsKKwkJCQkJCWFzaWMtPnBjaS5wZGV2aWNlID0gcGNpX2RldmljZV9uZXh0KHBjaV9pdGVy KTsKKwkJCQkJfQorCQkJCX0KIAkJCX0gd2hpbGUgKGFzaWMtPnBjaS5wZGV2aWNlICYmICEoYXNp Yy0+cGNpLnBkZXZpY2UtPnZlbmRvcl9pZCA9PSAweDEwMDIgJiYgaXNfZGlkX21hdGNoKGFzaWMs IGFzaWMtPnBjaS5wZGV2aWNlLT5kZXZpY2VfaWQpKSk7CiAKIAkJCWlmICghYXNpYy0+cGNpLnBk ZXZpY2UpIHsKZGlmZiAtLWdpdCBhL3NyYy91bXIuaCBiL3NyYy91bXIuaAppbmRleCBjY2ZhYzVk Li4zOTFjNWU3IDEwMDY0NAotLS0gYS9zcmMvdW1yLmgKKysrIGIvc3JjL3Vtci5oCkBAIC0xNzMs NyArMTczLDExIEBAIHN0cnVjdCB1bXJfb3B0aW9ucyB7CiAJICAgIHJlYWRfc21jLAogCSAgICBx dWlldCwKIAkgICAgZm9sbG93X2liLAotCSAgICBub19rZXJuZWw7CisJICAgIG5vX2tlcm5lbCwK KwkgICAgcGNpX2RvbWFpbiwKKwkgICAgcGNpX2J1cywKKwkgICAgcGNpX3Nsb3QsCisJICAgIHBj aV9mdW5jOwogCXVuc2lnbmVkCiAJICAgIGluc3RhbmNlX2JhbmssCiAJICAgIHNlX2JhbmssCi0t IAoyLjEzLjEuNjExLmc3ZTNiMTFhZTEtZ29vZwoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9hbWQtZ2Z4Cg==