From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Deucher <alexdeucher@gmail.com>
Subject: [PATCH] drm/amdgpu: properly clean up runtime pm
Date: Fri,  3 Jun 2016 18:23:09 -0400
Message-ID: <1464992589-17447-1-git-send-email-alexander.deucher@amd.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Received: from mail-io0-x242.google.com (mail-io0-x242.google.com
 [IPv6:2607:f8b0:4001:c06::242])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 77DBE6E5A1
 for <dri-devel@lists.freedesktop.org>; Fri,  3 Jun 2016 22:23:17 +0000 (UTC)
Received: by mail-io0-x242.google.com with SMTP id k19so12538649ioi.2
 for <dri-devel@lists.freedesktop.org>; Fri, 03 Jun 2016 15:23:17 -0700 (PDT)
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: Alex Deucher <alexander.deucher@amd.com>
List-Id: dri-devel@lists.freedesktop.org

V2FzIG1pc3NpbmcgdGhlIGNhbGxzIHRvIGZpbmkuCgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNo
ZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9h
bWRncHUvYW1kZ3B1X2RldmljZS5jIHwgMzEgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t
CiAxIGZpbGUgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jIGIvZHJp
dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCmluZGV4IDk2NGYzMTQuLmM3
ODU3OWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZp
Y2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKQEAg
LTE1MDIsMTcgKzE1MDIsMjAgQEAgaW50IGFtZGdwdV9kZXZpY2VfaW5pdChzdHJ1Y3QgYW1kZ3B1
X2RldmljZSAqYWRldiwKIAkJdmdhX3N3aXRjaGVyb29faW5pdF9kb21haW5fcG1fb3BzKGFkZXYt
PmRldiwgJmFkZXYtPnZnYV9wbV9kb21haW4pOwogCiAJLyogUmVhZCBCSU9TICovCi0JaWYgKCFh
bWRncHVfZ2V0X2Jpb3MoYWRldikpCi0JCXJldHVybiAtRUlOVkFMOworCWlmICghYW1kZ3B1X2dl
dF9iaW9zKGFkZXYpKSB7CisJCXIgPSAtRUlOVkFMOworCQlnb3RvIGZhaWxlZDsKKwl9CiAJLyog
TXVzdCBiZSBhbiBBVE9NQklPUyAqLwogCWlmICghYWRldi0+aXNfYXRvbV9iaW9zKSB7CiAJCWRl
dl9lcnIoYWRldi0+ZGV2LCAiRXhwZWN0aW5nIGF0b21iaW9zIGZvciBHUFVcbiIpOwotCQlyZXR1
cm4gLUVJTlZBTDsKKwkJciA9IC1FSU5WQUw7CisJCWdvdG8gZmFpbGVkOwogCX0KIAlyID0gYW1k
Z3B1X2F0b21iaW9zX2luaXQoYWRldik7CiAJaWYgKHIpIHsKIAkJZGV2X2VycihhZGV2LT5kZXYs
ICJhbWRncHVfYXRvbWJpb3NfaW5pdCBmYWlsZWRcbiIpOwotCQlyZXR1cm4gcjsKKwkJZ290byBm
YWlsZWQ7CiAJfQogCiAJLyogU2VlIGlmIHRoZSBhc2ljIHN1cHBvcnRzIFNSLUlPViAqLwpAQCAt
MTUyMyw3ICsxNTI2LDggQEAgaW50IGFtZGdwdV9kZXZpY2VfaW5pdChzdHJ1Y3QgYW1kZ3B1X2Rl
dmljZSAqYWRldiwKIAlpZiAoIWFtZGdwdV9jYXJkX3Bvc3RlZChhZGV2KSkgewogCQlpZiAoIWFk
ZXYtPmJpb3MpIHsKIAkJCWRldl9lcnIoYWRldi0+ZGV2LCAiQ2FyZCBub3QgcG9zdGVkIGFuZCBu
byBCSU9TIC0gaWdub3JpbmdcbiIpOwotCQkJcmV0dXJuIC1FSU5WQUw7CisJCQlyID0gLUVJTlZB
TDsKKwkJCWdvdG8gZmFpbGVkOwogCQl9CiAJCURSTV9JTkZPKCJHUFUgbm90IHBvc3RlZC4gcG9z
dGluZyBub3cuLi5cbiIpOwogCQlhbWRncHVfYXRvbV9hc2ljX2luaXQoYWRldi0+bW9kZV9pbmZv
LmF0b21fY29udGV4dCk7CkBAIC0xNTMzLDcgKzE1MzcsNyBAQCBpbnQgYW1kZ3B1X2RldmljZV9p
bml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCXIgPSBhbWRncHVfYXRvbWJpb3NfZ2V0
X2Nsb2NrX2luZm8oYWRldik7CiAJaWYgKHIpIHsKIAkJZGV2X2VycihhZGV2LT5kZXYsICJhbWRn
cHVfYXRvbWJpb3NfZ2V0X2Nsb2NrX2luZm8gZmFpbGVkXG4iKTsKLQkJcmV0dXJuIHI7CisJCWdv
dG8gZmFpbGVkOwogCX0KIAkvKiBpbml0IGkyYyBidXNlcyAqLwogCWFtZGdwdV9hdG9tYmlvc19p
MmNfaW5pdChhZGV2KTsKQEAgLTE1NDIsNyArMTU0Niw3IEBAIGludCBhbWRncHVfZGV2aWNlX2lu
aXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJciA9IGFtZGdwdV9mZW5jZV9kcml2ZXJf
aW5pdChhZGV2KTsKIAlpZiAocikgewogCQlkZXZfZXJyKGFkZXYtPmRldiwgImFtZGdwdV9mZW5j
ZV9kcml2ZXJfaW5pdCBmYWlsZWRcbiIpOwotCQlyZXR1cm4gcjsKKwkJZ290byBmYWlsZWQ7CiAJ
fQogCiAJLyogaW5pdCB0aGUgbW9kZSBjb25maWcgKi8KQEAgLTE1NTIsNyArMTU1Niw3IEBAIGlu
dCBhbWRncHVfZGV2aWNlX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJaWYgKHIp
IHsKIAkJZGV2X2VycihhZGV2LT5kZXYsICJhbWRncHVfaW5pdCBmYWlsZWRcbiIpOwogCQlhbWRn
cHVfZmluaShhZGV2KTsKLQkJcmV0dXJuIHI7CisJCWdvdG8gZmFpbGVkOwogCX0KIAogCWFkZXYt
PmFjY2VsX3dvcmtpbmcgPSB0cnVlOwpAQCAtMTU2Miw3ICsxNTY2LDcgQEAgaW50IGFtZGdwdV9k
ZXZpY2VfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlyID0gYW1kZ3B1X2liX3Bv
b2xfaW5pdChhZGV2KTsKIAlpZiAocikgewogCQlkZXZfZXJyKGFkZXYtPmRldiwgIklCIGluaXRp
YWxpemF0aW9uIGZhaWxlZCAoJWQpLlxuIiwgcik7Ci0JCXJldHVybiByOworCQlnb3RvIGZhaWxl
ZDsKIAl9CiAKIAlyID0gYW1kZ3B1X2liX3JpbmdfdGVzdHMoYWRldik7CkBAIC0xNjA0LDEwICsx
NjA4LDE1IEBAIGludCBhbWRncHVfZGV2aWNlX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk
ZXYsCiAJciA9IGFtZGdwdV9sYXRlX2luaXQoYWRldik7CiAJaWYgKHIpIHsKIAkJZGV2X2Vycihh
ZGV2LT5kZXYsICJhbWRncHVfbGF0ZV9pbml0IGZhaWxlZFxuIik7Ci0JCXJldHVybiByOworCQln
b3RvIGZhaWxlZDsKIAl9CiAKIAlyZXR1cm4gMDsKKworZmFpbGVkOgorCWlmIChydW50aW1lKQor
CQl2Z2Ffc3dpdGNoZXJvb19maW5pX2RvbWFpbl9wbV9vcHMoYWRldi0+ZGV2KTsKKwlyZXR1cm4g
cjsKIH0KIAogc3RhdGljIHZvaWQgYW1kZ3B1X2RlYnVnZnNfcmVtb3ZlX2ZpbGVzKHN0cnVjdCBh
bWRncHVfZGV2aWNlICphZGV2KTsKQEAgLTE2NDEsNiArMTY1MCw4IEBAIHZvaWQgYW1kZ3B1X2Rl
dmljZV9maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWtmcmVlKGFkZXYtPmJpb3Mp
OwogCWFkZXYtPmJpb3MgPSBOVUxMOwogCXZnYV9zd2l0Y2hlcm9vX3VucmVnaXN0ZXJfY2xpZW50
KGFkZXYtPnBkZXYpOworCWlmIChhZGV2LT5mbGFncyAmIEFNRF9JU19QWCkKKwkJdmdhX3N3aXRj
aGVyb29fZmluaV9kb21haW5fcG1fb3BzKGFkZXYtPmRldik7CiAJdmdhX2NsaWVudF9yZWdpc3Rl
cihhZGV2LT5wZGV2LCBOVUxMLCBOVUxMLCBOVUxMKTsKIAlpZiAoYWRldi0+cmlvX21lbSkKIAkJ
cGNpX2lvdW5tYXAoYWRldi0+cGRldiwgYWRldi0+cmlvX21lbSk7Ci0tIAoyLjUuNQoKX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp
bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==