From mboxrd@z Thu Jan 1 00:00:00 1970 From: Qiang Yu Subject: [PATCH][libdrm] drm: Fix multi GPU drmGetDevice return wrong device Date: Mon, 11 Jul 2016 13:17:25 +0800 Message-ID: <1468214245-4716-1-git-send-email-Qiang.Yu@amd.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: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: amd-gfx@lists.freedesktop.org Cc: Qiang Yu , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org ZHJtR2V0RGV2aWNlIHdpbGwgYWx3YXlzIHJldHVybiB0aGUgZmlyc3QgZGV2aWNlIGl0IGZpbmQK dW5kZXIgL2Rldi9kcmkvLiBUaGlzIGlzIG5vdCB0cnVlIGZvciBtdWx0aSBHUFUgc2l0dWF0aW9u LgoKUGx1cyBmaXggdGhlIG1lbW9yeSBsZWFrIGluIGVycm9yIGhhbmRsaW5nIHBhdGggb2YKZHJt R2V0RGV2aWNlcy4KCkNoYW5nZS1JZDogSTJhODVhOGE0ZmViYThhNWNjNTE3YWQ3NWM2YWZiNTMy ZmEwN2M1M2QKU2lnbmVkLW9mZi1ieTogUWlhbmcgWXUgPFFpYW5nLll1QGFtZC5jb20+Ci0tLQog eGY4NmRybS5jIHwgMjYgKysrKysrKysrKysrKysrKysrKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAyMSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hmODZkcm0u YyBiL3hmODZkcm0uYwppbmRleCA2Njg5ZjdjLi5lOTBlOGU1IDEwMDY0NAotLS0gYS94Zjg2ZHJt LmMKKysrIGIveGY4NmRybS5jCkBAIC0zMDY0LDYgKzMwNjQsMTcgQEAgc3RhdGljIHZvaWQgZHJt Rm9sZER1cGxpY2F0ZWREZXZpY2VzKGRybURldmljZVB0ciBsb2NhbF9kZXZpY2VzW10sIGludCBj b3VudCkKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KKworICAgIC8vIG1vdmUgYWxs IGRldmljZXMgdG8gdGhlIGJlZ2lubmluZyBvZiBsb2NhbF9kZXZpY2VzIGNvbnRpbnVvdXNseQor ICAgIGZvciAoaSA9IDAsIGogPSAwOyBpIDwgY291bnQ7IGkrKykgeworICAgICAgICBpZiAobG9j YWxfZGV2aWNlc1tpXSkgeworICAgICAgICAgICAgaWYgKGkgIT0gaikgeworICAgICAgICAgICAg ICAgIGxvY2FsX2RldmljZXNbal0gPSBsb2NhbF9kZXZpY2VzW2ldOworICAgICAgICAgICAgICAg IGxvY2FsX2RldmljZXNbaV0gPSBOVUxMOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaisr OworICAgICAgICB9CisgICAgfQogfQogCiAvKioKQEAgLTMwODcsNiArMzA5OCw3IEBAIGludCBk cm1HZXREZXZpY2UoaW50IGZkLCBkcm1EZXZpY2VQdHIgKmRldmljZSkKICAgICBpbnQgbWFqLCBt aW47CiAgICAgaW50IHJldCwgaSwgbm9kZV9jb3VudDsKICAgICBpbnQgbWF4X2NvdW50ID0gMTY7 CisgICAgZGV2X3QgZmluZF9yZGV2OwogCiAgICAgaWYgKGZkID09IC0xIHx8IGRldmljZSA9PSBO VUxMKQogICAgICAgICByZXR1cm4gLUVJTlZBTDsKQEAgLTMwOTQsNiArMzEwNiw3IEBAIGludCBk cm1HZXREZXZpY2UoaW50IGZkLCBkcm1EZXZpY2VQdHIgKmRldmljZSkKICAgICBpZiAoZnN0YXQo ZmQsICZzYnVmKSkKICAgICAgICAgcmV0dXJuIC1lcnJubzsKIAorICAgIGZpbmRfcmRldiA9IHNi dWYuc3RfcmRldjsKICAgICBtYWogPSBtYWpvcihzYnVmLnN0X3JkZXYpOwogICAgIG1pbiA9IG1p bm9yKHNidWYuc3RfcmRldik7CiAKQEAgLTMxNTQsNyArMzE2NywxMyBAQCBpbnQgZHJtR2V0RGV2 aWNlKGludCBmZCwgZHJtRGV2aWNlUHRyICpkZXZpY2UpCiAgICAgICAgICAgICBsb2NhbF9kZXZp Y2VzID0gdGVtcDsKICAgICAgICAgfQogCi0gICAgICAgIGxvY2FsX2RldmljZXNbaV0gPSBkOwor ICAgICAgICAvKiBtb3ZlIHRhcmdldCB0byB0aGUgZmlyc3Qgb2YgbG9jYWxfZGV2aWNlcyAqLwor ICAgICAgICBpZiAoZmluZF9yZGV2ID09IHNidWYuc3RfcmRldiAmJiBpKSB7CisgICAgICAgICAg ICBsb2NhbF9kZXZpY2VzW2ldID0gbG9jYWxfZGV2aWNlc1swXTsKKyAgICAgICAgICAgIGxvY2Fs X2RldmljZXNbMF0gPSBkOworICAgICAgICB9CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGxv Y2FsX2RldmljZXNbaV0gPSBkOwogICAgICAgICBpKys7CiAgICAgfQogICAgIG5vZGVfY291bnQg PSBpOwpAQCAtMzI2NywxMCArMzI4Niw3IEBAIGludCBkcm1HZXREZXZpY2VzKGRybURldmljZVB0 ciBkZXZpY2VzW10sIGludCBtYXhfZGV2aWNlcykKICAgICBkcm1Gb2xkRHVwbGljYXRlZERldmlj ZXMobG9jYWxfZGV2aWNlcywgbm9kZV9jb3VudCk7CiAKICAgICBkZXZpY2VfY291bnQgPSAwOwot ICAgIGZvciAoaSA9IDA7IGkgPCBub2RlX2NvdW50OyBpKyspIHsKLSAgICAgICAgaWYgKCFsb2Nh bF9kZXZpY2VzW2ldKQotICAgICAgICAgICAgY29udGludWU7Ci0KKyAgICBmb3IgKGkgPSAwOyBp IDwgbm9kZV9jb3VudCAmJiBsb2NhbF9kZXZpY2VzW2ldOyBpKyspIHsKICAgICAgICAgaWYgKChk ZXZpY2VzICE9IE5VTEwpICYmIChkZXZpY2VfY291bnQgPCBtYXhfZGV2aWNlcykpCiAgICAgICAg ICAgICBkZXZpY2VzW2RldmljZV9jb3VudF0gPSBsb2NhbF9kZXZpY2VzW2ldOwogICAgICAgICBl bHNlCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCg==