From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: [PATCH 4/4] tests/amdgpu: adapt to new polaris10/11 uvd fw Date: Fri, 13 May 2016 12:48:32 -0400 Message-ID: <1463158112-28625-4-git-send-email-alexander.deucher@amd.com> References: <1463158112-28625-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ig0-x242.google.com (mail-ig0-x242.google.com [IPv6:2607:f8b0:4001:c05::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id E373F6EAD1 for ; Fri, 13 May 2016 16:48:43 +0000 (UTC) Received: by mail-ig0-x242.google.com with SMTP id rc4so1971255igc.0 for ; Fri, 13 May 2016 09:48:43 -0700 (PDT) In-Reply-To: <1463158112-28625-1-git-send-email-alexander.deucher@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Sonny Jiang , Alex Deucher List-Id: dri-devel@lists.freedesktop.org RnJvbTogU29ubnkgSmlhbmcgPHNvbm55LmppYW5nQGFtZC5jb20+CgpTaWduZWQtb2ZmLWJ5OiBT b25ueSBKaWFuZyA8c29ubnkuamlhbmdAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IEFsZXggRGV1Y2hl ciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVy IDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgotLS0KIHRlc3RzL2FtZGdwdS9jc190ZXN0cy5j IHwgNDggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS90ZXN0cy9hbWRncHUvY3NfdGVzdHMuYyBiL3Rlc3RzL2FtZGdwdS9jc190ZXN0cy5jCmlu ZGV4IGM2OTMwYzAuLmEwMWVlNDggMTAwNjQ0Ci0tLSBhL3Rlc3RzL2FtZGdwdS9jc190ZXN0cy5j CisrKyBiL3Rlc3RzL2FtZGdwdS9jc190ZXN0cy5jCkBAIC00Myw2ICs0Myw4IEBAIHN0YXRpYyBh bWRncHVfZGV2aWNlX2hhbmRsZSBkZXZpY2VfaGFuZGxlOwogc3RhdGljIHVpbnQzMl90IG1ham9y X3ZlcnNpb247CiBzdGF0aWMgdWludDMyX3QgbWlub3JfdmVyc2lvbjsKIHN0YXRpYyB1aW50MzJf dCBmYW1pbHlfaWQ7CitzdGF0aWMgdWludDMyX3QgY2hpcF9yZXY7CitzdGF0aWMgdWludDMyX3Qg Y2hpcF9pZDsKIAogc3RhdGljIGFtZGdwdV9jb250ZXh0X2hhbmRsZSBjb250ZXh0X2hhbmRsZTsK IHN0YXRpYyBhbWRncHVfYm9faGFuZGxlIGliX2hhbmRsZTsKQEAgLTc4LDYgKzgwLDkgQEAgaW50 IHN1aXRlX2NzX3Rlc3RzX2luaXQodm9pZCkKIAkJcmV0dXJuIENVRV9TSU5JVF9GQUlMRUQ7CiAK IAlmYW1pbHlfaWQgPSBkZXZpY2VfaGFuZGxlLT5pbmZvLmZhbWlseV9pZDsKKwkvKiBWSSBhc2lj IFBPTEFSSVMxMC8xMSBoYXZlIHNwZWNpZmljIGV4dGVybmFsX3Jldl9pZCAqLworCWNoaXBfcmV2 ID0gZGV2aWNlX2hhbmRsZS0+aW5mby5jaGlwX3JldjsKKwljaGlwX2lkID0gZGV2aWNlX2hhbmRs ZS0+aW5mby5jaGlwX2V4dGVybmFsX3JldjsKIAogCXIgPSBhbWRncHVfY3NfY3R4X2NyZWF0ZShk ZXZpY2VfaGFuZGxlLCAmY29udGV4dF9oYW5kbGUpOwogCWlmIChyKQpAQCAtMjAwLDggKzIwNSwx NyBAQCBzdGF0aWMgdm9pZCBhbWRncHVfY3NfdXZkX2NyZWF0ZSh2b2lkKQogCUNVX0FTU0VSVF9F UVVBTChyLCAwKTsKIAogCW1lbWNweShtc2csIHV2ZF9jcmVhdGVfbXNnLCBzaXplb2YodXZkX2Ny ZWF0ZV9tc2cpKTsKLQlpZiAoZmFtaWx5X2lkID49IEFNREdQVV9GQU1JTFlfVkkpCisJaWYgKGZh bWlseV9pZCA+PSBBTURHUFVfRkFNSUxZX1ZJKSB7CiAJCSgodWludDhfdCopbXNnKVsweDEwXSA9 IDc7CisJCS8qIGNoaXAgcG9sYXJpcyAxMC8xMSAqLworCQlpZiAoY2hpcF9pZCA9PSBjaGlwX3Jl disweDUwIHx8IGNoaXBfaWQgPT0gY2hpcF9yZXYrMHg1QSkgeworCQkJLyogZHBiIHNpemUgKi8K KwkJCSgodWludDhfdCopbXNnKVsweDI4XSA9IDB4MDA7CisJCQkoKHVpbnQ4X3QqKW1zZylbMHgy OV0gPSAweDk0OworCQkJKCh1aW50OF90Kiltc2cpWzB4MkFdID0gMHg2QjsKKwkJCSgodWludDhf dCopbXNnKVsweDJCXSA9IDB4MDA7CisJCX0KKwl9CiAKIAlyID0gYW1kZ3B1X2JvX2NwdV91bm1h cChidWZfaGFuZGxlKTsKIAlDVV9BU1NFUlRfRVFVQUwociwgMCk7CkBAIC0yMzAsOCArMjQ0LDgg QEAgc3RhdGljIHZvaWQgYW1kZ3B1X2NzX3V2ZF9jcmVhdGUodm9pZCkKIAogc3RhdGljIHZvaWQg YW1kZ3B1X2NzX3V2ZF9kZWNvZGUodm9pZCkKIHsKLQljb25zdCB1bnNpZ25lZCBkcGJfc2l6ZSA9 IDE1OTIzNTg0LCBkdF9zaXplID0gNzM3MjgwOwotCXVpbnQ2NF90IG1zZ19hZGRyLCBmYl9hZGRy LCBic19hZGRyLCBkcGJfYWRkciwgZHRfYWRkciwgaXRfYWRkcjsKKwljb25zdCB1bnNpZ25lZCBk cGJfc2l6ZSA9IDE1OTIzNTg0LCBjdHhfc2l6ZSA9IDUyODc2ODAsIGR0X3NpemUgPSA3MzcyODA7 CisJdWludDY0X3QgbXNnX2FkZHIsIGZiX2FkZHIsIGJzX2FkZHIsIGRwYl9hZGRyLCBjdHhfYWRk ciwgZHRfYWRkciwgaXRfYWRkcjsKIAlzdHJ1Y3QgYW1kZ3B1X2JvX2FsbG9jX3JlcXVlc3QgcmVx ID0gezB9OwogCWFtZGdwdV9ib19oYW5kbGUgYnVmX2hhbmRsZTsKIAlhbWRncHVfdmFfaGFuZGxl IHZhX2hhbmRsZTsKQEAgLTI2OSw4ICsyODMsMjEgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2NzX3V2 ZF9kZWNvZGUodm9pZCkKIAltZW1jcHkocHRyLCB1dmRfZGVjb2RlX21zZywgc2l6ZW9mKHV2ZF9j cmVhdGVfbXNnKSk7CiAJaWYgKGZhbWlseV9pZCA+PSBBTURHUFVfRkFNSUxZX1ZJKSB7CiAJCXB0 clsweDEwXSA9IDc7Ci0JCXB0clsweDk4XSA9IDB4YjA7Ci0JCXB0clsweDk5XSA9IDB4MTsKKwkJ cHRyWzB4OThdID0gMHgwMDsKKwkJcHRyWzB4OTldID0gMHgwMjsKKwkJLyogY2hpcCBwb2xhcmlz MTAvMTEgKi8KKwkJaWYgKGNoaXBfaWQgPT0gY2hpcF9yZXYrMHg1MCB8fCBjaGlwX2lkID09IGNo aXBfcmV2KzB4NUEpIHsKKwkJCS8qZHBiIHNpemUgKi8KKwkJCXB0clsweDI0XSA9IDB4MDA7CisJ CQlwdHJbMHgyNV0gPSAweDk0OworCQkJcHRyWzB4MjZdID0gMHg2QjsKKwkJCXB0clsweDI3XSA9 IDB4MDA7CisJCQkvKmN0eCBzaXplICovCisJCQlwdHJbMHgyQ10gPSAweDAwOworCQkJcHRyWzB4 MkRdID0gMHhBRjsKKwkJCXB0clsweDJFXSA9IDB4NTA7CisJCQlwdHJbMHgyRl0gPSAweDAwOwor CQl9CiAJfQogCiAJcHRyICs9IDQqMTAyNDsKQEAgLTMwMSw2ICszMjgsMTIgQEAgc3RhdGljIHZv aWQgYW1kZ3B1X2NzX3V2ZF9kZWNvZGUodm9pZCkKIAl9IGVsc2UKIAkJYnNfYWRkciA9IGZiX2Fk ZHIgKyA0KjEwMjQ7CiAJZHBiX2FkZHIgPSBBTElHTihic19hZGRyICsgc2l6ZW9mKHV2ZF9iaXRz dHJlYW0pLCA0KjEwMjQpOworCisJaWYgKChmYW1pbHlfaWQgPj0gQU1ER1BVX0ZBTUlMWV9WSSkg JiYKKwkJKGNoaXBfaWQgPT0gY2hpcF9yZXYrMHg1MCB8fCBjaGlwX2lkID09IGNoaXBfcmV2KzB4 NUEpKSB7CisJCWN0eF9hZGRyID0gQUxJR04oZHBiX2FkZHIgKyAweDAwNkI5NDAwLCA0KjEwMjQp OworCX0KKwogCWR0X2FkZHIgPSBBTElHTihkcGJfYWRkciArIGRwYl9zaXplLCA0KjEwMjQpOwog CiAJaSA9IDA7CkBAIC0zMDksOCArMzQyLDExIEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9jc191dmRf ZGVjb2RlKHZvaWQpCiAJdXZkX2NtZChkdF9hZGRyLCAweDIsICZpKTsKIAl1dmRfY21kKGZiX2Fk ZHIsIDB4MywgJmkpOwogCXV2ZF9jbWQoYnNfYWRkciwgMHgxMDAsICZpKTsKLQlpZiAoZmFtaWx5 X2lkID49IEFNREdQVV9GQU1JTFlfVkkpCisJaWYgKGZhbWlseV9pZCA+PSBBTURHUFVfRkFNSUxZ X1ZJKSB7CiAJCXV2ZF9jbWQoaXRfYWRkciwgMHgyMDQsICZpKTsKKwkJaWYgKGNoaXBfaWQgPT0g Y2hpcF9yZXYrMHg1MCB8fCBjaGlwX2lkID09IGNoaXBfcmV2KzB4NUEpCisJCQl1dmRfY21kKGN0 eF9hZGRyLCAweDIwNiwgJmkpOworfQogCWliX2NwdVtpKytdID0gMHgzQkM2OwogCWliX2NwdVtp KytdID0gMHgxOwogCWZvciAoOyBpICUgMTY7ICsraSkKLS0gCjIuNS41CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK