From: Jean-Francois Thibert Subject: [PATCH umr v2] Add PCI device based GPU selection with --pci Date: Fri, 23 Jun 2017 16:33:38 -0400 Message-ID: <20170623203338.38629-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 IFRoaWJlcnQgPGpmdGhpYmVydEBnb29nbGUuY29tPgotLS0KIGRvYy91bXIuMSAgICAgICAgICB8 ICA0ICsrKwogc3JjL2FwcC9tYWluLmMgICAgIHwgIDkgKysrKysrCiBzcmMvbGliL2Rpc2NvdmVy LmMgfCA4NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0KIHNyYy91bXIuaCAgICAgICAgICB8ICA2ICsrKysKIDQgZmlsZXMgY2hhbmdlZCwgMTAz IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL3Vtci4xIGIv ZG9jL3Vtci4xCmluZGV4IDVjNGJkMDEuLmEwM2RmYjggMTAwNjQ0Ci0tLSBhL2RvYy91bXIuMQor KysgYi9kb2MvdW1yLjEKQEAgLTE3LDYgKzE3LDEwIEBAIFNlbGVjdCBhIEdGWCBJTlNUQU5DRS9T SC9TRSBiYW5rIGluIGRlY2ltYWwuICBDYW4gdXNlICd4JyB0byBkZW5vdGUgYSBicm9hZGNhc3QK IC5JUCAiLS1mb3JjZSAtZiA8bnVtYmVyPiIKIEZvcmNlIGEgUENJRSBEZXZpY2UgSUQgaW4gaGV4 IG9yIGJ5IGFzaWMgbmFtZS4gIFRoaXMgaXMgdXNlZCBpbiBjYXNlIHRoZSBhbWRncHUgZHJpdmVy CiBpcyBub3QgeWV0IGxvYWRlZCBvciBhIGRpc3BsYXkgaXMgbm90IHlldCBhdHRhY2hlZC4KKy5J UCAiLS1wY2kgPGRldmljZT4iCitGb3JjZSBhIHNwZWNpZmljIFBDSSBkZXZpY2UgdXNpbmcgdGhl IGRvbWFpbjpidXM6c2xvdC5mdW5jdGlvbiBmb3JtYXQgaW4gaGV4LgorVGhpcyBpcyB1c2VmdWwg d2hlbiBtb3JlIHRoYW4gb25lIEdQVSBpcyBhdmFpbGFibGUuIElmIHRoZSBhbWRncHUgZHJpdmVy IGlzCitsb2FkZWQgdGhlIGNvcnJlc3BvbmRpbmcgaW5zdGFuY2Ugd2lsbCBiZSBhdXRvbWF0aWNh bGx5IGRldGVjdGVkLgogLklQICItLXByaW50LCAtcCIKIEVuYWJsZSBzY2FubmluZyBhbmQgcHJp bnRpbmcgYWxsIHJlZ2lzdGVycy4gIERlZmF1bHRzIHRvIG9mZiBhcyBpdCBjYW4KIGJlIHZlcnkg dmVyYm9zZS4KZGlmZiAtLWdpdCBhL3NyYy9hcHAvbWFpbi5jIGIvc3JjL2FwcC9tYWluLmMKaW5k ZXggMWQ5ZWY5ZS4uMDY3YjQ3MiAxMDA2NDQKLS0tIGEvc3JjL2FwcC9tYWluLmMKKysrIGIvc3Jj L2FwcC9tYWluLmMKQEAgLTE3NCw2ICsxNzQsMTUgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIg Kiphcmd2KQogCQkJCXByaW50ZigiLS1mb3JjZSByZXF1aXJlcyBhIG51bWJlci9uYW1lXG4iKTsK IAkJCQlyZXR1cm4gRVhJVF9GQUlMVVJFOwogCQkJfQorCQl9IGVsc2UgaWYgKCFzdHJjbXAoYXJn dltpXSwgIi0tcGNpIikpIHsKKwkJCWlmIChpICsgMSA8IGFyZ2MgJiYgc3NjYW5mKGFyZ3ZbaSsx XSwgIiUwNHg6JTAyeDolMDJ4LiUwMXgiLAorCQkJCSZvcHRpb25zLnBjaS5kb21haW4sICZvcHRp b25zLnBjaS5idXMsICZvcHRpb25zLnBjaS5zbG90LAorCQkJCSZvcHRpb25zLnBjaS5mdW5jICkg Pj0gNCkgeworCQkJCSsraTsKKwkJCX0gZWxzZSB7CisJCQkJcHJpbnRmKCItLXBjaSByZXF1aXJl cyBkb21haW46YnVzOnNsb3QuZnVuY3Rpb25cbiIpOworCQkJCXJldHVybiBFWElUX0ZBSUxVUkU7 CisJCQl9CiAJCX0gZWxzZSBpZiAoIXN0cmNtcChhcmd2W2ldLCAiLS1wcmludCIpIHx8ICFzdHJj bXAoYXJndltpXSwgIi1wIikpIHsKIAkJCW9wdGlvbnMucHJpbnQgPSAxOwogCQkJb3B0aW9ucy5u ZWVkX3NjYW4gPSAxOwpkaWZmIC0tZ2l0IGEvc3JjL2xpYi9kaXNjb3Zlci5jIGIvc3JjL2xpYi9k aXNjb3Zlci5jCmluZGV4IDk2NjJkMDUuLmE5NWZlNTcgMTAwNjQ0Ci0tLSBhL3NyYy9saWIvZGlz Y292ZXIuYworKysgYi9zcmMvbGliL2Rpc2NvdmVyLmMKQEAgLTIyLDYgKzIyLDkgQEAKICAqIEF1 dGhvcnM6IFRvbSBTdCBEZW5pcyA8dG9tLnN0ZGVuaXNAYW1kLmNvbT4KICAqCiAgKi8KKyNpbmNs dWRlIDxkaXJlbnQuaD4KKyNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KKwogI2luY2x1ZGUgInVtci5o IgogCiBzdGF0aWMgaW50IGlzX2RpZF9tYXRjaChzdHJ1Y3QgdW1yX2FzaWMgKmFzaWMsIHVuc2ln bmVkIGRpZCkKQEAgLTQ0LDYgKzQ3LDQ0IEBAIHN0YXRpYyBpbnQgaXNfZGlkX21hdGNoKHN0cnVj dCB1bXJfYXNpYyAqYXNpYywgdW5zaWduZWQgZGlkKQogCXJldHVybiByOwogfQogCitzdGF0aWMg aW50IGZpbmRfcGNpX2luc3RhbmNlKGNvbnN0IGNoYXIqIHBjaV9zdHJpbmcpIHsKKwlESVIqIGRp cjsKKwlkaXIgPSBvcGVuZGlyKCIvc3lzL2tlcm5lbC9kZWJ1Zy9kcmkiKTsKKwlpZiAoZGlyID09 IE5VTEwpIHsKKwkJcGVycm9yKCJDb3VsZG4ndCBvcGVuIERSSSB1bmRlciBkZWJ1Z2ZzIik7CisJ CXJldHVybiAtMTsKKwl9CisJc3RydWN0IGRpcmVudCAqZGlyX2VudHJ5OworCXdoaWxlICgoZGly X2VudHJ5ID0gcmVhZGRpcihkaXIpKSAhPSBOVUxMKSB7CisJCWNoYXIgZGV2aWNlWzI1Nl0sIG5h bWVbMjU2XTsKKwkJaW50IHBhcnNlZF9kZXZpY2U7CisJCS8vIGlnbm9yZSAuIGFuZCAuLgorCQlp ZiAoc3RyY21wKGRpcl9lbnRyeS0+ZF9uYW1lLCAiLiIpID09IDAgfHwgc3RyY21wKGRpcl9lbnRy eS0+ZF9uYW1lLAorCQkJIi4uIikgPT0gMCkgeworCQkJY29udGludWU7CisJCX0KKwkJc25wcmlu dGYobmFtZSwgc2l6ZW9mKG5hbWUpLCAiL3N5cy9rZXJuZWwvZGVidWcvZHJpLyVzL25hbWUiLAor CQkJZGlyX2VudHJ5LT5kX25hbWUpOworCQlGSUxFICpmID0gZm9wZW4obmFtZSwgInIiKTsKKwkJ aWYgKCFmKSB7CisJCQljb250aW51ZTsKKwkJfQorCQlkZXZpY2Vbc2l6ZW9mKGRldmljZSkgLSAx XSA9IDA7CisJCXBhcnNlZF9kZXZpY2UgPSBmc2NhbmYoZiwgIiUqcyAlMjU1cyIsIGRldmljZSk7 CisJCWZjbG9zZShmKTsKKwkJaWYgKHBhcnNlZF9kZXZpY2UgIT0gMSkKKwkJCWNvbnRpbnVlOwor CQkvLyBzdHJpcCBvZmYgZGV2PSBmb3Iga2VybmVscyA+IDQuNworCQlpZiAoc3Ryc3RyKGRldmlj ZSwgImRldj0iKSkKKwkJCW1lbW1vdmUoZGV2aWNlLCBkZXZpY2UrNCwgc3RybGVuKGRldmljZSkt Myk7CisJCWlmIChzdHJjbXAocGNpX3N0cmluZywgZGV2aWNlKSA9PSAwKSB7CisJCQljbG9zZWRp cihkaXIpOworCQkJcmV0dXJuIGF0b2koZGlyX2VudHJ5LT5kX25hbWUpOworCQl9CisJfQorCWNs b3NlZGlyKGRpcik7CisJcmV0dXJuIC0xOworfQogCiBzdHJ1Y3QgdW1yX2FzaWMgKnVtcl9kaXNj b3Zlcl9hc2ljKHN0cnVjdCB1bXJfb3B0aW9ucyAqb3B0aW9ucykKIHsKQEAgLTUzLDYgKzk0LDMw IEBAIHN0cnVjdCB1bXJfYXNpYyAqdW1yX2Rpc2NvdmVyX2FzaWMoc3RydWN0IHVtcl9vcHRpb25z ICpvcHRpb25zKQogCXN0cnVjdCB1bXJfYXNpYyAqYXNpYzsKIAlsb25nIHRyeWRpZCA9IG9wdGlv bnMtPmZvcmNlZGlkOwogCisJLy8gVHJ5IHRvIG1hcCB0byBpbnN0YW5jZSBpZiB3ZSBoYXZlIGEg c3BlY2lmaWMgcGNpIGRldmljZQorCWlmIChvcHRpb25zLT5wY2kuZG9tYWluIHx8IG9wdGlvbnMt PnBjaS5idXMgfHwKKwkJb3B0aW9ucy0+cGNpLnNsb3QgfHwgb3B0aW9ucy0+cGNpLmZ1bmMpIHsK KwkJY2hhciBwY2lfc3RyaW5nWzE2XTsKKwkJaW50IHBhcnNlZF9kaWQ7CisJCXNucHJpbnRmKHBj aV9zdHJpbmcsIHNpemVvZihwY2lfc3RyaW5nKSwgIiUwNHg6JTAyeDolMDJ4LiV4IiwKKwkJCW9w dGlvbnMtPnBjaS5kb21haW4sIG9wdGlvbnMtPnBjaS5idXMsIG9wdGlvbnMtPnBjaS5zbG90LAor CQkJb3B0aW9ucy0+cGNpLmZ1bmMpOworCQlpZiAoIW9wdGlvbnMtPm5vX2tlcm5lbCkgeworCQkJ b3B0aW9ucy0+aW5zdGFuY2UgPSBmaW5kX3BjaV9pbnN0YW5jZShwY2lfc3RyaW5nKTsKKwkJfQor CQlzbnByaW50Zihkcml2ZXIsIHNpemVvZihkcml2ZXIpLCAiL3N5cy9idXMvcGNpL2RldmljZXMv JXMvZGV2aWNlIiwgcGNpX3N0cmluZyk7CisJCWYgPSBmb3Blbihkcml2ZXIsICJyIik7CisJCWlm ICghZikgeworCQkJaWYgKCFvcHRpb25zLT5xdWlldCkgcGVycm9yKCJDYW5ub3Qgb3BlbiBQQ0kg ZGV2aWNlIG5hbWUgdW5kZXIgc3lzZnMgKGlzIGEgZGlzcGxheSBhdHRhY2hlZD8pIik7CisJCQly ZXR1cm4gTlVMTDsKKwkJfQorCQlwYXJzZWRfZGlkID0gZnNjYW5mKGYsICIweCUwNGx4IiwgJnRy eWRpZCk7CisJCWZjbG9zZShmKTsKKwkJaWYgKHBhcnNlZF9kaWQgIT0gMSkgeworCQkJaWYgKCFv cHRpb25zLT5xdWlldCkgcHJpbnRmKCJDb3VsZCBub3QgcmVhZCBkZXZpY2UgaWQiKTsKKwkJCXJl dHVybiBOVUxMOworCQl9CisJfQogCS8vIHRyeSB0byBzY2FuIHZpYSBkZWJ1Z2ZzCiAJYXNpYyA9 IGNhbGxvYygxLCBzaXplb2YgKmFzaWMpOwogCWlmIChhc2ljKSB7CkBAIC02NCw3ICsxMjksNiBA QCBzdHJ1Y3QgdW1yX2FzaWMgKnVtcl9kaXNjb3Zlcl9hc2ljKHN0cnVjdCB1bXJfb3B0aW9ucyAq b3B0aW9ucykKIAkJdW1yX2ZyZWVfYXNpYyhhc2ljKTsKIAkJYXNpYyA9IE5VTEw7CiAJfQotCiAJ aWYgKHRyeWRpZCA8IDApIHsKIAkJc25wcmludGYobmFtZSwgc2l6ZW9mKG5hbWUpLTEsICIvc3lz L2tlcm5lbC9kZWJ1Zy9kcmkvJWQvbmFtZSIsIG9wdGlvbnMtPmluc3RhbmNlKTsKIAkJZiA9IGZv cGVuKG5hbWUsICJyIik7CkBAIC04Niw4ICsxNTAsMTIgQEAgc3RydWN0IHVtcl9hc2ljICp1bXJf ZGlzY292ZXJfYXNpYyhzdHJ1Y3QgdW1yX29wdGlvbnMgKm9wdGlvbnMpCiAJCQl9CiAJCQlyZXR1 cm4gTlVMTDsKIAkJfQotCQlmc2NhbmYoZiwgIiVzICVzICVzXG4iLCBkcml2ZXIsIG5hbWUsIGRy aXZlcik7CisJCWludCBwYXJzZWRfcGNpX2lkID0gZnNjYW5mKGYsICIlKnMgJXMiLCBuYW1lKTsK IAkJZmNsb3NlKGYpOworCQlpZiAocGFyc2VkX3BjaV9pZCAhPSAxKSB7CisJCQlpZiAoIW9wdGlv bnMtPnF1aWV0KSBwcmludGYoIkNhbm5vdCByZWFkIHBjaSBkZXZpY2UgaWRcbiIpOworCQkJcmV0 dXJuIE5VTEw7CisJCX0KIAogCQkvLyBzdHJpcCBvZmYgZGV2PSBmb3Iga2VybmVscyA+IDQuNwog CQlpZiAoc3Ryc3RyKG5hbWUsICJkZXY9IikpCkBAIC05OSw4ICsxNjcsMTIgQEAgc3RydWN0IHVt cl9hc2ljICp1bXJfZGlzY292ZXJfYXNpYyhzdHJ1Y3QgdW1yX29wdGlvbnMgKm9wdGlvbnMpCiAJ CQlpZiAoIW9wdGlvbnMtPnF1aWV0KSBwZXJyb3IoIkNhbm5vdCBvcGVuIFBDSSBkZXZpY2UgbmFt ZSB1bmRlciBzeXNmcyAoaXMgYSBkaXNwbGF5IGF0dGFjaGVkPykiKTsKIAkJCXJldHVybiBOVUxM OwogCQl9Ci0JCWZzY2FuZihmLCAiMHglMDR4IiwgJmRpZCk7CisJCWludCBwYXJzZWRfZGlkID0g ZnNjYW5mKGYsICIweCUwNHgiLCAmZGlkKTsKIAkJZmNsb3NlKGYpOworCQlpZiAocGFyc2VkX2Rp ZCAhPSAxKSB7CisJCQlpZiAoIW9wdGlvbnMtPnF1aWV0KSBwcmludGYoIkNvdWxkIG5vdCByZWFk IGRldmljZSBpZCIpOworCQkJcmV0dXJuIE5VTEw7CisJCX0KIAkJYXNpYyA9IHVtcl9kaXNjb3Zl cl9hc2ljX2J5X2RpZChvcHRpb25zLCBkaWQpOwogCX0gZWxzZSB7CiAJCWlmIChvcHRpb25zLT5k ZXZfbmFtZVswXSkKQEAgLTE1OCw2ICsyMzAsMTUgQEAgc3RydWN0IHVtcl9hc2ljICp1bXJfZGlz Y292ZXJfYXNpYyhzdHJ1Y3QgdW1yX29wdGlvbnMgKm9wdGlvbnMpCiAJCQl9CiAJCQlkbyB7CiAJ CQkJYXNpYy0+cGNpLnBkZXZpY2UgPSBwY2lfZGV2aWNlX25leHQocGNpX2l0ZXIpOworCQkJCWlm IChvcHRpb25zLT5wY2kuZG9tYWluIHx8IG9wdGlvbnMtPnBjaS5idXMgfHwgb3B0aW9ucy0+cGNp LnNsb3QgfHwgb3B0aW9ucy0+cGNpLmZ1bmMpIHsKKwkJCQkJd2hpbGUgKGFzaWMtPnBjaS5wZGV2 aWNlICYmICgKKwkJCQkJCW9wdGlvbnMtPnBjaS5kb21haW4gIT0gYXNpYy0+cGNpLnBkZXZpY2Ut PmRvbWFpbiB8fAorCQkJCQkJb3B0aW9ucy0+cGNpLmJ1cyAhPSBhc2ljLT5wY2kucGRldmljZS0+ YnVzIHx8CisJCQkJCQlvcHRpb25zLT5wY2kuc2xvdCAhPSBhc2ljLT5wY2kucGRldmljZS0+ZGV2 IHx8CisJCQkJCQlvcHRpb25zLT5wY2kuZnVuYyAhPSBhc2ljLT5wY2kucGRldmljZS0+ZnVuYykp IHsKKwkJCQkJCWFzaWMtPnBjaS5wZGV2aWNlID0gcGNpX2RldmljZV9uZXh0KHBjaV9pdGVyKTsK KwkJCQkJfQorCQkJCX0KIAkJCX0gd2hpbGUgKGFzaWMtPnBjaS5wZGV2aWNlICYmICEoYXNpYy0+ cGNpLnBkZXZpY2UtPnZlbmRvcl9pZCA9PSAweDEwMDIgJiYgaXNfZGlkX21hdGNoKGFzaWMsIGFz aWMtPnBjaS5wZGV2aWNlLT5kZXZpY2VfaWQpKSk7CiAKIAkJCWlmICghYXNpYy0+cGNpLnBkZXZp Y2UpIHsKZGlmZiAtLWdpdCBhL3NyYy91bXIuaCBiL3NyYy91bXIuaAppbmRleCBjY2ZhYzVkLi4y YTY5MDE3IDEwMDY0NAotLS0gYS9zcmMvdW1yLmgKKysrIGIvc3JjL3Vtci5oCkBAIC0xODEsNiAr MTgxLDEyIEBAIHN0cnVjdCB1bXJfb3B0aW9ucyB7CiAJbG9uZyBmb3JjZWRpZDsKIAljaGFyICpz Y2FuYmxvY2s7CiAJY2hhciBkZXZfbmFtZVszMl07CisJc3RydWN0IHsKKwkJaW50IGRvbWFpbiwK KwkJICAgIGJ1cywKKwkJICAgIHNsb3QsCisJCSAgICBmdW5jOworCX0gcGNpOwogfTsKIAogc3Ry dWN0IHVtcl9hc2ljIHsKLS0gCjIuMTMuMS42MTEuZzdlM2IxMWFlMS1nb29nCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlz dAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK