From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH i-g-t 7/7] lib/drmtest: Allow the test device to be overridden Date: Thu, 12 Oct 2017 15:29:43 +0200 Message-ID: <20171012132943.28316-7-thierry.reding@gmail.com> References: <20171012132943.28316-1-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171012132943.28316-1-thierry.reding@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KCk9uIHNldHVwcyB3aGVy ZSB0aGUgZGV2aWNlIHRvIGJlIHRlc3RlZCBpcyBub3QgdGhlIGZpcnN0IG9uZSwgYWxsb3cKdXNl cnMgdG8gb3ZlcnJpZGUgaXQgdXNpbmcgdGhlIElHVF9ERVZJQ0UgZW52aXJvbm1lbnQgdmFyaWFi bGUuCgpTaWduZWQtb2ZmLWJ5OiBUaGllcnJ5IFJlZGluZyA8dHJlZGluZ0BudmlkaWEuY29tPgot LS0KIGxpYi9kcm10ZXN0LmMgfCA5MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDU2IGluc2VydGlvbnMo KyksIDM1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9kcm10ZXN0LmMgYi9saWIvZHJt dGVzdC5jCmluZGV4IGUwNWY4OGQ0YTg4Ny4uMWQ4MTQ3MzQxNjJjIDEwMDY0NAotLS0gYS9saWIv ZHJtdGVzdC5jCisrKyBiL2xpYi9kcm10ZXN0LmMKQEAgLTI0NSw2ICsyNDUsNDcgQEAgc3RhdGlj IGludCBtb2Rwcm9iZShjb25zdCBjaGFyICpkcml2ZXIpCiAJcmV0dXJuIGlndF9rbW9kX2xvYWQo ZHJpdmVyLCAiIik7CiB9CiAKK3N0YXRpYyBpbnQgX19kcm1fb3Blbl9kZXZpY2UoY29uc3QgY2hh ciAqZGV2aWNlLCBpbnQgY2hpcHNldCkKK3sKKwlpbnQgZmQ7CisKKwlmZCA9IG9wZW4oZGV2aWNl LCBPX1JEV1IpOworCWlmIChmZCA9PSAtMSkKKwkJcmV0dXJuIGZkOworCisJaWYgKGNoaXBzZXQg JiBEUklWRVJfSU5URUwgJiYgaXNfaTkxNV9kZXZpY2UoZmQpICYmCisJICAgIGhhc19rbm93bl9p bnRlbF9jaGlwc2V0KGZkKSkKKwkJcmV0dXJuIGZkOworCisJaWYgKGNoaXBzZXQgJiBEUklWRVJf VkM0ICYmCisJICAgIGlzX3ZjNF9kZXZpY2UoZmQpKQorCQlyZXR1cm4gZmQ7CisKKwlpZiAoY2hp cHNldCAmIERSSVZFUl9WR0VNICYmCisJICAgIGlzX3ZnZW1fZGV2aWNlKGZkKSkKKwkJcmV0dXJu IGZkOworCisJaWYgKGNoaXBzZXQgJiBEUklWRVJfVklSVElPICYmCisJICAgIGlzX3ZpcnRpb19k ZXZpY2UoZmQpKQorCQlyZXR1cm4gZmQ7CisKKwlpZiAoY2hpcHNldCAmIERSSVZFUl9BTURHUFUg JiYgaXNfYW1kX2RldmljZShmZCkpCisJCXJldHVybiBmZDsKKworCWlmIChjaGlwc2V0ICYgRFJJ VkVSX05PVVZFQVUgJiYgaXNfbm91dmVhdV9kZXZpY2UoZmQpKQorCQlyZXR1cm4gZmQ7CisKKwlp ZiAoY2hpcHNldCAmIERSSVZFUl9URUdSQSAmJiBpc190ZWdyYV9kZXZpY2UoZmQpKQorCQlyZXR1 cm4gZmQ7CisKKwkvKiBPbmx5IFZHRU0tc3BlY2lmaWMgdGVzdHMgc2hvdWxkIGJlIHJ1biBvbiBW R0VNICovCisJaWYgKGNoaXBzZXQgPT0gRFJJVkVSX0FOWSAmJiAhaXNfdmdlbV9kZXZpY2UoZmQp KQorCQlyZXR1cm4gZmQ7CisKKwljbG9zZShmZCk7CisJcmV0dXJuIC0xOworfQorCiAvKioKICAq IF9fZHJtX29wZW5fZHJpdmVyOgogICogQGNoaXBzZXQ6IE9SJ2QgZmxhZ3MgZm9yIGVhY2ggY2hp cHNldCB0byBzZWFyY2gsIGVnLiAjRFJJVkVSX0lOVEVMCkBAIC0yNTYsNDggKzI5NywyNSBAQCBz dGF0aWMgaW50IG1vZHByb2JlKGNvbnN0IGNoYXIgKmRyaXZlcikKICAqLwogaW50IF9fZHJtX29w ZW5fZHJpdmVyKGludCBjaGlwc2V0KQogeworCWNoYXIgKm5hbWUgPSBnZXRlbnYoIklHVF9ERVZJ Q0UiKTsKKworCWlmIChuYW1lKQorCQlyZXR1cm4gX19kcm1fb3Blbl9kZXZpY2UobmFtZSwgY2hp cHNldCk7CisKIAlpZiAoY2hpcHNldCAmIERSSVZFUl9WR0VNKQogCQltb2Rwcm9iZSgidmdlbSIp OwogCiAJZm9yIChpbnQgaSA9IDA7IGkgPCAxNjsgaSsrKSB7Ci0JCWNoYXIgbmFtZVs4MF07Ci0J CWludCBmZDsKKwkJaW50IGZkLCByZXQ7CiAKLQkJc3ByaW50ZihuYW1lLCAiL2Rldi9kcmkvY2Fy ZCV1IiwgaSk7Ci0JCWZkID0gb3BlbihuYW1lLCBPX1JEV1IpOwotCQlpZiAoZmQgPT0gLTEpCi0J CQljb250aW51ZTsKLQotCQlpZiAoY2hpcHNldCAmIERSSVZFUl9JTlRFTCAmJiBpc19pOTE1X2Rl dmljZShmZCkgJiYKLQkJICAgIGhhc19rbm93bl9pbnRlbF9jaGlwc2V0KGZkKSkKLQkJCXJldHVy biBmZDsKLQotCQlpZiAoY2hpcHNldCAmIERSSVZFUl9WQzQgJiYKLQkJICAgIGlzX3ZjNF9kZXZp Y2UoZmQpKQotCQkJcmV0dXJuIGZkOwotCi0JCWlmIChjaGlwc2V0ICYgRFJJVkVSX1ZHRU0gJiYK LQkJICAgIGlzX3ZnZW1fZGV2aWNlKGZkKSkKLQkJCXJldHVybiBmZDsKLQotCQlpZiAoY2hpcHNl dCAmIERSSVZFUl9WSVJUSU8gJiYKLQkJICAgIGlzX3ZpcnRpb19kZXZpY2UoZmQpKQotCQkJcmV0 dXJuIGZkOwotCi0JCWlmIChjaGlwc2V0ICYgRFJJVkVSX0FNREdQVSAmJiBpc19hbWRfZGV2aWNl KGZkKSkKLQkJCXJldHVybiBmZDsKLQotCQlpZiAoY2hpcHNldCAmIERSSVZFUl9OT1VWRUFVICYm IGlzX25vdXZlYXVfZGV2aWNlKGZkKSkKLQkJCXJldHVybiBmZDsKKwkJcmV0ID0gYXNwcmludGYo Jm5hbWUsICIvZGV2L2RyaS9jYXJkJXUiLCBpKTsKKwkJaWd0X2Fzc2VydChyZXQgIT0gLTEpOwog Ci0JCWlmIChjaGlwc2V0ICYgRFJJVkVSX1RFR1JBICYmIGlzX3RlZ3JhX2RldmljZShmZCkpCi0J CQlyZXR1cm4gZmQ7CisJCWZkID0gX19kcm1fb3Blbl9kZXZpY2UobmFtZSwgY2hpcHNldCk7CisJ CWZyZWUobmFtZSk7CiAKLQkJLyogT25seSBWR0VNLXNwZWNpZmljIHRlc3RzIHNob3VsZCBiZSBy dW4gb24gVkdFTSAqLwotCQlpZiAoY2hpcHNldCA9PSBEUklWRVJfQU5ZICYmICFpc192Z2VtX2Rl dmljZShmZCkpCisJCWlmIChmZCA+PSAwKQogCQkJcmV0dXJuIGZkOwotCi0JCWNsb3NlKGZkKTsK IAl9CiAKIAlyZXR1cm4gLTE7CkBAIC0zMDUsOSArMzIzLDEyIEBAIGludCBfX2RybV9vcGVuX2Ry aXZlcihpbnQgY2hpcHNldCkKIAogc3RhdGljIGludCBfX2RybV9vcGVuX2RyaXZlcl9yZW5kZXIo aW50IGNoaXBzZXQpCiB7Ci0JY2hhciAqbmFtZTsKKwljaGFyICpuYW1lID0gZ2V0ZW52KCJJR1Rf REVWSUNFIik7CiAJaW50IGksIGZkOwogCisJaWYgKG5hbWUpCisJCXJldHVybiBfX2RybV9vcGVu X2RldmljZShuYW1lLCBjaGlwc2V0KTsKKwogCWZvciAoaSA9IDEyODsgaSA8ICgxMjggKyAxNik7 IGkrKykgewogCQlpbnQgcmV0OwogCi0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=