From: Karol Herbst Subject: [PATCH 16/32] therm: Move the temp readout into nvkm_therm_update Date: Fri, 17 Nov 2017 01:04:20 +0100 Message-ID: <20171117000436.2432-17-karolherbst@gmail.com> References: <20171117000436.2432-1-karolherbst@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171117000436.2432-1-karolherbst-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org SXQgbWFrZXMgbW9yZSBzZW5zZSB0byByZWFkIG91dCB0aGUgdGVtcGVyYXR1cmUgaW4gdGhlIGFs YXJtLCBiZWNhdXNlIHdlCndhbnQgdG8gZG8gdmFyaW91cyB0aGluZ3Mgd2l0aCBpdDoKIDEuIGFk anVzdCB0aGUgZmFucwogMi4gbm90aWZ5IHRoZSBjbGsgc3ViZGV2IGFib3V0IHRoZSBjaGFuZ2Vk IHRlbXBlcmF0dXJlCgp2MjogbW92ZSBpbnRvIG52a21fdGhlcm1fdXBkYXRlCgpTaWduZWQtb2Zm LWJ5OiBLYXJvbCBIZXJic3QgPGthcm9saGVyYnN0QGdtYWlsLmNvbT4KLS0tCiBkcm0vbm91dmVh dS9udmttL3N1YmRldi90aGVybS9iYXNlLmMgfCAzNCArKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvdGhlcm0vYmFzZS5jIGIv ZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvdGhlcm0vYmFzZS5jCmluZGV4IDhlNWY2ZjdmLi4yNTNk YTE5OSAxMDA2NDQKLS0tIGEvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvdGhlcm0vYmFzZS5jCisr KyBiL2RybS9ub3V2ZWF1L252a20vc3ViZGV2L3RoZXJtL2Jhc2UuYwpAQCAtMzIsMTggKzMyLDEz IEBAIG52a21fdGhlcm1fdGVtcF9nZXQoc3RydWN0IG52a21fdGhlcm0gKnRoZXJtLCBpbnQgKnZh bCkKIH0KIAogc3RhdGljIGludAotbnZrbV90aGVybV91cGRhdGVfdHJpcChzdHJ1Y3QgbnZrbV90 aGVybSAqdGhlcm0pCitudmttX3RoZXJtX3VwZGF0ZV90cmlwKHN0cnVjdCBudmttX3RoZXJtICp0 aGVybSwgaW50IHRlbXApCiB7Ci0JaW50IHRlbXAsIHJldDsKIAlzdHJ1Y3QgbnZiaW9zX3RoZXJt X3RyaXBfcG9pbnQgKnRyaXAgPSB0aGVybS0+ZmFuLT5iaW9zLnRyaXAsCiAJCQkJICAgICAgICpj dXJfdHJpcCA9IE5VTEwsCiAJCQkJICAgICAgICpsYXN0X3RyaXAgPSB0aGVybS0+bGFzdF90cmlw OwogCXUxNiBkdXR5LCBpOwogCi0JcmV0ID0gdGhlcm0tPmZ1bmMtPnRlbXBfZ2V0KHRoZXJtLCAm dGVtcCk7Ci0JaWYgKHJldCA8IDApCi0JCXJldHVybiByZXQ7Ci0KIAkvKiBsb29rIGZvciB0aGUg dHJpcCBwb2ludCBjb3JyZXNwb25kaW5nIHRvIHRoZSBjdXJyZW50IHRlbXBlcmF0dXJlICovCiAJ Y3VyX3RyaXAgPSBOVUxMOwogCWZvciAoaSA9IDA7IGkgPCB0aGVybS0+ZmFuLT5iaW9zLm5yX2Zh bl90cmlwOyBpKyspIHsKQEAgLTY5LDE1ICs2NCwxMCBAQCBudmttX3RoZXJtX3VwZGF0ZV90cmlw KHN0cnVjdCBudmttX3RoZXJtICp0aGVybSkKIAogc3RhdGljIGludAogbnZrbV90aGVybV9jb21w dXRlX2xpbmVhcl9kdXR5KHN0cnVjdCBudmttX3RoZXJtICp0aGVybSwgdTggbGluZWFyX21pbl90 ZW1wLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHU4IGxpbmVhcl9tYXhfdGVtcCkK KwkJCSAgICAgICB1OCBsaW5lYXJfbWF4X3RlbXAsIGludCB0ZW1wKQogewotCWludCB0ZW1wLCBy ZXQ7CiAJdTE2IGR1dHk7CiAKLQlyZXQgPSB0aGVybS0+ZnVuYy0+dGVtcF9nZXQodGhlcm0sICZ0 ZW1wKTsKLQlpZiAocmV0IDwgMCkKLQkJcmV0dXJuIHJldDsKLQogCS8qIGhhbmRsZSB0aGUgbm9u LWxpbmVhciBwYXJ0IGZpcnN0ICovCiAJaWYgKHRlbXAgPCBsaW5lYXJfbWluX3RlbXApCiAJCXJl dHVybiB0aGVybS0+ZmFuLT5iaW9zLm1pbl9kdXR5OwpAQCAtOTMsMTggKzgzLDE4IEBAIG52a21f dGhlcm1fY29tcHV0ZV9saW5lYXJfZHV0eShzdHJ1Y3QgbnZrbV90aGVybSAqdGhlcm0sIHU4IGxp bmVhcl9taW5fdGVtcCwKIH0KIAogc3RhdGljIGludAotbnZrbV90aGVybV91cGRhdGVfbGluZWFy KHN0cnVjdCBudmttX3RoZXJtICp0aGVybSkKK252a21fdGhlcm1fdXBkYXRlX2xpbmVhcihzdHJ1 Y3QgbnZrbV90aGVybSAqdGhlcm0sIGludCB0ZW1wKQogewogCXU4ICBtaW4gPSB0aGVybS0+ZmFu LT5iaW9zLmxpbmVhcl9taW5fdGVtcDsKIAl1OCAgbWF4ID0gdGhlcm0tPmZhbi0+Ymlvcy5saW5l YXJfbWF4X3RlbXA7Ci0JcmV0dXJuIG52a21fdGhlcm1fY29tcHV0ZV9saW5lYXJfZHV0eSh0aGVy bSwgbWluLCBtYXgpOworCXJldHVybiBudmttX3RoZXJtX2NvbXB1dGVfbGluZWFyX2R1dHkodGhl cm0sIG1pbiwgbWF4LCB0ZW1wKTsKIH0KIAogc3RhdGljIGludAotbnZrbV90aGVybV91cGRhdGVf bGluZWFyX2ZhbGxiYWNrKHN0cnVjdCBudmttX3RoZXJtICp0aGVybSkKK252a21fdGhlcm1fdXBk YXRlX2xpbmVhcl9mYWxsYmFjayhzdHJ1Y3QgbnZrbV90aGVybSAqdGhlcm0sIGludCB0ZW1wKQog ewogCXU4IG1heCA9IHRoZXJtLT5iaW9zX3NlbnNvci50aHJzX2Zhbl9ib29zdC50ZW1wOwotCXJl dHVybiBudmttX3RoZXJtX2NvbXB1dGVfbGluZWFyX2R1dHkodGhlcm0sIDMwLCBtYXgpOworCXJl dHVybiBudmttX3RoZXJtX2NvbXB1dGVfbGluZWFyX2R1dHkodGhlcm0sIDMwLCBtYXgsIHRlbXAp OwogfQogCiBzdGF0aWMgdm9pZApAQCAtMTE2LDYgKzEwNiwxMCBAQCBudmttX3RoZXJtX3VwZGF0 ZShzdHJ1Y3QgbnZrbV90aGVybSAqdGhlcm0sIGludCBtb2RlKQogCWJvb2wgaW1tZCA9IHRydWU7 CiAJYm9vbCBwb2xsID0gdHJ1ZTsKIAlpbnQgZHV0eSA9IC0xOworCWludCB0ZW1wOworCisJaWYg KG52a21fdGhlcm1fdGVtcF9nZXQodGhlcm0sICZ0ZW1wKSkKKwkJcmV0dXJuOwogCiAJc3Bpbl9s b2NrX2lycXNhdmUoJnRoZXJtLT5sb2NrLCBmbGFncyk7CiAJaWYgKG1vZGUgPCAwKQpAQCAtMTMz LDE3ICsxMjcsMTcgQEAgbnZrbV90aGVybV91cGRhdGUoc3RydWN0IG52a21fdGhlcm0gKnRoZXJt LCBpbnQgbW9kZSkKIAljYXNlIE5WS01fVEhFUk1fQ1RSTF9BVVRPOgogCQlzd2l0Y2godGhlcm0t PmZhbi0+Ymlvcy5mYW5fbW9kZSkgewogCQljYXNlIE5WQklPU19USEVSTV9GQU5fVFJJUDoKLQkJ CWR1dHkgPSBudmttX3RoZXJtX3VwZGF0ZV90cmlwKHRoZXJtKTsKKwkJCWR1dHkgPSBudmttX3Ro ZXJtX3VwZGF0ZV90cmlwKHRoZXJtLCB0ZW1wKTsKIAkJCWJyZWFrOwogCQljYXNlIE5WQklPU19U SEVSTV9GQU5fTElORUFSOgotCQkJZHV0eSA9IG52a21fdGhlcm1fdXBkYXRlX2xpbmVhcih0aGVy bSk7CisJCQlkdXR5ID0gbnZrbV90aGVybV91cGRhdGVfbGluZWFyKHRoZXJtLCB0ZW1wKTsKIAkJ CWJyZWFrOwogCQljYXNlIE5WQklPU19USEVSTV9GQU5fT1RIRVI6CiAJCQlpZiAodGhlcm0tPmNz dGF0ZSkKIAkJCQlkdXR5ID0gdGhlcm0tPmNzdGF0ZTsKIAkJCWVsc2UKLQkJCQlkdXR5ID0gbnZr bV90aGVybV91cGRhdGVfbGluZWFyX2ZhbGxiYWNrKHRoZXJtKTsKLQkJCXBvbGwgPSBmYWxzZTsK KwkJCQlkdXR5ID0gbnZrbV90aGVybV91cGRhdGVfbGluZWFyX2ZhbGxiYWNrKHRoZXJtLAorCQkJ CQkJCQkJIHRlbXApOwogCQkJYnJlYWs7CiAJCX0KIAkJaW1tZCA9IGZhbHNlOwotLSAKMi4xNS4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOb3V2ZWF1 IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZlYXUK