From: Tom St Denis Subject: [PATCH 3/3] drm/amd/amdgpu: Tidy up cz_dpm.c Date: Thu, 25 Aug 2016 13:10:10 -0400 Message-ID: <20160825171010.7121-4-tom.stdenis@amd.com> References: <20160825171010.7121-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160825171010.7121-1-tom.stdenis-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: Tom St Denis VmFyaW91cyBtaW5vciBmb3JtYXR0aW5nIGNoYW5nZXMuCgpTaWduZWQtb2ZmLWJ5OiBUb20gU3Qg RGVuaXMgPHRvbS5zdGRlbmlzQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvY3pfZHBtLmMgfCAzMSArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY3pfZHBtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9jel9kcG0uYwppbmRleCBkOTc2MDQzODY3NjYuLjFlNjljMjgzOTJiMyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY3pfZHBtLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvY3pfZHBtLmMKQEAgLTY3OCwxNyArNjc4LDEyIEBAIHN0YXRpYyB2 b2lkIGN6X3Jlc2V0X2FwX21hc2soc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJc3RydWN0 IGN6X3Bvd2VyX2luZm8gKnBpID0gY3pfZ2V0X3BpKGFkZXYpOwogCiAJcGktPmFjdGl2ZV9wcm9j ZXNzX21hc2sgPSAwOwotCiB9CiAKIHN0YXRpYyBpbnQgY3pfZHBtX2Rvd25sb2FkX3BwdGFibGVf ZnJvbV9zbXUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJCQkJdm9pZCAqKnRhYmxl KQogewotCWludCByZXQgPSAwOwotCi0JcmV0ID0gY3pfc211X2Rvd25sb2FkX3BwdGFibGUoYWRl diwgdGFibGUpOwotCi0JcmV0dXJuIHJldDsKKwlyZXR1cm4gY3pfc211X2Rvd25sb2FkX3BwdGFi bGUoYWRldiwgdGFibGUpOwogfQogCiBzdGF0aWMgaW50IGN6X2RwbV91cGxvYWRfcHB0YWJsZV90 b19zbXUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCkBAIC04MjgsOSArODIzLDkgQEAgc3Rh dGljIHZvaWQgY3pfaW5pdF9zY2xrX2xpbWl0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQog CXBpLT5zY2xrX2RwbS5oYXJkX21pbl9jbGsgPSAwOwogCWN6X3NlbmRfbXNnX3RvX3NtYyhhZGV2 LCBQUFNNQ19NU0dfR2V0TWF4U2Nsa0xldmVsKTsKIAlsZXZlbCA9IGN6X2dldF9hcmd1bWVudChh ZGV2KTsKLQlpZiAobGV2ZWwgPCB0YWJsZS0+Y291bnQpCisJaWYgKGxldmVsIDwgdGFibGUtPmNv dW50KSB7CiAJCWNsb2NrID0gdGFibGUtPmVudHJpZXNbbGV2ZWxdLmNsazsKLQllbHNlIHsKKwl9 IGVsc2UgewogCQlEUk1fRVJST1IoIkludmFsaWQgU0xDSyBWb2x0YWdlIERlcGVuZGVuY3kgdGFi bGUgZW50cnkuXG4iKTsKIAkJY2xvY2sgPSB0YWJsZS0+ZW50cmllc1t0YWJsZS0+Y291bnQgLSAx XS5jbGs7CiAJfQpAQCAtODU2LDkgKzg1MSw5IEBAIHN0YXRpYyB2b2lkIGN6X2luaXRfdXZkX2xp bWl0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXBpLT51dmRfZHBtLmhhcmRfbWluX2Ns ayA9IDA7CiAJY3pfc2VuZF9tc2dfdG9fc21jKGFkZXYsIFBQU01DX01TR19HZXRNYXhVdmRMZXZl bCk7CiAJbGV2ZWwgPSBjel9nZXRfYXJndW1lbnQoYWRldik7Ci0JaWYgKGxldmVsIDwgdGFibGUt PmNvdW50KQorCWlmIChsZXZlbCA8IHRhYmxlLT5jb3VudCkgewogCQljbG9jayA9IHRhYmxlLT5l bnRyaWVzW2xldmVsXS52Y2xrOwotCWVsc2UgeworCX0gZWxzZSB7CiAJCURSTV9FUlJPUigiSW52 YWxpZCBVVkQgVm9sdGFnZSBEZXBlbmRlbmN5IHRhYmxlIGVudHJ5LlxuIik7CiAJCWNsb2NrID0g dGFibGUtPmVudHJpZXNbdGFibGUtPmNvdW50IC0gMV0udmNsazsKIAl9CkBAIC04ODQsOSArODc5 LDkgQEAgc3RhdGljIHZvaWQgY3pfaW5pdF92Y2VfbGltaXQoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpCiAJcGktPnZjZV9kcG0uaGFyZF9taW5fY2xrID0gdGFibGUtPmVudHJpZXNbMF0uZWNj bGs7CiAJY3pfc2VuZF9tc2dfdG9fc21jKGFkZXYsIFBQU01DX01TR19HZXRNYXhFY2xrTGV2ZWwp OwogCWxldmVsID0gY3pfZ2V0X2FyZ3VtZW50KGFkZXYpOwotCWlmIChsZXZlbCA8IHRhYmxlLT5j b3VudCkKKwlpZiAobGV2ZWwgPCB0YWJsZS0+Y291bnQpIHsKIAkJY2xvY2sgPSB0YWJsZS0+ZW50 cmllc1tsZXZlbF0uZWNjbGs7Ci0JZWxzZSB7CisJfSBlbHNlIHsKIAkJLyogZnV0dXJlIEJJT1Mg d291bGQgZml4IHRoaXMgZXJyb3IgKi8KIAkJRFJNX0VSUk9SKCJJbnZhbGlkIFZDRSBWb2x0YWdl IERlcGVuZGVuY3kgdGFibGUgZW50cnkuXG4iKTsKIAkJY2xvY2sgPSB0YWJsZS0+ZW50cmllc1t0 YWJsZS0+Y291bnQgLSAxXS5lY2NsazsKQEAgLTkxMyw5ICs5MDgsOSBAQCBzdGF0aWMgdm9pZCBj el9pbml0X2FjcF9saW1pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlwaS0+YWNwX2Rw bS5oYXJkX21pbl9jbGsgPSAwOwogCWN6X3NlbmRfbXNnX3RvX3NtYyhhZGV2LCBQUFNNQ19NU0df R2V0TWF4QWNsa0xldmVsKTsKIAlsZXZlbCA9IGN6X2dldF9hcmd1bWVudChhZGV2KTsKLQlpZiAo bGV2ZWwgPCB0YWJsZS0+Y291bnQpCisJaWYgKGxldmVsIDwgdGFibGUtPmNvdW50KSB7CiAJCWNs b2NrID0gdGFibGUtPmVudHJpZXNbbGV2ZWxdLmNsazsKLQllbHNlIHsKKwl9IGVsc2UgewogCQlE Uk1fRVJST1IoIkludmFsaWQgQUNQIFZvbHRhZ2UgRGVwZW5kZW5jeSB0YWJsZSBlbnRyeS5cbiIp OwogCQljbG9jayA9IHRhYmxlLT5lbnRyaWVzW3RhYmxlLT5jb3VudCAtIDFdLmNsazsKIAl9CkBA IC05NDAsNyArOTM1LDYgQEAgc3RhdGljIHZvaWQgY3pfaW5pdF9zY2xrX3RocmVzaG9sZChzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlzdHJ1Y3QgY3pfcG93ZXJfaW5mbyAqcGkgPSBjel9n ZXRfcGkoYWRldik7CiAKIAlwaS0+bG93X3NjbGtfaW50ZXJydXB0X3RocmVzaG9sZCA9IDA7Ci0K IH0KIAogc3RhdGljIHZvaWQgY3pfZHBtX3NldHVwX2FzaWMoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpCkBAIC0xMjEzLDcgKzEyMDcsNyBAQCBzdGF0aWMgaW50IGN6X2VuYWJsZV9kaWR0KHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBib29sIGVuYWJsZSkKIAlpbnQgcmV0OwogCiAJaWYg KHBpLT5jYXBzX3NxX3JhbXBpbmcgfHwgcGktPmNhcHNfZGJfcmFtcGluZyB8fAotCQkJcGktPmNh cHNfdGRfcmFtcGluZyB8fCBwaS0+Y2Fwc190Y3BfcmFtcGluZykgeworCSAgICBwaS0+Y2Fwc190 ZF9yYW1waW5nIHx8IHBpLT5jYXBzX3RjcF9yYW1waW5nKSB7CiAJCWlmIChhZGV2LT5nZnguZ2Z4 X2N1cnJlbnRfc3RhdHVzICE9IEFNREdQVV9HRlhfU0FGRV9NT0RFKSB7CiAJCQlyZXQgPSBjel9k aXNhYmxlX2NncGcoYWRldik7CiAJCQlpZiAocmV0KSB7CkBAIC0xMjg3LDcgKzEyODEsNyBAQCBz dGF0aWMgdm9pZCBjel9hcHBseV9zdGF0ZV9hZGp1c3RfcnVsZXMoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsCiAJcHMtPmZvcmNlX2hpZ2ggPSBmYWxzZTsKIAlwcy0+bmVlZF9kZnNfYnlwYXNz ID0gdHJ1ZTsKIAlwaS0+dmlkZW9fc3RhcnQgPSBuZXdfcnBzLT5kY2xrIHx8IG5ld19ycHMtPnZj bGsgfHwKLQkJCQluZXdfcnBzLT5ldmNsayB8fCBuZXdfcnBzLT5lY2NsazsKKwkJCSAgbmV3X3Jw cy0+ZXZjbGsgfHwgbmV3X3Jwcy0+ZWNjbGs7CiAKIAlpZiAoKG5ld19ycHMtPmNsYXNzICYgQVRP TV9QUExJQl9DTEFTU0lGSUNBVElPTl9VSV9NQVNLKSA9PQogCQkJQVRPTV9QUExJQl9DTEFTU0lG SUNBVElPTl9VSV9CQVRURVJZKQpAQCAtMTM0NSw3ICsxMzM5LDYgQEAgc3RhdGljIGludCBjel9k cG1fZW5hYmxlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCX0KIAogCWN6X3Jlc2V0X2Fj cF9ib290X2xldmVsKGFkZXYpOwotCiAJY3pfdXBkYXRlX2N1cnJlbnRfcHMoYWRldiwgYWRldi0+ cG0uZHBtLmJvb3RfcHMpOwogCiAJcmV0dXJuIDA7CkBAIC0xNjc1LDcgKzE2NjgsNiBAQCBzdGF0 aWMgdm9pZCBjel9kcG1fcG9zdF9zZXRfcG93ZXJfc3RhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpCiAJc3RydWN0IGFtZGdwdV9wcyAqcHMgPSAmcGktPnJlcXVlc3RlZF9ycHM7CiAKIAlj el91cGRhdGVfY3VycmVudF9wcyhhZGV2LCBwcyk7Ci0KIH0KIAogc3RhdGljIGludCBjel9kcG1f Zm9yY2VfaGlnaGVzdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKQEAgLTIyMDcsNyArMjE5 OSw2IEBAIHN0YXRpYyBpbnQgY3pfdXBkYXRlX3ZjZV9kcG0oc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpCiAJLyogU3RhYmxlIFBzdGF0ZSBpcyBlbmFibGVkIGFuZCB3ZSBuZWVkIHRvIHNldCB0 aGUgVkNFIERQTSB0byBoaWdoZXN0IGxldmVsICovCiAJaWYgKHBpLT5jYXBzX3N0YWJsZV9wb3dl cl9zdGF0ZSkgewogCQlwaS0+dmNlX2RwbS5oYXJkX21pbl9jbGsgPSB0YWJsZS0+ZW50cmllc1t0 YWJsZS0+Y291bnQtMV0uZWNjbGs7Ci0KIAl9IGVsc2UgeyAvKiBub24tc3RhYmxlIHAtc3RhdGUg Y2FzZXMuIHdpdGhvdXQgdmNlLkFyYml0ZXIuRWNjbGtIYXJkTWluICovCiAJCS8qIGxlYXZlIGl0 IGFzIHNldCBieSB1c2VyICovCiAJCS8qcGktPnZjZV9kcG0uaGFyZF9taW5fY2xrID0gdGFibGUt PmVudHJpZXNbMF0uZWNjbGs7Ki8KLS0gCjIuOS4yCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2FtZC1nZngK