From: Tom St Denis Subject: [PATCH drm] tests/amdgpu: Fix device_id option Date: Mon, 5 Jun 2017 14:04:11 -0400 Message-ID: <20170605180411.29844-1-tom.stdenis@amd.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: Tom St Denis VGhlIGRldmljZV9pZCBvcHRpb24gWy1kXSB3YXMgYmFkbHkgYnJva2VuLiAgVGhpcyBjb21taXQg Zml4ZXMKdGhlIHdpZHRoICh3YXMgOCBpcyBub3cgMTYgYml0cykgYXMgd2VsbCBhcyBlbmFibGVz IHNlYXJjaGVzCndpdGhvdXQgc3BlY2lmeWluZyBhIGJ1cyBpZC4gIEl0IHdhcyBhbHNvIGNvbXBh cmluZyAiZGV2IiBmcm9tCnRoZSBidXMgZmllbGQgd2hpY2ggaXMgbm90IHRoZSBQQ0kgZGV2aWNl IGlkLgoKU2lnbmVkLW9mZi1ieTogVG9tIFN0IERlbmlzIDx0b20uc3RkZW5pc0BhbWQuY29tPgot LS0KIHRlc3RzL2FtZGdwdS9hbWRncHVfdGVzdC5jIHwgMTggKysrKysrKysrLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL3Rlc3RzL2FtZGdwdS9hbWRncHVfdGVzdC5jIGIvdGVzdHMvYW1kZ3B1L2FtZGdwdV90ZXN0 LmMKaW5kZXggM2ZkNjgyMGExZWNmLi41NDZhMDExMTU2MDMgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2Ft ZGdwdS9hbWRncHVfdGVzdC5jCisrKyBiL3Rlc3RzL2FtZGdwdS9hbWRncHVfdGVzdC5jCkBAIC0y NjQsMjUgKzI2NCwyNSBAQCBzdGF0aWMgdm9pZCBhbWRncHVfcHJpbnRfZGV2aWNlcygpCiAvKiBG aW5kIGEgbWF0Y2ggQU1EIGRldmljZSBpbiBQQ0kgYnVzCiAgKiBSZXR1cm4gdGhlIGluZGV4IG9m IHRoZSBkZXZpY2Ugb3IgLTEgaWYgbm90IGZvdW5kCiAgKi8KLXN0YXRpYyBpbnQgYW1kZ3B1X2Zp bmRfZGV2aWNlKHVpbnQ4X3QgYnVzLCB1aW50OF90IGRldikKK3N0YXRpYyBpbnQgYW1kZ3B1X2Zp bmRfZGV2aWNlKHVpbnQ4X3QgYnVzLCB1aW50MTZfdCBkZXYpCiB7CiAJaW50IGk7CiAJZHJtRGV2 aWNlUHRyIGRldmljZTsKIAotCWZvciAoaSA9IDA7IGkgPCBNQVhfQ0FSRFNfU1VQUE9SVEVEICYm IGRybV9hbWRncHVbaV0gPj0wOyBpKyspCisJZm9yIChpID0gMDsgaSA8IE1BWF9DQVJEU19TVVBQ T1JURUQgJiYgZHJtX2FtZGdwdVtpXSA+PSAwOyBpKyspIHsKIAkJaWYgKGRybUdldERldmljZTIo ZHJtX2FtZGdwdVtpXSwKIAkJCURSTV9ERVZJQ0VfR0VUX1BDSV9SRVZJU0lPTiwKIAkJCSZkZXZp Y2UpID09IDApIHsKIAkJCWlmIChkZXZpY2UtPmJ1c3R5cGUgPT0gRFJNX0JVU19QQ0kpCi0JCQkJ aWYgKGRldmljZS0+YnVzaW5mby5wY2ktPmJ1cyA9PSBidXMgJiYKLQkJCQkJZGV2aWNlLT5idXNp bmZvLnBjaS0+ZGV2ID09IGRldikgewotCisJCQkJaWYgKChidXMgPT0gMHhGRiB8fCBkZXZpY2Ut PmJ1c2luZm8ucGNpLT5idXMgPT0gYnVzKSAmJgorCQkJCQlkZXZpY2UtPmRldmljZWluZm8ucGNp LT5kZXZpY2VfaWQgPT0gZGV2KSB7CiAJCQkJCWRybUZyZWVEZXZpY2UoJmRldmljZSk7CiAJCQkJ CXJldHVybiBpOwogCQkJCX0KIAogCQkJZHJtRnJlZURldmljZSgmZGV2aWNlKTsKIAkJfQorCX0K IAogCXJldHVybiAtMTsKIH0KQEAgLTMyNSw3ICszMjUsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywg Y2hhciAqKmFyZ3YpCiAJCQlwY2lfYnVzX2lkID0gYXRvaShvcHRhcmcpOwogCQkJYnJlYWs7CiAJ CWNhc2UgJ2QnOgotCQkJcGNpX2RldmljZV9pZCA9IGF0b2kob3B0YXJnKTsKKwkJCXNzY2FuZihv cHRhcmcsICIleCIsICZwY2lfZGV2aWNlX2lkKTsKIAkJCWJyZWFrOwogCQljYXNlICdwJzoKIAkJ CWRpc3BsYXlfZGV2aWNlcyA9IDE7CkBAIC0zNTksMTAgKzM1OSwxMCBAQCBpbnQgbWFpbihpbnQg YXJnYywgY2hhciAqKmFyZ3YpCiAJCWV4aXQoRVhJVF9TVUNDRVNTKTsKIAl9CiAKLQlpZiAocGNp X2J1c19pZCA+IDApIHsKKwlpZiAocGNpX2J1c19pZCA+IDAgfHwgcGNpX2RldmljZV9pZCkgewog CQkvKiBBIGRldmljZSB3YXMgc3BlY2lmaWVkIHRvIHJ1biB0aGUgdGVzdCAqLwotCQl0ZXN0X2Rl dmljZV9pbmRleCA9IGFtZGdwdV9maW5kX2RldmljZSgodWludDhfdClwY2lfYnVzX2lkLAotCQkJ CQkJCSh1aW50OF90KXBjaV9kZXZpY2VfaWQpOworCQl0ZXN0X2RldmljZV9pbmRleCA9IGFtZGdw dV9maW5kX2RldmljZShwY2lfYnVzX2lkLAorCQkJCQkJICAgICAgIHBjaV9kZXZpY2VfaWQpOwog CiAJCWlmICh0ZXN0X2RldmljZV9pbmRleCA+PSAwKSB7CiAJCQkvKiBNb3N0IHRlc3RzIHJ1biBv biBkZXZpY2Ugb2YgZHJtX2FtZGdwdVswXS4KLS0gCjIuMTIuMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==