From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: [PATCH] drm/amd/powerplay: move asic unrelated function to hwmgr.c. Date: Fri, 13 May 2016 14:36:35 -0400 Message-ID: <1463164596-4853-3-git-send-email-alexander.deucher@amd.com> References: <1463164596-4853-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: Received: from mail-io0-x231.google.com (mail-io0-x231.google.com [IPv6:2607:f8b0:4001:c06::231]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E9FB6E2FC for ; Fri, 13 May 2016 18:36:46 +0000 (UTC) Received: by mail-io0-x231.google.com with SMTP id d62so143471437iof.2 for ; Fri, 13 May 2016 11:36:46 -0700 (PDT) In-Reply-To: <1463164596-4853-1-git-send-email-alexander.deucher@amd.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: Alex Deucher , Rex Zhu List-Id: dri-devel@lists.freedesktop.org RnJvbTogUmV4IFpodSA8UmV4LlpodUBhbWQuY29tPgoKSXQncyBnZW5lcmljIGFuZCB1c2VkIGJ5 IG11bHRpcGxlIGFzaWNzLgoKU2lnbmVkLW9mZi1ieTogUmV4IFpodSA8UmV4LlpodUBhbWQuY29t PgpSZXZpZXdlZC1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgpT aWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvZmlqaV9od21nci5jICAgfCAz NyArLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3 bWdyL2h3bWdyLmMgICAgICAgIHwgMzggKysrKysrKysrKysrKysrKysrKysrKwogLi4uL2dwdS9k cm0vYW1kL3Bvd2VycGxheS9od21nci9wb2xhcmlzMTBfaHdtZ3IuYyAgfCAzNiAtLS0tLS0tLS0t LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaW5jL2h3bWdyLmggICAg ICAgICAgfCAgMiArLQogNCBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCA3MyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21n ci9maWppX2h3bWdyLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci9maWpp X2h3bWdyLmMKaW5kZXggYzk0ZjlmYS4uMzgyMjIzYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvZmlqaV9od21nci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvcG93ZXJwbGF5L2h3bWdyL2ZpamlfaHdtZ3IuYwpAQCAtMzU3Myw0NiArMzU3MywxMSBA QCBzdGF0aWMgaW50IGZpamlfZm9yY2VfZHBtX2hpZ2hlc3Qoc3RydWN0IHBwX2h3bWdyICpod21n cikKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgZmlqaV9hcHBseV9kYWxfbWluX3ZvbHRh Z2VfcmVxdWVzdChzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyKQotewotCXN0cnVjdCBwaG1fcHB0X3Yx X2luZm9ybWF0aW9uICp0YWJsZV9pbmZvID0KLQkJCShzdHJ1Y3QgcGhtX3BwdF92MV9pbmZvcm1h dGlvbiAqKWh3bWdyLT5wcHRhYmxlOwotCXN0cnVjdCBwaG1fY2xvY2tfdm9sdGFnZV9kZXBlbmRl bmN5X3RhYmxlICp0YWJsZSA9Ci0JCQkJdGFibGVfaW5mby0+dmRkY19kZXBfb25fZGFsX3B3cmw7 Ci0Jc3RydWN0IHBobV9wcHRfdjFfY2xvY2tfdm9sdGFnZV9kZXBlbmRlbmN5X3RhYmxlICp2ZGRj X3RhYmxlOwotCWVudW0gUFBfREFMX1BPV0VSTEVWRUwgZGFsX3Bvd2VyX2xldmVsID0gaHdtZ3It PmRhbF9wb3dlcl9sZXZlbDsKLQl1aW50MzJfdCByZXFfdmRkYyA9IDAsIHJlcV92b2x0LCBpOwot Ci0JaWYgKCF0YWJsZSAmJiAhKGRhbF9wb3dlcl9sZXZlbCA+PSBQUF9EQUxfUE9XRVJMRVZFTF9V TFRSQUxPVyAmJgotCQkJZGFsX3Bvd2VyX2xldmVsIDw9IFBQX0RBTF9QT1dFUkxFVkVMX1BFUkZP Uk1BTkNFKSkKLQkJcmV0dXJuOwotCi0JZm9yIChpPSAwOyBpIDwgdGFibGUtPmNvdW50OyBpKysp IHsKLQkJaWYgKGRhbF9wb3dlcl9sZXZlbCA9PSB0YWJsZS0+ZW50cmllc1tpXS5jbGspIHsKLQkJ CXJlcV92ZGRjID0gdGFibGUtPmVudHJpZXNbaV0udjsKLQkJCWJyZWFrOwotCQl9Ci0JfQotCi0J dmRkY190YWJsZSA9IHRhYmxlX2luZm8tPnZkZF9kZXBfb25fc2NsazsKLQlmb3IgKGk9IDA7IGkg PCB2ZGRjX3RhYmxlLT5jb3VudDsgaSsrKSB7Ci0JCWlmIChyZXFfdmRkYyA8PSB2ZGRjX3RhYmxl LT5lbnRyaWVzW2ldLnZkZGMpIHsKLQkJCXJlcV92b2x0ID0gKCgodWludDMyX3QpdmRkY190YWJs ZS0+ZW50cmllc1tpXS52ZGRjKSAqIFZPTFRBR0VfU0NBTEUpCi0JCQkJCTw8IFZERENfU0hJRlQ7 Ci0JCQlzbXVtX3NlbmRfbXNnX3RvX3NtY193aXRoX3BhcmFtZXRlcihod21nci0+c211bWdyLAot CQkJCQlQUFNNQ19NU0dfVmRkQ19SZXF1ZXN0LCByZXFfdm9sdCk7Ci0JCQlyZXR1cm47Ci0JCX0K LQl9Ci0JcHJpbnRrKEtFUk5fRVJSICJEQUwgcmVxdWVzdGVkIGxldmVsIGNhbiBub3QiCi0JCQki IGZvdW5kIGEgYXZhaWxhYmxlIHZvbHRhZ2UgaW4gVkREQyBEUE0gVGFibGUgXG4iKTsKLX0KLQog c3RhdGljIGludCBmaWppX3VwbG9hZF9kcG1sZXZlbF9lbmFibGVfbWFzayhzdHJ1Y3QgcHBfaHdt Z3IgKmh3bWdyKQogewogCXN0cnVjdCBmaWppX2h3bWdyICpkYXRhID0gKHN0cnVjdCBmaWppX2h3 bWdyICopKGh3bWdyLT5iYWNrZW5kKTsKIAotCWZpamlfYXBwbHlfZGFsX21pbl92b2x0YWdlX3Jl cXVlc3QoaHdtZ3IpOworCXBobV9hcHBseV9kYWxfbWluX3ZvbHRhZ2VfcmVxdWVzdChod21ncik7 CiAKIAlpZiAoIWRhdGEtPnNjbGtfZHBtX2tleV9kaXNhYmxlZCkgewogCQlpZiAoZGF0YS0+ZHBt X2xldmVsX2VuYWJsZV9tYXNrLnNjbGtfZHBtX2VuYWJsZV9tYXNrKQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvaHdtZ3IuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvcG93ZXJwbGF5L2h3bWdyL2h3bWdyLmMKaW5kZXggN2Q2OWVkNi4uMWM0ODkxNyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvaHdtZ3IuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci9od21nci5jCkBAIC0zMCw2ICsz MCw5IEBACiAjaW5jbHVkZSAicHBwY2llbGFuZXMuaCIKICNpbmNsdWRlICJwcF9kZWJ1Zy5oIgog I2luY2x1ZGUgInBwYXRvbWN0cmwuaCIKKyNpbmNsdWRlICJwcHNtYy5oIgorCisjZGVmaW5lIFZP TFRBR0VfU0NBTEUgICAgICAgICAgICAgICA0CiAKIGV4dGVybiBpbnQgY3pfaHdtZ3JfaW5pdChz dHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyKTsKIGV4dGVybiBpbnQgdG9uZ2FfaHdtZ3JfaW5pdChzdHJ1 Y3QgcHBfaHdtZ3IgKmh3bWdyKTsKQEAgLTU2NiwzICs1NjksMzggQEAgdWludDMyX3QgcGhtX2dl dF9sb3dlc3RfZW5hYmxlZF9sZXZlbChzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyLCB1aW50MzJfdCBt YXNrKQogCiAJcmV0dXJuIGxldmVsOwogfQorCit2b2lkIHBobV9hcHBseV9kYWxfbWluX3ZvbHRh Z2VfcmVxdWVzdChzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyKQoreworCXN0cnVjdCBwaG1fcHB0X3Yx X2luZm9ybWF0aW9uICp0YWJsZV9pbmZvID0KKwkJCShzdHJ1Y3QgcGhtX3BwdF92MV9pbmZvcm1h dGlvbiAqKWh3bWdyLT5wcHRhYmxlOworCXN0cnVjdCBwaG1fY2xvY2tfdm9sdGFnZV9kZXBlbmRl bmN5X3RhYmxlICp0YWJsZSA9CisJCQkJdGFibGVfaW5mby0+dmRkY19kZXBfb25fZGFsX3B3cmw7 CisJc3RydWN0IHBobV9wcHRfdjFfY2xvY2tfdm9sdGFnZV9kZXBlbmRlbmN5X3RhYmxlICp2ZGRj X3RhYmxlOworCWVudW0gUFBfREFMX1BPV0VSTEVWRUwgZGFsX3Bvd2VyX2xldmVsID0gaHdtZ3It PmRhbF9wb3dlcl9sZXZlbDsKKwl1aW50MzJfdCByZXFfdmRkYyA9IDAsIHJlcV92b2x0LCBpOwor CisJaWYgKCF0YWJsZSB8fCB0YWJsZS0+Y291bnQgPD0gMAorCQl8fCBkYWxfcG93ZXJfbGV2ZWwg PCBQUF9EQUxfUE9XRVJMRVZFTF9VTFRSQUxPVworCQl8fCBkYWxfcG93ZXJfbGV2ZWwgPiBQUF9E QUxfUE9XRVJMRVZFTF9QRVJGT1JNQU5DRSkKKwkJcmV0dXJuOworCisJZm9yIChpID0gMDsgaSA8 IHRhYmxlLT5jb3VudDsgaSsrKSB7CisJCWlmIChkYWxfcG93ZXJfbGV2ZWwgPT0gdGFibGUtPmVu dHJpZXNbaV0uY2xrKSB7CisJCQlyZXFfdmRkYyA9IHRhYmxlLT5lbnRyaWVzW2ldLnY7CisJCQli cmVhazsKKwkJfQorCX0KKworCXZkZGNfdGFibGUgPSB0YWJsZV9pbmZvLT52ZGRfZGVwX29uX3Nj bGs7CisJZm9yIChpID0gMDsgaSA8IHZkZGNfdGFibGUtPmNvdW50OyBpKyspIHsKKwkJaWYgKHJl cV92ZGRjIDw9IHZkZGNfdGFibGUtPmVudHJpZXNbaV0udmRkYykgeworCQkJcmVxX3ZvbHQgPSAo KCh1aW50MzJfdCl2ZGRjX3RhYmxlLT5lbnRyaWVzW2ldLnZkZGMpICogVk9MVEFHRV9TQ0FMRSk7 CisJCQlzbXVtX3NlbmRfbXNnX3RvX3NtY193aXRoX3BhcmFtZXRlcihod21nci0+c211bWdyLAor CQkJCQlQUFNNQ19NU0dfVmRkQ19SZXF1ZXN0LCByZXFfdm9sdCk7CisJCQlyZXR1cm47CisJCX0K Kwl9CisJcHJpbnRrKEtFUk5fRVJSICJEQUwgcmVxdWVzdGVkIGxldmVsIGNhbiBub3QiCisJCQki IGZvdW5kIGEgYXZhaWxhYmxlIHZvbHRhZ2UgaW4gVkREQyBEUE0gVGFibGUgXG4iKTsKK30KZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdyL3BvbGFyaXMxMF9o d21nci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvcG9sYXJpczEwX2h3 bWdyLmMKaW5kZXggNDExNWRkOC4uNGNlZjdhNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9wb3dlcnBsYXkvaHdtZ3IvcG9sYXJpczEwX2h3bWdyLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvcG9sYXJpczEwX2h3bWdyLmMKQEAgLTE4OSw0MiArMTg5 LDYgQEAgaW50IHBobV9nZXRfY3VycmVudF9wY2llX2xhbmVfbnVtYmVyKHN0cnVjdCBwcF9od21n ciAqaHdtZ3IpCiAJcmV0dXJuIGRlY29kZV9wY2llX2xhbmVfd2lkdGgobGlua193aWR0aCk7CiB9 CiAKLXZvaWQgcGhtX2FwcGx5X2RhbF9taW5fdm9sdGFnZV9yZXF1ZXN0KHN0cnVjdCBwcF9od21n ciAqaHdtZ3IpCi17Ci0Jc3RydWN0IHBobV9wcHRfdjFfaW5mb3JtYXRpb24gKnRhYmxlX2luZm8g PQotCQkJKHN0cnVjdCBwaG1fcHB0X3YxX2luZm9ybWF0aW9uICopaHdtZ3ItPnBwdGFibGU7Ci0J c3RydWN0IHBobV9jbG9ja192b2x0YWdlX2RlcGVuZGVuY3lfdGFibGUgKnRhYmxlID0KLQkJCQl0 YWJsZV9pbmZvLT52ZGRjX2RlcF9vbl9kYWxfcHdybDsKLQlzdHJ1Y3QgcGhtX3BwdF92MV9jbG9j a192b2x0YWdlX2RlcGVuZGVuY3lfdGFibGUgKnZkZGNfdGFibGU7Ci0JZW51bSBQUF9EQUxfUE9X RVJMRVZFTCBkYWxfcG93ZXJfbGV2ZWwgPSBod21nci0+ZGFsX3Bvd2VyX2xldmVsOwotCXVpbnQz Ml90IHJlcV92ZGRjID0gMCwgcmVxX3ZvbHQsIGk7Ci0KLQlpZiAoIXRhYmxlIHx8IHRhYmxlLWNv dW50IDw9IDAKLQkJfHwgZGFsX3Bvd2VyX2xldmVsIDwgUFBfREFMX1BPV0VSTEVWRUxfVUxUUkFM T1cKLQkJfHwgZGFsX3Bvd2VyX2xldmVsID4gUFBfREFMX1BPV0VSTEVWRUxfUEVSRk9STUFOQ0Up Ci0JCXJldHVybjsKLQotCWZvciAoaSA9IDA7IGkgPCB0YWJsZS0+Y291bnQ7IGkrKykgewotCQlp ZiAoZGFsX3Bvd2VyX2xldmVsID09IHRhYmxlLT5lbnRyaWVzW2ldLmNsaykgewotCQkJcmVxX3Zk ZGMgPSB0YWJsZS0+ZW50cmllc1tpXS52OwotCQkJYnJlYWs7Ci0JCX0KLQl9Ci0KLQl2ZGRjX3Rh YmxlID0gdGFibGVfaW5mby0+dmRkX2RlcF9vbl9zY2xrOwotCWZvciAoaSA9IDA7IGkgPCB2ZGRj X3RhYmxlLT5jb3VudDsgaSsrKSB7Ci0JCWlmIChyZXFfdmRkYyA8PSB2ZGRjX3RhYmxlLT5lbnRy aWVzW2ldLnZkZGMpIHsKLQkJCXJlcV92b2x0ID0gKCgodWludDMyX3QpdmRkY190YWJsZS0+ZW50 cmllc1tpXS52ZGRjKSAqIFZPTFRBR0VfU0NBTEUpCi0JCQkJCTw8IFZERENfU0hJRlQ7Ci0JCQlz bXVtX3NlbmRfbXNnX3RvX3NtY193aXRoX3BhcmFtZXRlcihod21nci0+c211bWdyLAotCQkJCQlQ UFNNQ19NU0dfVmRkQ19SZXF1ZXN0LCByZXFfdm9sdCk7Ci0JCQlyZXR1cm47Ci0JCX0KLQl9Ci0J cHJpbnRrKEtFUk5fRVJSICJEQUwgcmVxdWVzdGVkIGxldmVsIGNhbiBub3QiCi0JCQkiIGZvdW5k IGEgYXZhaWxhYmxlIHZvbHRhZ2UgaW4gVkREQyBEUE0gVGFibGUgXG4iKTsKLX0KLQogLyoqCiAq IEVuYWJsZSB2b2x0YWdlIGNvbnRyb2wKICoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvcG93ZXJwbGF5L2luYy9od21nci5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkv aW5jL2h3bWdyLmgKaW5kZXggZmQ0Y2U3YS4uMjhmNTcxNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FtZC9wb3dlcnBsYXkvaW5jL2h3bWdyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9wb3dlcnBsYXkvaW5jL2h3bWdyLmgKQEAgLTY3Myw3ICs2NzMsNyBAQCBleHRlcm4gaW50IHBo bV9nZXRfc2Nsa19mb3Jfdm9sdGFnZV9ldnYoc3RydWN0IHBwX2h3bWdyICpod21nciwgcGhtX3Bw dF92MV92b2x0YQogZXh0ZXJuIGludCBwaG1faW5pdGlhbGl6YV9keW5hbWljX3N0YXRlX2FkanVz dG1lbnRfcnVsZV9zZXR0aW5ncyhzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyKTsKIGV4dGVybiBpbnQg cGhtX2h3bWdyX2JhY2tlbmRfZmluaShzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyKTsKIGV4dGVybiB1 aW50MzJfdCBwaG1fZ2V0X2xvd2VzdF9lbmFibGVkX2xldmVsKHN0cnVjdCBwcF9od21nciAqaHdt Z3IsIHVpbnQzMl90IG1hc2spOwotCitleHRlcm4gdm9pZCBwaG1fYXBwbHlfZGFsX21pbl92b2x0 YWdlX3JlcXVlc3Qoc3RydWN0IHBwX2h3bWdyICpod21ncik7CiAKICNkZWZpbmUgUEhNX0VOVElS RV9SRUdJU1RFUl9NQVNLIDB4RkZGRkZGRkZVCiAKLS0gCjIuNS41CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK