From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oded Gabbay Subject: [PATCH v2] drm/amdgpu: Initialize compute sdma and memory from kgd Date: Wed, 24 Jun 2015 22:39:21 +0300 Message-ID: <1435174761-29695-1-git-send-email-oded.gabbay@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by gabe.freedesktop.org (Postfix) with ESMTP id 696916EBE7 for ; Wed, 24 Jun 2015 12:39:31 -0700 (PDT) Received: by wgqq4 with SMTP id q4so44789931wgq.1 for ; Wed, 24 Jun 2015 12:39:30 -0700 (PDT) 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, alexdeucher@gmail.com List-Id: dri-devel@lists.freedesktop.org RnJvbTogQmVuIEdveiA8YmVuLmdvekBhbWQuY29tPgoKdjI6IGFkZCBtaXNzaW5nIE1UWVBFX05P TkNBQ0hFRCBlbnVtCgpTaWduZWQtb2ZmLWJ5OiBCZW4gR296IDxiZW4uZ296QGFtZC5jb20+CkFj a2VkLWJ5OiBPZGVkIEdhYmJheSA8b2RlZC5nYWJiYXlAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IEFs ZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9jaWtkLmggICAgICB8ICA2ICsrKysrCiBkcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9nZnhfdjdfMC5jICB8IDQyICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwog ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYyAgfCA0NyArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zZG1hX3Yz XzAuYyB8IDI4ICsrKysrKysrKysrKysrKysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDEyMyBpbnNl cnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lrZC5o IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lrZC5oCmluZGV4IDIyMDg2NWEuLmQxOTA4 NWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Npa2QuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9jaWtkLmgKQEAgLTU1Miw0ICs1NTIsMTAgQEAKICNk ZWZpbmUgVkNFX0NNRF9JQl9BVVRPCQkweDAwMDAwMDA1CiAjZGVmaW5lIFZDRV9DTURfU0VNQVBI T1JFCTB4MDAwMDAwMDYKIAorLyogdmFsaWQgZm9yIGJvdGggREVGQVVMVF9NVFlQRSBhbmQgQVBF MV9NVFlQRSAqLworZW51bSB7CisJTVRZUEVfQ0FDSEVEID0gMCwKKwlNVFlQRV9OT05DQUNIRUQg PSAzCit9OworCiAjZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2dmeF92N18wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjdfMC5jCmluZGV4 IGNiNzkwNzQ0Li4yYzE4OGZiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9nZnhfdjdfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92N18wLmMK QEAgLTIwMTAsNiArMjAxMCw0NiBAQCBzdGF0aWMgdm9pZCBnZnhfdjdfMF9zZXR1cF9yYihzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIH0KIAogLyoqCisgKiBnbWNfdjdfMF9pbml0X2NvbXB1 dGVfdm1pZCAtIGdhcnQgZW5hYmxlCisgKgorICogQHJkZXY6IGFtZGdwdV9kZXZpY2UgcG9pbnRl cgorICoKKyAqIEluaXRpYWxpemUgY29tcHV0ZSB2bWlkIHNoX21lbSByZWdpc3RlcnMKKyAqCisg Ki8KKyNkZWZpbmUgREVGQVVMVF9TSF9NRU1fQkFTRVMJKDB4NjAwMCkKKyNkZWZpbmUgRklSU1Rf Q09NUFVURV9WTUlECSg4KQorI2RlZmluZSBMQVNUX0NPTVBVVEVfVk1JRAkoMTYpCitzdGF0aWMg dm9pZCBnbWNfdjdfMF9pbml0X2NvbXB1dGVfdm1pZChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl dikKK3sKKwlpbnQgaTsKKwl1aW50MzJfdCBzaF9tZW1fY29uZmlnOworCXVpbnQzMl90IHNoX21l bV9iYXNlczsKKworCS8qCisJICogQ29uZmlndXJlIGFwZXJ0dXJlczoKKwkgKiBMRFM6ICAgICAg ICAgMHg2MDAwMDAwMCcwMDAwMDAwMCAtIDB4NjAwMDAwMDEnMDAwMDAwMDAgKDRHQikKKwkgKiBT Y3JhdGNoOiAgICAgMHg2MDAwMDAwMScwMDAwMDAwMCAtIDB4NjAwMDAwMDInMDAwMDAwMDAgKDRH QikKKwkgKiBHUFVWTTogICAgICAgMHg2MDAxMDAwMCcwMDAwMDAwMCAtIDB4NjAwMjAwMDAnMDAw MDAwMDAgKDFUQikKKwkqLworCXNoX21lbV9iYXNlcyA9IERFRkFVTFRfU0hfTUVNX0JBU0VTIHwg KERFRkFVTFRfU0hfTUVNX0JBU0VTIDw8IDE2KTsKKwlzaF9tZW1fY29uZmlnID0gU0hfTUVNX0FM SUdOTUVOVF9NT0RFX1VOQUxJR05FRCA8PAorCQkJU0hfTUVNX0NPTkZJR19fQUxJR05NRU5UX01P REVfX1NISUZUOworCXNoX21lbV9jb25maWcgfD0gTVRZUEVfTk9OQ0FDSEVEIDw8IFNIX01FTV9D T05GSUdfX0RFRkFVTFRfTVRZUEVfX1NISUZUOworCW11dGV4X2xvY2soJmFkZXYtPnNyYm1fbXV0 ZXgpOworCWZvciAoaSA9IEZJUlNUX0NPTVBVVEVfVk1JRDsgaSA8IExBU1RfQ09NUFVURV9WTUlE OyBpKyspIHsKKwkJY2lrX3NyYm1fc2VsZWN0KGFkZXYsIDAsIDAsIDAsIGkpOworCQkvKiBDUCBh bmQgc2hhZGVycyAqLworCQlXUkVHMzIobW1TSF9NRU1fQ09ORklHLCBzaF9tZW1fY29uZmlnKTsK KwkJV1JFRzMyKG1tU0hfTUVNX0FQRTFfQkFTRSwgMSk7CisJCVdSRUczMihtbVNIX01FTV9BUEUx X0xJTUlULCAwKTsKKwkJV1JFRzMyKG1tU0hfTUVNX0JBU0VTLCBzaF9tZW1fYmFzZXMpOworCX0K KwljaWtfc3JibV9zZWxlY3QoYWRldiwgMCwgMCwgMCwgMCk7CisJbXV0ZXhfdW5sb2NrKCZhZGV2 LT5zcmJtX211dGV4KTsKK30KKworLyoqCiAgKiBnZnhfdjdfMF9ncHVfaW5pdCAtIHNldHVwIHRo ZSAzRCBlbmdpbmUKICAqCiAgKiBAYWRldjogYW1kZ3B1X2RldmljZSBwb2ludGVyCkBAIC0yMjMw LDYgKzIyNzAsOCBAQCBzdGF0aWMgdm9pZCBnZnhfdjdfMF9ncHVfaW5pdChzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldikKIAljaWtfc3JibV9zZWxlY3QoYWRldiwgMCwgMCwgMCwgMCk7CiAJbXV0 ZXhfdW5sb2NrKCZhZGV2LT5zcmJtX211dGV4KTsKIAorCWdtY192N18wX2luaXRfY29tcHV0ZV92 bWlkKGFkZXYpOworCiAJV1JFRzMyKG1tU1hfREVCVUdfMSwgMHgyMCk7CiAKIAlXUkVHMzIobW1U QV9DTlRMX0FVWCwgMHgwMDAxMDAwMCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9nZnhfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAu YwppbmRleCAxNDI0MmJkLi5lNGFlYjc0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9nZnhfdjhfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92 OF8wLmMKQEAgLTE4OTQsNiArMTg5NCw1MSBAQCBzdGF0aWMgdm9pZCBnZnhfdjhfMF9zZXR1cF9y YihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAltdXRleF91bmxvY2soJmFkZXYtPmdyYm1f aWR4X211dGV4KTsKIH0KIAorLyoqCisgKiBnbWNfdjhfMF9pbml0X2NvbXB1dGVfdm1pZCAtIGdh cnQgZW5hYmxlCisgKgorICogQHJkZXY6IGFtZGdwdV9kZXZpY2UgcG9pbnRlcgorICoKKyAqIElu aXRpYWxpemUgY29tcHV0ZSB2bWlkIHNoX21lbSByZWdpc3RlcnMKKyAqCisgKi8KKyNkZWZpbmUg REVGQVVMVF9TSF9NRU1fQkFTRVMJKDB4NjAwMCkKKyNkZWZpbmUgRklSU1RfQ09NUFVURV9WTUlE CSg4KQorI2RlZmluZSBMQVNUX0NPTVBVVEVfVk1JRAkoMTYpCitzdGF0aWMgdm9pZCBnbWNfdjhf MF9pbml0X2NvbXB1dGVfdm1pZChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKK3sKKwlpbnQg aTsKKwl1aW50MzJfdCBzaF9tZW1fY29uZmlnOworCXVpbnQzMl90IHNoX21lbV9iYXNlczsKKwor CS8qCisJICogQ29uZmlndXJlIGFwZXJ0dXJlczoKKwkgKiBMRFM6ICAgICAgICAgMHg2MDAwMDAw MCcwMDAwMDAwMCAtIDB4NjAwMDAwMDEnMDAwMDAwMDAgKDRHQikKKwkgKiBTY3JhdGNoOiAgICAg MHg2MDAwMDAwMScwMDAwMDAwMCAtIDB4NjAwMDAwMDInMDAwMDAwMDAgKDRHQikKKwkgKiBHUFVW TTogICAgICAgMHg2MDAxMDAwMCcwMDAwMDAwMCAtIDB4NjAwMjAwMDAnMDAwMDAwMDAgKDFUQikK KwkgKi8KKwlzaF9tZW1fYmFzZXMgPSBERUZBVUxUX1NIX01FTV9CQVNFUyB8IChERUZBVUxUX1NI X01FTV9CQVNFUyA8PCAxNik7CisKKwlzaF9tZW1fY29uZmlnID0gU0hfTUVNX0FERFJFU1NfTU9E RV9IU0E2NCA8PAorCQkJU0hfTUVNX0NPTkZJR19fQUREUkVTU19NT0RFX19TSElGVCB8CisJCQlT SF9NRU1fQUxJR05NRU5UX01PREVfVU5BTElHTkVEIDw8CisJCQlTSF9NRU1fQ09ORklHX19BTElH Tk1FTlRfTU9ERV9fU0hJRlQgfAorCQkJTVRZUEVfQ0MgPDwgU0hfTUVNX0NPTkZJR19fREVGQVVM VF9NVFlQRV9fU0hJRlQgfAorCQkJU0hfTUVNX0NPTkZJR19fUFJJVkFURV9BVENfTUFTSzsKKwor CW11dGV4X2xvY2soJmFkZXYtPnNyYm1fbXV0ZXgpOworCWZvciAoaSA9IEZJUlNUX0NPTVBVVEVf Vk1JRDsgaSA8IExBU1RfQ09NUFVURV9WTUlEOyBpKyspIHsKKwkJdmlfc3JibV9zZWxlY3QoYWRl diwgMCwgMCwgMCwgaSk7CisJCS8qIENQIGFuZCBzaGFkZXJzICovCisJCVdSRUczMihtbVNIX01F TV9DT05GSUcsIHNoX21lbV9jb25maWcpOworCQlXUkVHMzIobW1TSF9NRU1fQVBFMV9CQVNFLCAx KTsKKwkJV1JFRzMyKG1tU0hfTUVNX0FQRTFfTElNSVQsIDApOworCQlXUkVHMzIobW1TSF9NRU1f QkFTRVMsIHNoX21lbV9iYXNlcyk7CisJfQorCXZpX3NyYm1fc2VsZWN0KGFkZXYsIDAsIDAsIDAs IDApOworCW11dGV4X3VubG9jaygmYWRldi0+c3JibV9tdXRleCk7Cit9CisKIHN0YXRpYyB2b2lk IGdmeF92OF8wX2dwdV9pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCXUzMiBn Yl9hZGRyX2NvbmZpZzsKQEAgLTIxMTMsNiArMjE1OCw4IEBAIHN0YXRpYyB2b2lkIGdmeF92OF8w X2dwdV9pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXZpX3NyYm1fc2VsZWN0KGFk ZXYsIDAsIDAsIDAsIDApOwogCW11dGV4X3VubG9jaygmYWRldi0+c3JibV9tdXRleCk7CiAKKwln bWNfdjhfMF9pbml0X2NvbXB1dGVfdm1pZChhZGV2KTsKKwogCW11dGV4X2xvY2soJmFkZXYtPmdy Ym1faWR4X211dGV4KTsKIAkvKgogCSAqIG1ha2luZyBzdXJlIHRoYXQgdGhlIGZvbGxvd2luZyBy ZWdpc3RlciB3cml0ZXMgd2lsbCBiZSBicm9hZGNhc3RlZApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvc2RtYV92M18wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9zZG1hX3YzXzAuYwppbmRleCBlM2MxZmRlLi43YmIzN2I5IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9zZG1hX3YzXzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9zZG1hX3YzXzAuYwpAQCAtNDM5LDYgKzQzOSwzMSBAQCBzdGF0aWMgdm9pZCBzZG1h X3YzXzBfcmxjX3N0b3Aoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB9CiAKIC8qKgorICog c2RtYV92M18wX2N0eF9zd2l0Y2hfZW5hYmxlIC0gc3RvcCB0aGUgYXN5bmMgZG1hIGVuZ2luZXMg Y29udGV4dCBzd2l0Y2gKKyAqCisgKiBAYWRldjogYW1kZ3B1X2RldmljZSBwb2ludGVyCisgKiBA ZW5hYmxlOiBlbmFibGUvZGlzYWJsZSB0aGUgRE1BIE1FcyBjb250ZXh0IHN3aXRjaC4KKyAqCisg KiBIYWx0IG9yIHVuaGFsdCB0aGUgYXN5bmMgZG1hIGVuZ2luZXMgY29udGV4dCBzd2l0Y2ggKFZJ KS4KKyAqLworc3RhdGljIHZvaWQgc2RtYV92M18wX2N0eF9zd2l0Y2hfZW5hYmxlKHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2LCBib29sIGVuYWJsZSkKK3sKKwl1MzIgZjMyX2NudGw7CisJaW50 IGk7CisKKwlmb3IgKGkgPSAwOyBpIDwgU0RNQV9NQVhfSU5TVEFOQ0U7IGkrKykgeworCQlmMzJf Y250bCA9IFJSRUczMihtbVNETUEwX0NOVEwgKyBzZG1hX29mZnNldHNbaV0pOworCQlpZiAoZW5h YmxlKQorCQkJZjMyX2NudGwgPSBSRUdfU0VUX0ZJRUxEKGYzMl9jbnRsLCBTRE1BMF9DTlRMLAor CQkJCQlBVVRPX0NUWFNXX0VOQUJMRSwgMSk7CisJCWVsc2UKKwkJCWYzMl9jbnRsID0gUkVHX1NF VF9GSUVMRChmMzJfY250bCwgU0RNQTBfQ05UTCwKKwkJCQkJQVVUT19DVFhTV19FTkFCTEUsIDAp OworCQlXUkVHMzIobW1TRE1BMF9DTlRMICsgc2RtYV9vZmZzZXRzW2ldLCBmMzJfY250bCk7CisJ fQorfQorCisvKioKICAqIHNkbWFfdjNfMF9lbmFibGUgLSBzdG9wIHRoZSBhc3luYyBkbWEgZW5n aW5lcwogICoKICAqIEBhZGV2OiBhbWRncHVfZGV2aWNlIHBvaW50ZXIKQEAgLTY0OCw2ICs2NzMs OCBAQCBzdGF0aWMgaW50IHNkbWFfdjNfMF9zdGFydChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl dikKIAogCS8qIHVuaGFsdCB0aGUgTUVzICovCiAJc2RtYV92M18wX2VuYWJsZShhZGV2LCB0cnVl KTsKKwkvKiBlbmFibGUgc2RtYSByaW5nIHByZWVtcHRpb24gKi8KKwlzZG1hX3YzXzBfY3R4X3N3 aXRjaF9lbmFibGUoYWRldiwgdHJ1ZSk7CiAKIAkvKiBzdGFydCB0aGUgZ2Z4IHJpbmdzIGFuZCBy bGMgY29tcHV0ZSBxdWV1ZXMgKi8KIAlyID0gc2RtYV92M18wX2dmeF9yZXN1bWUoYWRldik7CkBA IC0xMDc5LDYgKzExMDYsNyBAQCBzdGF0aWMgaW50IHNkbWFfdjNfMF9od19maW5pKHZvaWQgKmhh bmRsZSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqKWhhbmRsZTsKIAorCXNkbWFfdjNfMF9jdHhfc3dpdGNoX2VuYWJsZShhZGV2LCBmYWxz ZSk7CiAJc2RtYV92M18wX2VuYWJsZShhZGV2LCBmYWxzZSk7CiAKIAlyZXR1cm4gMDsKLS0gCjIu NC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=