From: Monk Liu Subject: [PATCH 5/5] drm/amdgpu:cleanup job reset routine(v2) Date: Mon, 23 Oct 2017 13:46:52 +0800 Message-ID: <1508737612-24793-5-git-send-email-Monk.Liu@amd.com> References: <1508737612-24793-1-git-send-email-Monk.Liu@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1508737612-24793-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Monk Liu bWVyZ2UgdGhlIHNldHRpbmcgZ3VpbHR5IG9uIGNvbnRleHQgaW50byB0aGlzIGZ1bmN0aW9uCnRv IGF2b2lkIGltcGxlbWVudCBleHRyYSByb3V0aW5lLgoKdjI6CmdvIHRocm91Z2ggZW50aXR5IGxp c3QgYW5kIGNvbXBhcmUgdGhlIGZlbmNlX2N0eApiZWZvcmUgb3BlcmF0ZSBvbiB0aGUgZW50aXR5 LCBvdGhlcndpc2UgdGhlIGVudGl0eQptYXkgYmUganVzdCBhIHdpbGQgcG9pbnRlcgoKQ2hhbmdl LUlkOiBJN2EwMDYzNDY0ZmRjODVkNWFjOTA4MDA0NjM4MGU3NDU1NjVmZjU0MApTaWduZWQtb2Zm LWJ5OiBNb25rIExpdSA8TW9uay5MaXVAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzdGlhbiBL w7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfZGV2aWNlLmMgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vYW1k L3NjaGVkdWxlci9ncHVfc2NoZWR1bGVyLmMgfCAzMSArKysrKysrKysrKysrKysrKysrKysrKysr Ky0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvc2NoZWR1bGVyL2dwdV9zY2hlZHVsZXIuaCB8ICAyICst CiAzIGZpbGVzIGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCmluZGV4IGRhZTFlNWIuLmEw NzU0NGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZp Y2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKQEAg LTI4NjgsNyArMjg2OCw3IEBAIGludCBhbWRncHVfc3Jpb3ZfZ3B1X3Jlc2V0KHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2LCBzdHJ1Y3QgYW1kZ3B1X2pvYiAqam9iKQogCQkJYW1kX3NjaGVkX2pv Yl9raWNrb3V0KCZqb2ItPmJhc2UpOwogCiAJCS8qIG9ubHkgZG8gam9iX3Jlc2V0IG9uIHRoZSBo YW5nIHJpbmcgaWYgQGpvYiBub3QgTlVMTCAqLwotCQlhbWRfc2NoZWRfaHdfam9iX3Jlc2V0KCZy aW5nLT5zY2hlZCk7CisJCWFtZF9zY2hlZF9od19qb2JfcmVzZXQoJnJpbmctPnNjaGVkLCBOVUxM KTsKIAogCQkvKiBhZnRlciBhbGwgaHcgam9icyBhcmUgcmVzZXQsIGh3IGZlbmNlIGlzIG1lYW5p bmdsZXNzLCBzbyBmb3JjZV9jb21wbGV0aW9uICovCiAJCWFtZGdwdV9mZW5jZV9kcml2ZXJfZm9y Y2VfY29tcGxldGlvbihyaW5nKTsKQEAgLTI5ODksNyArMjk4OSw3IEBAIGludCBhbWRncHVfZ3B1 X3Jlc2V0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQlpZiAoIXJpbmcgfHwgIXJpbmct PnNjaGVkLnRocmVhZCkKIAkJCWNvbnRpbnVlOwogCQlrdGhyZWFkX3BhcmsocmluZy0+c2NoZWQu dGhyZWFkKTsKLQkJYW1kX3NjaGVkX2h3X2pvYl9yZXNldCgmcmluZy0+c2NoZWQpOworCQlhbWRf c2NoZWRfaHdfam9iX3Jlc2V0KCZyaW5nLT5zY2hlZCwgTlVMTCk7CiAJCS8qIGFmdGVyIGFsbCBo dyBqb2JzIGFyZSByZXNldCwgaHcgZmVuY2UgaXMgbWVhbmluZ2xlc3MsIHNvIGZvcmNlX2NvbXBs ZXRpb24gKi8KIAkJYW1kZ3B1X2ZlbmNlX2RyaXZlcl9mb3JjZV9jb21wbGV0aW9uKHJpbmcpOwog CX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvc2NoZWR1bGVyL2dwdV9zY2hlZHVs ZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvc2NoZWR1bGVyL2dwdV9zY2hlZHVsZXIuYwppbmRl eCA5N2ZkMjU1Li4zOWI2MjA1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3NjaGVk dWxlci9ncHVfc2NoZWR1bGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9zY2hlZHVsZXIv Z3B1X3NjaGVkdWxlci5jCkBAIC00NDMsOSArNDQzLDE4IEBAIHN0YXRpYyB2b2lkIGFtZF9zY2hl ZF9qb2JfdGltZWRvdXQoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCWpvYi0+c2NoZWQtPm9w cy0+dGltZWRvdXRfam9iKGpvYik7CiB9CiAKLXZvaWQgYW1kX3NjaGVkX2h3X2pvYl9yZXNldChz dHJ1Y3QgYW1kX2dwdV9zY2hlZHVsZXIgKnNjaGVkKQorc3RhdGljIHZvaWQgYW1kX3NjaGVkX3Nl dF9ndWlsdHkoc3RydWN0IGFtZF9zY2hlZF9qb2IgKnNfam9iKQoreworCWlmIChhdG9taWNfaW5j X3JldHVybigmc19qb2ItPmthcm1hKSA+IHNfam9iLT5zY2hlZC0+aGFuZ19saW1pdCkKKwkJaWYg KHNfam9iLT5zX2VudGl0eS0+Z3VpbHR5KQorCQkJYXRvbWljX3NldChzX2pvYi0+c19lbnRpdHkt Pmd1aWx0eSwgMSk7Cit9CisKK3ZvaWQgYW1kX3NjaGVkX2h3X2pvYl9yZXNldChzdHJ1Y3QgYW1k X2dwdV9zY2hlZHVsZXIgKnNjaGVkLCBzdHJ1Y3QgYW1kX3NjaGVkX2pvYiAqYmFkKQogewogCXN0 cnVjdCBhbWRfc2NoZWRfam9iICpzX2pvYjsKKwlzdHJ1Y3QgYW1kX3NjaGVkX2VudGl0eSAqZW50 aXR5LCAqdG1wOworCWludCBpOzsKIAogCXNwaW5fbG9jaygmc2NoZWQtPmpvYl9saXN0X2xvY2sp OwogCWxpc3RfZm9yX2VhY2hfZW50cnlfcmV2ZXJzZShzX2pvYiwgJnNjaGVkLT5yaW5nX21pcnJv cl9saXN0LCBub2RlKSB7CkBAIC00NTgsNiArNDY3LDI2IEBAIHZvaWQgYW1kX3NjaGVkX2h3X2pv Yl9yZXNldChzdHJ1Y3QgYW1kX2dwdV9zY2hlZHVsZXIgKnNjaGVkKQogCQl9CiAJfQogCXNwaW5f dW5sb2NrKCZzY2hlZC0+am9iX2xpc3RfbG9jayk7CisKKwlpZiAoYmFkKSB7CisJCWJvb2wgZm91 bmQgPSBmYWxzZTsKKworCQlmb3IgKGkgPSBBTURfU0NIRURfUFJJT1JJVFlfTUlOOyBpIDwgQU1E X1NDSEVEX1BSSU9SSVRZX01BWDsgaSsrICkgeworCQkJc3RydWN0IGFtZF9zY2hlZF9ycSAqcnEg PSAmc2NoZWQtPnNjaGVkX3JxW2ldOworCisJCQlzcGluX2xvY2soJnJxLT5sb2NrKTsKKwkJCWxp c3RfZm9yX2VhY2hfZW50cnlfc2FmZShlbnRpdHksIHRtcCwgJnJxLT5lbnRpdGllcywgbGlzdCkg eworCQkJCWlmIChiYWQtPnNfZmVuY2UtPnNjaGVkdWxlZC5jb250ZXh0ID09IGVudGl0eS0+ZmVu Y2VfY29udGV4dCkgeworCQkJCQlmb3VuZCA9IHRydWU7CisJCQkJCWFtZF9zY2hlZF9zZXRfZ3Vp bHR5KGJhZCk7CisJCQkJCWJyZWFrOworCQkJCX0KKwkJCX0KKwkJCXNwaW5fdW5sb2NrKCZycS0+ bG9jayk7CisJCQlpZiAoZm91bmQpCisJCQkJYnJlYWs7CisJCX0KKwl9CiB9CiAKIHZvaWQgYW1k X3NjaGVkX2pvYl9raWNrb3V0KHN0cnVjdCBhbWRfc2NoZWRfam9iICpzX2pvYikKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvc2NoZWR1bGVyL2dwdV9zY2hlZHVsZXIuaCBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvc2NoZWR1bGVyL2dwdV9zY2hlZHVsZXIuaAppbmRleCBhMDU5OTRjLi5i ZTc1MTcyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3NjaGVkdWxlci9ncHVfc2No ZWR1bGVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9zY2hlZHVsZXIvZ3B1X3NjaGVkdWxl ci5oCkBAIC0xNzQsNyArMTc0LDcgQEAgaW50IGFtZF9zY2hlZF9qb2JfaW5pdChzdHJ1Y3QgYW1k X3NjaGVkX2pvYiAqam9iLAogCQkgICAgICAgc3RydWN0IGFtZF9ncHVfc2NoZWR1bGVyICpzY2hl ZCwKIAkJICAgICAgIHN0cnVjdCBhbWRfc2NoZWRfZW50aXR5ICplbnRpdHksCiAJCSAgICAgICB2 b2lkICpvd25lcik7Ci12b2lkIGFtZF9zY2hlZF9od19qb2JfcmVzZXQoc3RydWN0IGFtZF9ncHVf c2NoZWR1bGVyICpzY2hlZCk7Cit2b2lkIGFtZF9zY2hlZF9od19qb2JfcmVzZXQoc3RydWN0IGFt ZF9ncHVfc2NoZWR1bGVyICpzY2hlZCwgc3RydWN0IGFtZF9zY2hlZF9qb2IgKmpvYik7CiB2b2lk IGFtZF9zY2hlZF9qb2JfcmVjb3Zlcnkoc3RydWN0IGFtZF9ncHVfc2NoZWR1bGVyICpzY2hlZCk7 CiBib29sIGFtZF9zY2hlZF9kZXBlbmRlbmN5X29wdGltaXplZChzdHJ1Y3QgZG1hX2ZlbmNlKiBm ZW5jZSwKIAkJCQkgICAgc3RydWN0IGFtZF9zY2hlZF9lbnRpdHkgKmVudGl0eSk7Ci0tIAoyLjcu NAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdm eCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==