From: John Brooks Subject: [PATCH v2 2/2] drm/amdgpu: Don't call amd_powerplay_destroy() if we don't have powerplay Date: Mon, 3 Jul 2017 14:05:35 -0400 Message-ID: <1499105135-18575-2-git-send-email-john@fastquake.com> References: <1499105135-18575-1-git-send-email-john@fastquake.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1499105135-18575-1-git-send-email-john@fastquake.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: amd-gfx@lists.freedesktop.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher Cc: dri-devel@lists.freedesktop.org List-Id: amd-gfx.lists.freedesktop.org YW1kX3Bvd2VycGxheV9kZXN0cm95KCkgZXhwZWN0cyBhIGhhbmRsZSBwb2ludGluZyB0byBhIHN0 cnVjdCBwcF9pbnN0YW5jZS4KT24gY2hpcHMgd2l0aG91dCBQb3dlclBsYXksIHBwX2hhbmRsZSBw b2ludHMgdG8gYSBzdHJ1Y3QgYW1kZ3B1X2RldmljZS4gVGhlCnJlc3VsdGluZyBhdHRlbXB0IHRv IGtmcmVlKCkgZmllbGRzIG9mIHRoZSB3cm9uZyBzdHJ1Y3QgZW5kcyBpbiBmaXJlOgoKWyAgIDkx LjU2MDQwNV0gQlVHOiB1bmFibGUgdG8gaGFuZGxlIGtlcm5lbCBwYWdpbmcgcmVxdWVzdCBhdCBm ZmZmZWJlMDAwMDAwNjIwClsgICA5MS41NjA0MTRdIElQOiBrZnJlZSsweDU3LzB4MTYwClsgICA5 MS41NjA0MTZdIFBHRCAwClsgICA5MS41NjA0MTZdIFA0RCAwCgpbICAgOTEuNTYwNDIwXSBPb3Bz OiAwMDAwIFsjMV0gU01QClsgICA5MS41NjA0MjJdIE1vZHVsZXMgbGlua2VkIGluOiB0dW4geDg2 X3BrZ190ZW1wX3RoZXJtYWwgY3JjMzJfcGNsbXVsIGdoYXNoX2NsbXVsbmlfaW50ZWwgZWZpdmFy ZnMgYW1kZ3B1KC0pIGkyY19hbGdvX2JpdCBkcm1fa21zX2hlbHBlciBzeXNjb3B5YXJlYSBzeXNm aWxscmVjdCBzeXNpbWdibHQgZmJfc3lzX2ZvcHMgdHRtIGRybQpbICAgOTEuNTYwNDM4XSBDUFU6 IDYgUElEOiAzNTk4IENvbW06IHJtbW9kIE5vdCB0YWludGVkIDQuMTIuMC1yYzUtZHJtLW5leHQt NC4xMy10dG1wYXRjaCsgIzEKWyAgIDkxLjU2MDQ0M10gSGFyZHdhcmUgbmFtZTogR2lnYWJ5dGUg VGVjaG5vbG9neSBDby4sIEx0ZC4gWjk3WC1VRDNILUJLL1o5N1gtVUQzSC1CSy1DRiwgQklPUyBG NiAwNi8xNy8yMDE0ClsgICA5MS41NjA0NDhdIHRhc2s6IGZmZmY4ODA1MDYzZDZhMDAgdGFzay5z dGFjazogZmZmZmM5MDAwMzQwMDAwMApbICAgOTEuNTYwNDUxXSBSSVA6IDAwMTA6a2ZyZWUrMHg1 Ny8weDE2MApbICAgOTEuNTYwNDU0XSBSU1A6IDAwMTg6ZmZmZmM5MDAwMzQwM2NjMCBFRkxBR1M6 IDAwMDEwMjg2ClsgICA5MS41NjA0NTddIFJBWDogMDAwMDc3ZmY4MDAwMDAwMCBSQlg6IDAwMDAw MDAwMDAwMTg2YTAgUkNYOiAwMDAwMDAwMTgwNDAwMDM1ClsgICA5MS41NjA0NjBdIFJEWDogMDAw MDAwMDE4MDQwMDAzNiBSU0k6IGZmZmZlYTAwMTQxOGU3NDAgUkRJOiBmZmZmZWEwMDAwMDAwMDAw ClsgICA5MS41NjA0NjNdIFJCUDogZmZmZmM5MDAwMzQwM2NkOCBSMDg6IDAwMDAwMDAwMDYzOWQy MDEgUjA5OiAwMDAwMDAwMTgwNDAwMDM1ClsgICA5MS41NjA0NjddIFIxMDogZmZmZmViZTAwMDAw MDYwMCBSMTE6IDAwMDAwMDAwMDAwMDAzMDAgUjEyOiBmZmZmODgwNTAwNTMwMDMwClsgICA5MS41 NjA0NzBdIFIxMzogZmZmZmZmZmZhMDFlNzBmYyBSMTQ6IDAwMDAwMDAwZmZmZmZmZmYgUjE1OiBm ZmZmODgwNTAwNTMwMDAwClsgICA5MS41NjA0NzNdIEZTOiAgMDAwMDdmN2U1MDBjMzcwMCgwMDAw KSBHUzpmZmZmODgwNTFlZDgwMDAwKDAwMDApIGtubEdTOjAwMDAwMDAwMDAwMDAwMDAKWyAgIDkx LjU2MDQ3OF0gQ1M6ICAwMDEwIERTOiAwMDAwIEVTOiAwMDAwIENSMDogMDAwMDAwMDA4MDA1MDAz MwpbICAgOTEuNTYwNDgwXSBDUjI6IGZmZmZlYmUwMDAwMDA2MjAgQ1IzOiAwMDAwMDAwNTAzMTAz MDAwIENSNDogMDAwMDAwMDAwMDE0MDZlMApbICAgOTEuNTYwNDgzXSBEUjA6IDAwMDAwMDAwMDAw MDAwMDAgRFIxOiAwMDAwMDAwMDAwMDAwMDAwIERSMjogMDAwMDAwMDAwMDAwMDAwMApbICAgOTEu NTYwNDg3XSBEUjM6IDAwMDAwMDAwMDAwMDAwMDAgRFI2OiAwMDAwMDAwMGZmZmUwZmYwIERSNzog MDAwMDAwMDAwMDAwMDQwMApbICAgOTEuNTYwNDg5XSBDYWxsIFRyYWNlOgpbICAgOTEuNTYwNTMw XSAgYW1kX3Bvd2VycGxheV9kZXN0cm95KzB4MWMvMHg2MCBbYW1kZ3B1XQpbICAgOTEuNTYwNTU4 XSAgYW1kZ3B1X3BwX2xhdGVfZmluaSsweDQ0LzB4NjAgW2FtZGdwdV0KWyAgIDkxLjU2MDU3NV0g IGFtZGdwdV9maW5pKzB4MjU0LzB4NDkwIFthbWRncHVdClsgICA5MS41NjA1OTNdICBhbWRncHVf ZGV2aWNlX2ZpbmkrMHg1OC8weDFiMCBbYW1kZ3B1XQpbICAgOTEuNTYwNjEwXSAgYW1kZ3B1X2Ry aXZlcl91bmxvYWRfa21zKzB4NGYvMHhhMCBbYW1kZ3B1XQpbICAgOTEuNTYwNjIyXSAgZHJtX2Rl dl91bnJlZ2lzdGVyKzB4M2MvMHhlMCBbZHJtXQpbICAgOTEuNTYwNjM4XSAgYW1kZ3B1X3BjaV9y ZW1vdmUrMHgxOS8weDMwIFthbWRncHVdClsgICA5MS41NjA2NDNdICBwY2lfZGV2aWNlX3JlbW92 ZSsweDM5LzB4YzAKWyAgIDkxLjU2MDY0OF0gIGRldmljZV9yZWxlYXNlX2RyaXZlcl9pbnRlcm5h bCsweDE1NS8weDIxMApbICAgOTEuNTYwNjUxXSAgZHJpdmVyX2RldGFjaCsweDM4LzB4NzAKWyAg IDkxLjU2MDY1NV0gIGJ1c19yZW1vdmVfZHJpdmVyKzB4NGMvMHhhMApbICAgOTEuNTYwNjU4XSAg ZHJpdmVyX3VucmVnaXN0ZXIrMHgyYy8weDQwClsgICA5MS41NjA2NjJdICBwY2lfdW5yZWdpc3Rl cl9kcml2ZXIrMHgyMS8weDkwClsgICA5MS41NjA2ODldICBhbWRncHVfZXhpdCsweDE1LzB4NDA2 IFthbWRncHVdClsgICA5MS41NjA2OTRdICBTeVNfZGVsZXRlX21vZHVsZSsweDFhOC8weDI3MApb ICAgOTEuNTYwNjk4XSAgPyBleGl0X3RvX3VzZXJtb2RlX2xvb3ArMHg5Mi8weGEwClsgICA5MS41 NjA3MDJdICBlbnRyeV9TWVNDQUxMXzY0X2Zhc3RwYXRoKzB4MTMvMHg5NApbICAgOTEuNTYwNzA1 XSBSSVA6IDAwMzM6MHg3ZjdlNGZjMTE4ZTcKWyAgIDkxLjU2MDcwOF0gUlNQOiAwMDJiOjAwMDA3 ZmZmOTc4Y2ExMTggRUZMQUdTOiAwMDAwMDIwNiBPUklHX1JBWDogMDAwMDAwMDAwMDAwMDBiMApb ICAgOTEuNTYwNzEzXSBSQVg6IGZmZmZmZmZmZmZmZmZmZGEgUkJYOiAwMDAwNTVhZmUyMWJjMjAw IFJDWDogMDAwMDdmN2U0ZmMxMThlNwpbICAgOTEuNTYwNzE2XSBSRFg6IDAwMDAwMDAwMDAwMDAw MGEgUlNJOiAwMDAwMDAwMDAwMDAwODAwIFJESTogMDAwMDU1YWZlMjFiYzI2OApbICAgOTEuNTYw NzE5XSBSQlA6IDAwMDAwMDAwMDAwMDAwMDMgUjA4OiAwMDAwMDAwMDAwMDAwMDAwIFIwOTogMTk5 OTk5OTk5OTk5OTk5OQpbICAgOTEuNTYwNzIyXSBSMTA6IDAwMDAwMDAwMDAwMDA4ODMgUjExOiAw MDAwMDAwMDAwMDAwMjA2IFIxMjogMDAwMDdmZmY5NzhjOTEwMApbICAgOTEuNTYwNzI1XSBSMTM6 IDAwMDAwMDAwMDAwMDAwMDAgUjE0OiAwMDAwMDAwMDAwMDAwMDAwIFIxNTogMDAwMDU1YWZlMjFi YzIwMApbICAgOTEuNTYwNzI4XSBDb2RlOiAwMCAwMCAwMCA4MCBmZiA3NyAwMCAwMCA0OCBiZiAw MCAwMCAwMCAwMCAwMCBlYSBmZiBmZiA0OSAwMSBkYSA0OCAwZiA0MiAwNSA1NyAzMyBiZCAwMCA0 OSAwMSBjMiA0OSBjMSBlYSAwYyA0OSBjMSBlMiAwNiA0OSAwMSBmYSA8NDk+IDhiIDQyIDIwIDQ4 IDhkIDc4IGZmIGE4IDAxIDRjIDBmIDQ1IGQ3IDQ5IDhiIDUyIDIwIDQ4IDhkIDQyClsgICA5MS41 NjA3NTldIFJJUDoga2ZyZWUrMHg1Ny8weDE2MCBSU1A6IGZmZmZjOTAwMDM0MDNjYzAKWyAgIDkx LjU2MDc2MV0gQ1IyOiBmZmZmZWJlMDAwMDAwNjIwClsgICA5MS41NjA3NjVdIC0tLVsgZW5kIHRy YWNlIDA4YTlmM2NkODIyMjNjMWQgXS0tLQoKRml4ZXM6IDFjODYzODAyNDg0NiAoZHJtL2FtZC9w b3dlcnBsYXk6IHJlZmluZSBwb3dlcnBsYXkgaW50ZXJmYWNlLikKU2lnbmVkLW9mZi1ieTogSm9o biBCcm9va3MgPGpvaG5AZmFzdHF1YWtlLmNvbT4KQWNrZWQtYnk6IENocmlzdGlhbiBLw7ZuaWcg PGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IEFsZXggRGV1Y2hlciA8YWxl eGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfcG93ZXJwbGF5LmMgfCAzICsrLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygr KSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9wb3dlcnBsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9w b3dlcnBsYXkuYwppbmRleCA3MmMwM2M3Li45M2ZmYjg1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcG93ZXJwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X3Bvd2VycGxheS5jCkBAIC0yMDksNyArMjA5LDggQEAgc3RhdGlj IHZvaWQgYW1kZ3B1X3BwX2xhdGVfZmluaSh2b2lkICpoYW5kbGUpCiAJaWYgKGFkZXYtPnBwX2Vu YWJsZWQgJiYgYWRldi0+cG0uZHBtX2VuYWJsZWQpCiAJCWFtZGdwdV9wbV9zeXNmc19maW5pKGFk ZXYpOwogCi0JYW1kX3Bvd2VycGxheV9kZXN0cm95KGFkZXYtPnBvd2VycGxheS5wcF9oYW5kbGUp OworCWlmIChhZGV2LT5wcF9lbmFibGVkKQorCQlhbWRfcG93ZXJwbGF5X2Rlc3Ryb3koYWRldi0+ cG93ZXJwbGF5LnBwX2hhbmRsZSk7CiB9CiAKIHN0YXRpYyBpbnQgYW1kZ3B1X3BwX3N1c3BlbmQo dm9pZCAqaGFuZGxlKQotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbAo=