From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oded Gabbay Subject: [PATCH 3/3] drm/amdgpu: Return -EPROBE_DEFER when amdkfd not loaded Date: Sun, 14 Feb 2016 11:16:55 +0200 Message-ID: <1455441415-16901-4-git-send-email-oded.gabbay@gmail.com> References: <1455441415-16901-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-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B6B96E41D for ; Sun, 14 Feb 2016 01:17:49 -0800 (PST) Received: by mail-wm0-f67.google.com with SMTP id b205so3216418wmb.1 for ; Sun, 14 Feb 2016 01:17:49 -0800 (PST) In-Reply-To: <1455441415-16901-1-git-send-email-oded.gabbay@gmail.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: daniel.vetter@ffwll.ch List-Id: dri-devel@lists.freedesktop.org YW1kZ3B1IG11c3QgbG9hZCBvbmx5IGFmdGVyIGFtZGtmZCdzIGxvYWRpbmcgaGFzIGJlZW4gY29t cGxldGVkLiBJZiB0aGF0CmlzIG5vdCBlbmZvcmNlZCwgdGhlbiBhbWRncHUncyBjYWxsIGludG8g YW1ka2ZkJ3MgZnVuY3Rpb25zIHdpbGwgY2F1c2UgYQprZXJuZWwgQlVHLgoKV2hlbiBhbWRncHUg YW5kIGFtZGtmZCBhcmUgYnVpbHQgYXMga2VybmVsIG1vZHVsZXMsIHRoYXQgcnVsZSBpcyBlbmZv cmNlZApieSB0aGUga2VybmVsJ3MgbW9kdWxlcyBsb2FkaW5nIG1lY2hhbmlzbS4gV2hlbiBhbWRn cHUgYW5kIGFtZGtmZCBhcmUKYnVpbHQgaW5zaWRlIHRoZSBrZXJuZWwgaW1hZ2UsIHRoYXQgcnVs ZSBpcyBlbmZvcmNlZCBieSBvcmRlcmluZyBpbiB0aGUKZHJtIE1ha2VmaWxlIChhbWRrZmQgYmVm b3JlIGFtZGdwdSkuCgpJbnN0ZWFkIG9mIHVzaW5nIGRybSBNYWtlZmlsZSBvcmRlcmluZywgd2Ug Y2FuIG5vdyB1c2UgZGVmZXJyZWQgbG9hZGluZwphcyBhbWRrZmQgbm93IHJldHVybnMgLUVQUk9C RV9ERUZFUiBpbiBrZ2Qya2ZkX2luaXQoKSB3aGVuIGl0IGlzIG5vdCB5ZXQKbG9hZGVkLgoKVGhp cyBwYXRjaCBkZWZlcnMgYW1kZ3B1IGxvYWRpbmcgYnkgcHJvcGFnYXRpbmcgLUVQUk9CRV9ERUZF UiB0byB0aGUKa2VybmVsJ3MgZHJpdmVycyBsb2FkaW5nIGluZnJhc3RydWN0dXJlLiBUaGF0IHdp bGwgcHV0IGFtZGdwdSBpbnRvIHRoZQpwZW5kaW5nIGRyaXZlcnMgbGlzdCAoc2VlIGRlc2NyaXB0 aW9uIGluIGRkLmMpLiBPbmNlIGFtZGtmZCBpcyBsb2FkZWQsCmEgY2FsbCB0byBrZ2Qya2ZkX2lu aXQoKSB3aWxsIHJldHVybiBzdWNjZXNzZnVsbHkgYW5kIGFtZGdwdSB3aWxsIGJlIGFibGUKdG8g bG9hZC4KClNpZ25lZC1vZmYtYnk6IE9kZWQgR2FiYmF5IDxvZGVkLmdhYmJheUBnbWFpbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2FtZGtmZC5jIHwgNTcgKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfYW1ka2ZkLmggfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X2Rydi5jICAgIHwgMTAgKysrKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyks IDM5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9hbWRrZmQuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hbWRr ZmQuYwppbmRleCA0NGJhOGJlLi4zMjgwOWY3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfYW1ka2ZkLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2FtZGtmZC5jCkBAIC0zMCwyNSArMzAsMzggQEAgY29uc3Qgc3RydWN0IGtmZDJr Z2RfY2FsbHMgKmtmZDJrZ2Q7CiBjb25zdCBzdHJ1Y3Qga2dkMmtmZF9jYWxscyAqa2dkMmtmZDsK IGJvb2wgKCprZ2Qya2ZkX2luaXRfcCkodW5zaWduZWQsIGNvbnN0IHN0cnVjdCBrZ2Qya2ZkX2Nh bGxzKiopOwogCi1ib29sIGFtZGdwdV9hbWRrZmRfaW5pdCh2b2lkKQoraW50IGFtZGdwdV9hbWRr ZmRfaW5pdCh2b2lkKQogeworCWludCByZXQ7CisKICNpZiBkZWZpbmVkKENPTkZJR19IU0FfQU1E X01PRFVMRSkKLQlib29sICgqa2dkMmtmZF9pbml0X3ApKHVuc2lnbmVkLCBjb25zdCBzdHJ1Y3Qg a2dkMmtmZF9jYWxscyoqKTsKKwlpbnQgKCprZ2Qya2ZkX2luaXRfcCkodW5zaWduZWQsIGNvbnN0 IHN0cnVjdCBrZ2Qya2ZkX2NhbGxzKiopOwogCiAJa2dkMmtmZF9pbml0X3AgPSBzeW1ib2xfcmVx dWVzdChrZ2Qya2ZkX2luaXQpOwogCiAJaWYgKGtnZDJrZmRfaW5pdF9wID09IE5VTEwpCi0JCXJl dHVybiBmYWxzZTsKKwkJcmV0dXJuIC1FTk9FTlQ7CisKKwlyZXQgPSBrZ2Qya2ZkX2luaXRfcChL RkRfSU5URVJGQUNFX1ZFUlNJT04sICZrZ2Qya2ZkKTsKKwlpZiAocmV0KSB7CisJCXN5bWJvbF9w dXQoa2dkMmtmZF9pbml0KTsKKwkJa2dkMmtmZCA9IE5VTEw7CisJfQorCisjZWxpZiBkZWZpbmVk KENPTkZJR19IU0FfQU1EKQorCXJldCA9IGtnZDJrZmRfaW5pdChLRkRfSU5URVJGQUNFX1ZFUlNJ T04sICZrZ2Qya2ZkKTsKKwlpZiAocmV0KQorCQlrZ2Qya2ZkID0gTlVMTDsKKworI2Vsc2UKKwly ZXQgPSAtRU5PRU5UOwogI2VuZGlmCi0JcmV0dXJuIHRydWU7CisKKwlyZXR1cm4gcmV0OwogfQog CiBib29sIGFtZGdwdV9hbWRrZmRfbG9hZF9pbnRlcmZhY2Uoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KnJkZXYpCiB7Ci0jaWYgZGVmaW5lZChDT05GSUdfSFNBX0FNRF9NT0RVTEUpCi0JYm9vbCAoKmtn ZDJrZmRfaW5pdF9wKSh1bnNpZ25lZCwgY29uc3Qgc3RydWN0IGtnZDJrZmRfY2FsbHMqKik7Ci0j ZW5kaWYKLQogCXN3aXRjaCAocmRldi0+YXNpY190eXBlKSB7CiAjaWZkZWYgQ09ORklHX0RSTV9B TURHUFVfQ0lLCiAJY2FzZSBDSElQX0tBVkVSSToKQEAgLTYyLDM1ICs3NSw3IEBAIGJvb2wgYW1k Z3B1X2FtZGtmZF9sb2FkX2ludGVyZmFjZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqcmRldikKIAkJ cmV0dXJuIGZhbHNlOwogCX0KIAotI2lmIGRlZmluZWQoQ09ORklHX0hTQV9BTURfTU9EVUxFKQot CWtnZDJrZmRfaW5pdF9wID0gc3ltYm9sX3JlcXVlc3Qoa2dkMmtmZF9pbml0KTsKLQotCWlmIChr Z2Qya2ZkX2luaXRfcCA9PSBOVUxMKSB7Ci0JCWtmZDJrZ2QgPSBOVUxMOwotCQlyZXR1cm4gZmFs c2U7Ci0JfQotCi0JaWYgKGtnZDJrZmRfaW5pdF9wKEtGRF9JTlRFUkZBQ0VfVkVSU0lPTiwgJmtn ZDJrZmQpKSB7Ci0JCXN5bWJvbF9wdXQoa2dkMmtmZF9pbml0KTsKLQkJa2ZkMmtnZCA9IE5VTEw7 Ci0JCWtnZDJrZmQgPSBOVUxMOwotCi0JCXJldHVybiBmYWxzZTsKLQl9Ci0KIAlyZXR1cm4gdHJ1 ZTsKLSNlbGlmIGRlZmluZWQoQ09ORklHX0hTQV9BTUQpCi0JaWYgKGtnZDJrZmRfaW5pdChLRkRf SU5URVJGQUNFX1ZFUlNJT04sICZrZ2Qya2ZkKSkgewotCQlrZmQya2dkID0gTlVMTDsKLQkJa2dk MmtmZCA9IE5VTEw7Ci0JCXJldHVybiBmYWxzZTsKLQl9Ci0KLQlyZXR1cm4gdHJ1ZTsKLSNlbHNl Ci0Ja2ZkMmtnZCA9IE5VTEw7Ci0JcmV0dXJuIGZhbHNlOwotI2VuZGlmCiB9CiAKIHZvaWQgYW1k Z3B1X2FtZGtmZF9maW5pKHZvaWQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfYW1ka2ZkLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf YW1ka2ZkLmgKaW5kZXggYThiZTc2NS4uZGU1MzBmNjhkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYW1ka2ZkLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X2FtZGtmZC5oCkBAIC0zNiw3ICszNiw3IEBAIHN0cnVjdCBrZ2RfbWVt IHsKIAl2b2lkICpjcHVfcHRyOwogfTsKIAotYm9vbCBhbWRncHVfYW1ka2ZkX2luaXQodm9pZCk7 CitpbnQgYW1kZ3B1X2FtZGtmZF9pbml0KHZvaWQpOwogdm9pZCBhbWRncHVfYW1ka2ZkX2Zpbmko dm9pZCk7CiAKIGJvb2wgYW1kZ3B1X2FtZGtmZF9sb2FkX2ludGVyZmFjZShzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqcmRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZHJ2LmMKaW5k ZXggOWMxYWY4OS4uMTc4NTE5YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9k cnYuYwpAQCAtMzIyLDYgKzMyMiwxNCBAQCBzdGF0aWMgaW50IGFtZGdwdV9wY2lfcHJvYmUoc3Ry dWN0IHBjaV9kZXYgKnBkZXYsCiAJCXJldHVybiAtRU5PREVWOwogCX0KIAorCS8qCisJICogSW5p dGlhbGl6ZSBhbWRrZmQgYmVmb3JlIHN0YXJ0aW5nIHJhZGVvbi4gSWYgaXQgd2FzIG5vdCBsb2Fk ZWQgeWV0LAorCSAqIGRlZmVyIHJhZGVvbiBwcm9iaW5nCisJICovCisJcmV0ID0gYW1kZ3B1X2Ft ZGtmZF9pbml0KCk7CisJaWYgKHJldCA9PSAtRVBST0JFX0RFRkVSKQorCQlyZXR1cm4gcmV0Owor CiAJLyogR2V0IHJpZCBvZiB0aGluZ3MgbGlrZSBvZmZiICovCiAJcmV0ID0gYW1kZ3B1X2tpY2tf b3V0X2Zpcm13YXJlX2ZiKHBkZXYpOwogCWlmIChyZXQpCkBAIC01NjQsOCArNTcyLDYgQEAgc3Rh dGljIGludCBfX2luaXQgYW1kZ3B1X2luaXQodm9pZCkKIAlkcml2ZXItPm51bV9pb2N0bHMgPSBh bWRncHVfbWF4X2ttc19pb2N0bDsKIAlhbWRncHVfcmVnaXN0ZXJfYXRweF9oYW5kbGVyKCk7CiAK LQlhbWRncHVfYW1ka2ZkX2luaXQoKTsKLQogCS8qIGxldCBtb2Rwcm9iZSBvdmVycmlkZSB2Z2Eg Y29uc29sZSBzZXR0aW5nICovCiAJcmV0dXJuIGRybV9wY2lfaW5pdChkcml2ZXIsIHBkcml2ZXIp OwogfQotLSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo=