From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andres Rodriguez Subject: [PATCH] amdgpu: fix asic initialization for virtualized environments Date: Fri, 10 Jun 2016 23:42:16 -0400 Message-ID: <20160611034216.22192-1-andres.rodriguez@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0075.outbound.protection.outlook.com [65.55.169.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B8456E245 for ; Sat, 11 Jun 2016 04:09:42 +0000 (UTC) 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: Andres Rodriguez List-Id: dri-devel@lists.freedesktop.org V2hlbiBleGVjdXRpbmcgaW4gYSBQQ0kgcGFzc3Rocm91Z2ggYmFzZWQgdmlydHV6bGlhdGlvbiBl bnZpcm9uZW1udCwgdGhlCmh5cGVydmlzb3Igd2lsbCB1c3VhbGx5IGF0dGVtcHQgdG8gc2VuZCBh IFBDSWUgYnVzIHJlc2V0IHNpZ25hbCB0byB0aGUKQVNJQyB3aGVuIHRoZSBWTSByZWJvb3RzLiBJ biB0aGlzIHNjZW5hcmlvLCB0aGUgY2FyZCBpcyBub3QgY29ycmVjdGx5CmluaXRpYWxpemVkLCBi dXQgd2Ugc3RpbGwgY29uc2lkZXIgaXQgdG8gYmUgcG9zdGVkLiBUaGVyZWZvcmUsIGluIGEKcGFz c3Rocm91Z2ggYmFzZWQgZW52aXJvbmVtbnQgd2Ugc2hvdWxkIGFsd2F5cyBwb3N0IHRoZSBjYXJk IHRvIGd1YXJhbnRlZQppdCBpcyBpbiBhIGdvb2Qgc3RhdGUgZm9yIGRyaXZlciBpbml0aWFsaXph dGlvbi4KCkhvd2V2ZXIsIGlmIHdlIGFyZSBvcGVyYXRpbmcgaW4gU1ItSU9WIG1vZGUgaXQgaXMg dXAgdG8gdGhlIEdJTSBkcml2ZXIKdG8gbWFuYWdlIHRoZSBhc2ljIHN0YXRlLCB0aGVyZWZvcmUg d2Ugc2hvdWxkIG5vdCBwb3N0IHRoZSBjYXJkIChhbmQKc2hvdWxkbid0IGJlIGFibGUgdG8gZG8g aXQgZWl0aGVyKS4KClNpZ25lZC1vZmYtYnk6IEFuZHJlcyBSb2RyaWd1ZXogPGFuZHJlcy5yb2Ry aWd1ZXpAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCAg ICAgICAgfCAgNyArKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2 aWNlLmMgfCAxNiArKysrKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9j aWsuYyAgICAgICAgICAgfCAgNyArKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92 aS5jICAgICAgICAgICAgfCAxNSArKysrKysrKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgNDQg aW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 LmgKaW5kZXggMjZmZTY3MC4uZmU3MWRlYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 LmgKQEAgLTE4MzUsNiArMTgzNSw4IEBAIHN0cnVjdCBhbWRncHVfYXNpY19mdW5jcyB7CiAJLyog TU0gYmxvY2sgY2xvY2tzICovCiAJaW50ICgqc2V0X3V2ZF9jbG9ja3MpKHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LCB1MzIgdmNsaywgdTMyIGRjbGspOwogCWludCAoKnNldF92Y2VfY2xvY2tz KShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMyIGV2Y2xrLCB1MzIgZWNjbGspOworCS8q IHF1ZXJ5IHZpcnR1YWwgY2FwYWJpbGl0aWVzICovCisJdTMyICgqZ2V0X3ZpcnR1YWxfY2Fwcyko c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogfTsKIAogLyoKQEAgLTE5MzIsOCArMTkzNCwx MiBAQCB2b2lkIGFtZGdwdV9jZ3NfZGVzdHJveV9kZXZpY2Uoc3RydWN0IGNnc19kZXZpY2UgKmNn c19kZXZpY2UpOwogCiAKIC8qIEdQVSB2aXJ0dWFsaXphdGlvbiAqLworI2RlZmluZSBBTURHUFVf VklSVF9DQVBTX1NSSU9WX0VOICAgICAgICgxIDw8IDApCisjZGVmaW5lIEFNREdQVV9WSVJUX0NB UFNfSVNfVkYgICAgICAgICAgKDEgPDwgMSkKIHN0cnVjdCBhbWRncHVfdmlydHVhbGl6YXRpb24g ewogCWJvb2wgc3VwcG9ydHNfc3JfaW92OworCWJvb2wgaXNfdmlydHVhbDsKKwl1MzIgY2FwczsK IH07CiAKIC8qCkBAIC0yMjI2LDYgKzIyMzIsNyBAQCBhbWRncHVfZ2V0X3NkbWFfaW5zdGFuY2Uo c3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogI2RlZmluZSBhbWRncHVfYXNpY19nZXRfeGNsayhh ZGV2KSAoYWRldiktPmFzaWNfZnVuY3MtPmdldF94Y2xrKChhZGV2KSkKICNkZWZpbmUgYW1kZ3B1 X2FzaWNfc2V0X3V2ZF9jbG9ja3MoYWRldiwgdiwgZCkgKGFkZXYpLT5hc2ljX2Z1bmNzLT5zZXRf dXZkX2Nsb2NrcygoYWRldiksICh2KSwgKGQpKQogI2RlZmluZSBhbWRncHVfYXNpY19zZXRfdmNl X2Nsb2NrcyhhZGV2LCBldiwgZWMpIChhZGV2KS0+YXNpY19mdW5jcy0+c2V0X3ZjZV9jbG9ja3Mo KGFkZXYpLCAoZXYpLCAoZWMpKQorI2RlZmluZSBhbWRncHVfYXNpY19nZXRfdmlydHVhbF9jYXBz KGFkZXYpICgoYWRldiktPmFzaWNfZnVuY3MtPmdldF92aXJ0dWFsX2NhcHMoKGFkZXYpKSkKICNk ZWZpbmUgYW1kZ3B1X2FzaWNfZ2V0X2dwdV9jbG9ja19jb3VudGVyKGFkZXYpIChhZGV2KS0+YXNp Y19mdW5jcy0+Z2V0X2dwdV9jbG9ja19jb3VudGVyKChhZGV2KSkKICNkZWZpbmUgYW1kZ3B1X2Fz aWNfcmVhZF9kaXNhYmxlZF9iaW9zKGFkZXYpIChhZGV2KS0+YXNpY19mdW5jcy0+cmVhZF9kaXNh YmxlZF9iaW9zKChhZGV2KSkKICNkZWZpbmUgYW1kZ3B1X2FzaWNfcmVhZF9iaW9zX2Zyb21fcm9t KGFkZXYsIGIsIGwpIChhZGV2KS0+YXNpY19mdW5jcy0+cmVhZF9iaW9zX2Zyb21fcm9tKChhZGV2 KSwgKGIpLCAobCkpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMK aW5kZXggYjQ5NDIxMi4uNjI5ZTRlMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9kZXZpY2UuYwpAQCAtMTM5Miw2ICsxMzkyLDE0IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3Jl c3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlyZXR1cm4gMDsKIH0KIAorc3RhdGlj IGJvb2wgYW1kZ3B1X2RldmljZV9pc192aXJ0dWFsKHZvaWQpCit7CisjaWZkZWYgQ09ORklHX1g4 NgorCXJldHVybiBib290X2NwdV9oYXMoWDg2X0ZFQVRVUkVfSFlQRVJWSVNPUik7CisjZWxzZQor CXJldHVybiBmYWxzZQorI2VuZGlmCit9CiAKIC8qKgogICogYW1kZ3B1X2RldmljZV9oYXNfZGFs X3N1cHBvcnQgLSBjaGVjayBpZiBkYWwgaXMgc3VwcG9ydGVkCkBAIC0xNTYwLDggKzE1NjgsMTQg QEAgaW50IGFtZGdwdV9kZXZpY2VfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlh ZGV2LT52aXJ0dWFsaXphdGlvbi5zdXBwb3J0c19zcl9pb3YgPQogCQlhbWRncHVfYXRvbWJpb3Nf aGFzX2dwdV92aXJ0dWFsaXphdGlvbl90YWJsZShhZGV2KTsKIAorCS8qIENoZWNrIGlmIHdlIGFy ZSBleGVjdXRpbmcgaW4gYSB2aXJ0dWFsaXplZCBlbnZpcm9ubWVudCAqLworCWFkZXYtPnZpcnR1 YWxpemF0aW9uLmlzX3ZpcnR1YWwgPSBhbWRncHVfZGV2aWNlX2lzX3ZpcnR1YWwoKTsKKwlhZGV2 LT52aXJ0dWFsaXphdGlvbi5jYXBzID0gYW1kZ3B1X2FzaWNfZ2V0X3ZpcnR1YWxfY2FwcyhhZGV2 KTsKKwogCS8qIFBvc3QgY2FyZCBpZiBuZWNlc3NhcnkgKi8KLQlpZiAoIWFtZGdwdV9jYXJkX3Bv c3RlZChhZGV2KSkgeworCWlmICghYW1kZ3B1X2NhcmRfcG9zdGVkKGFkZXYpIHx8CisJICAgIChh ZGV2LT52aXJ0dWFsaXphdGlvbi5pc192aXJ0dWFsICYmCisJICAgICAhYWRldi0+dmlydHVhbGl6 YXRpb24uY2FwcyAmIEFNREdQVV9WSVJUX0NBUFNfU1JJT1ZfRU4pKSB7CiAJCWlmICghYWRldi0+ YmlvcykgewogCQkJZGV2X2VycihhZGV2LT5kZXYsICJDYXJkIG5vdCBwb3N0ZWQgYW5kIG5vIEJJ T1MgLSBpZ25vcmluZ1xuIik7CiAJCQlyZXR1cm4gLUVJTlZBTDsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Npay5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv Y2lrLmMKaW5kZXggNDBmNGZkYS4uOTA3YmIyOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvY2lrLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lrLmMK QEAgLTk2Myw2ICs5NjMsMTIgQEAgc3RhdGljIGJvb2wgY2lrX3JlYWRfYmlvc19mcm9tX3JvbShz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlyZXR1cm4gdHJ1ZTsKIH0KIAorc3RhdGljIHUz MiBjaWtfZ2V0X3ZpcnR1YWxfY2FwcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKK3sKKwkv KiBDSUsgZG9lcyBub3Qgc3VwcG9ydCBTUi1JT1YgKi8KKwlyZXR1cm4gMDsKK30KKwogc3RhdGlj IGNvbnN0IHN0cnVjdCBhbWRncHVfYWxsb3dlZF9yZWdpc3Rlcl9lbnRyeSBjaWtfYWxsb3dlZF9y ZWFkX3JlZ2lzdGVyc1tdID0gewogCXttbUdSQk1fU1RBVFVTLCBmYWxzZX0sCiAJe21tR0JfQURE Ul9DT05GSUcsIGZhbHNlfSwKQEAgLTIxNzYsNiArMjE4Miw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgYW1kZ3B1X2FzaWNfZnVuY3MgY2lrX2FzaWNfZnVuY3MgPQogCS5nZXRfeGNsayA9ICZjaWtf Z2V0X3hjbGssCiAJLnNldF91dmRfY2xvY2tzID0gJmNpa19zZXRfdXZkX2Nsb2NrcywKIAkuc2V0 X3ZjZV9jbG9ja3MgPSAmY2lrX3NldF92Y2VfY2xvY2tzLAorCS5nZXRfdmlydHVhbF9jYXBzID0g JmNpa19nZXRfdmlydHVhbF9jYXBzLAogCS8qIHRoZXNlIHNob3VsZCBiZSBtb3ZlZCB0byB0aGVp ciBvd24gaXAgbW9kdWxlcyAqLwogCS5nZXRfZ3B1X2Nsb2NrX2NvdW50ZXIgPSAmZ2Z4X3Y3XzBf Z2V0X2dwdV9jbG9ja19jb3VudGVyLAogCS53YWl0X2Zvcl9tY19pZGxlID0gJmdtY192N18wX21j X3dhaXRfZm9yX2lkbGUsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92 aS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmkuYwppbmRleCAxYWMwYzkxLi42YTdk NTMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92aS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZpLmMKQEAgLTQyMiw2ICs0MjIsMjAgQEAgc3RhdGlj IGJvb2wgdmlfcmVhZF9iaW9zX2Zyb21fcm9tKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAog CXJldHVybiB0cnVlOwogfQogCitzdGF0aWMgdTMyIHZpX2dldF92aXJ0dWFsX2NhcHMoc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYpCit7CisJdTMyIGNhcHMgPSAwOworCXUzMiByZWcgPSBSUkVH MzIobW1CSUZfSU9WX0ZVTkNfSURFTlRJRklFUik7CisKKwlpZiAoUkVHX0dFVF9GSUVMRChyZWcs IEJJRl9JT1ZfRlVOQ19JREVOVElGSUVSLCBJT1ZfRU5BQkxFKSkKKwkJY2FwcyB8PSBBTURHUFVf VklSVF9DQVBTX1NSSU9WX0VOOworCisJaWYgKFJFR19HRVRfRklFTEQocmVnLCBCSUZfSU9WX0ZV TkNfSURFTlRJRklFUiwgRlVOQ19JREVOVElGSUVSKSkKKwkJY2FwcyB8PSBBTURHUFVfVklSVF9D QVBTX0lTX1ZGOworCisJcmV0dXJuIGNhcHM7Cit9CisKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgYW1k Z3B1X2FsbG93ZWRfcmVnaXN0ZXJfZW50cnkgdG9uZ2FfYWxsb3dlZF9yZWFkX3JlZ2lzdGVyc1td ID0gewogCXttbUdCX01BQ1JPVElMRV9NT0RFNywgdHJ1ZX0sCiB9OwpAQCAtMTQ1Miw2ICsxNDY2 LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfYXNpY19mdW5jcyB2aV9hc2ljX2Z1bmNz ID0KIAkuZ2V0X3hjbGsgPSAmdmlfZ2V0X3hjbGssCiAJLnNldF91dmRfY2xvY2tzID0gJnZpX3Nl dF91dmRfY2xvY2tzLAogCS5zZXRfdmNlX2Nsb2NrcyA9ICZ2aV9zZXRfdmNlX2Nsb2NrcywKKwku Z2V0X3ZpcnR1YWxfY2FwcyA9ICZ2aV9nZXRfdmlydHVhbF9jYXBzLAogCS8qIHRoZXNlIHNob3Vs ZCBiZSBtb3ZlZCB0byB0aGVpciBvd24gaXAgbW9kdWxlcyAqLwogCS5nZXRfZ3B1X2Nsb2NrX2Nv dW50ZXIgPSAmZ2Z4X3Y4XzBfZ2V0X2dwdV9jbG9ja19jb3VudGVyLAogCS53YWl0X2Zvcl9tY19p ZGxlID0gJmdtY192OF8wX21jX3dhaXRfZm9yX2lkbGUsCi0tIAoyLjguNAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==