From: Karol Herbst Subject: [PATCH 08/32] clk: Rename nvkm_clk.states to pstates Date: Fri, 17 Nov 2017 01:04:12 +0100 Message-ID: <20171117000436.2432-9-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 RnJvbTogS2Fyb2wgSGVyYnN0IDxraGVyYnN0QHJlZGhhdC5jb20+CgpUaG9zZSBhcmUgcHN0YXRl cywgc28gY2FsbCB0aGVtIHRoYXQgd2F5LgoKU2lnbmVkLW9mZi1ieTogS2Fyb2wgSGVyYnN0IDxr aGVyYnN0QHJlZGhhdC5jb20+Ci0tLQogZHJtL25vdXZlYXUvaW5jbHVkZS9udmttL3N1YmRldi9j bGsuaCB8ICA0ICsrLS0KIGRybS9ub3V2ZWF1L252a20vZW5naW5lL2RldmljZS9jdHJsLmMgfCAg NiArKystLS0KIGRybS9ub3V2ZWF1L252a20vc3ViZGV2L2Nsay9iYXNlLmMgICAgfCAyNiArKysr KysrKysrKysrLS0tLS0tLS0tLS0tLQogZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvcG11L2drMjBh LmMgICB8ICA1ICsrKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDIwIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RybS9ub3V2ZWF1L2luY2x1ZGUvbnZrbS9zdWJkZXYv Y2xrLmggYi9kcm0vbm91dmVhdS9pbmNsdWRlL252a20vc3ViZGV2L2Nsay5oCmluZGV4IGRjYzkz OTUwLi4yZjMyNjU1NCAxMDA2NDQKLS0tIGEvZHJtL25vdXZlYXUvaW5jbHVkZS9udmttL3N1YmRl di9jbGsuaAorKysgYi9kcm0vbm91dmVhdS9pbmNsdWRlL252a20vc3ViZGV2L2Nsay5oCkBAIC04 OCw4ICs4OCw4IEBAIHN0cnVjdCBudmttX2NsayB7CiAJY29uc3Qgc3RydWN0IG52a21fZG9tYWlu ICpkb21haW5zOwogCXN0cnVjdCBudmttX3BzdGF0ZSBic3RhdGU7CiAKLQlzdHJ1Y3QgbGlzdF9o ZWFkIHN0YXRlczsKLQlpbnQgc3RhdGVfbnI7CisJc3RydWN0IGxpc3RfaGVhZCBwc3RhdGVzOwor CWludCBwc3RhdGVzX2NudDsKIAogCXN0cnVjdCB3b3JrX3N0cnVjdCB3b3JrOwogCXdhaXRfcXVl dWVfaGVhZF90IHdhaXQ7CmRpZmYgLS1naXQgYS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9kZXZp Y2UvY3RybC5jIGIvZHJtL25vdXZlYXUvbnZrbS9lbmdpbmUvZGV2aWNlL2N0cmwuYwppbmRleCBl MDc5NDhlNi4uMjc5ZTQ0MmUgMTAwNjQ0Ci0tLSBhL2RybS9ub3V2ZWF1L252a20vZW5naW5lL2Rl dmljZS9jdHJsLmMKKysrIGIvZHJtL25vdXZlYXUvbnZrbS9lbmdpbmUvZGV2aWNlL2N0cmwuYwpA QCAtNDgsNyArNDgsNyBAQCBudmttX2NvbnRyb2xfbXRoZF9wc3RhdGVfaW5mbyhzdHJ1Y3QgbnZr bV9jb250cm9sICpjdHJsLCB2b2lkICpkYXRhLCB1MzIgc2l6ZSkKIAkJcmV0dXJuIHJldDsKIAog CWlmIChjbGspIHsKLQkJYXJncy0+djAuY291bnQgPSBjbGstPnN0YXRlX25yOworCQlhcmdzLT52 MC5jb3VudCA9IGNsay0+cHN0YXRlc19jbnQ7CiAJCWFyZ3MtPnYwLnVzdGF0ZV9hYyA9IGNsay0+ dXN0YXRlX2FjOwogCQlhcmdzLT52MC51c3RhdGVfZGMgPSBjbGstPnVzdGF0ZV9kYzsKIAkJYXJn cy0+djAucHdyc3JjID0gY2xrLT5wd3JzcmM7CkBAIC04Nyw3ICs4Nyw3IEBAIG52a21fY29udHJv bF9tdGhkX3BzdGF0ZV9hdHRyKHN0cnVjdCBudmttX2NvbnRyb2wgKmN0cmwsIHZvaWQgKmRhdGEs IHUzMiBzaXplKQogCQkJcmV0dXJuIC1FTk9ERVY7CiAJCWlmIChhcmdzLT52MC5zdGF0ZSA8IE5W SUZfQ09OVFJPTF9QU1RBVEVfQVRUUl9WMF9TVEFURV9DVVJSRU5UKQogCQkJcmV0dXJuIC1FSU5W QUw7Ci0JCWlmIChhcmdzLT52MC5zdGF0ZSA+PSBjbGstPnN0YXRlX25yKQorCQlpZiAoYXJncy0+ djAuc3RhdGUgPj0gY2xrLT5wc3RhdGVzX2NudCkKIAkJCXJldHVybiAtRUlOVkFMOwogCX0gZWxz ZQogCQlyZXR1cm4gcmV0OwpAQCAtMTAzLDcgKzEwMyw3IEBAIG52a21fY29udHJvbF9tdGhkX3Bz dGF0ZV9hdHRyKHN0cnVjdCBudmttX2NvbnRyb2wgKmN0cmwsIHZvaWQgKmRhdGEsIHUzMiBzaXpl KQogCQlyZXR1cm4gLUVJTlZBTDsKIAogCWlmIChhcmdzLT52MC5zdGF0ZSAhPSBOVklGX0NPTlRS T0xfUFNUQVRFX0FUVFJfVjBfU1RBVEVfQ1VSUkVOVCkgewotCQlsaXN0X2Zvcl9lYWNoX2VudHJ5 KHBzdGF0ZSwgJmNsay0+c3RhdGVzLCBoZWFkKSB7CisJCWxpc3RfZm9yX2VhY2hfZW50cnkocHN0 YXRlLCAmY2xrLT5wc3RhdGVzLCBoZWFkKSB7CiAJCQlpZiAoaSsrID09IGFyZ3MtPnYwLnN0YXRl KQogCQkJCWJyZWFrOwogCQl9CmRpZmYgLS1naXQgYS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9j bGsvYmFzZS5jIGIvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvY2xrL2Jhc2UuYwppbmRleCA2MjI5 Y2I2YS4uZWY2YWQ3ODMgMTAwNjQ0Ci0tLSBhL2RybS9ub3V2ZWF1L252a20vc3ViZGV2L2Nsay9i YXNlLmMKKysrIGIvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvY2xrL2Jhc2UuYwpAQCAtMjczLDcg KzI3Myw3IEBAIG52a21fcHN0YXRlX3Byb2coc3RydWN0IG52a21fY2xrICpjbGssIGludCBwc3Rh dGVfaWR4KQogCXN0cnVjdCBudmttX3BzdGF0ZSAqcHN0YXRlOwogCWludCByZXQsIGlkeCA9IDA7 CiAKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHBzdGF0ZSwgJmNsay0+c3RhdGVzLCBoZWFkKSB7CisJ bGlzdF9mb3JfZWFjaF9lbnRyeShwc3RhdGUsICZjbGstPnBzdGF0ZXMsIGhlYWQpIHsKIAkJaWYg KGlkeCsrID09IHBzdGF0ZV9pZHgpCiAJCQlicmVhazsKIAl9CkBAIC0zMTMsOSArMzEzLDkgQEAg bnZrbV9wc3RhdGVfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJCSAgIGNsay0+YXN0 YXRlLCBjbGstPnRlbXAsIGNsay0+ZHN0YXRlKTsKIAogCXBzdGF0ZV9pZHggPSBjbGstPnB3cnNy YyA/IGNsay0+dXN0YXRlX2FjIDogY2xrLT51c3RhdGVfZGM7Ci0JaWYgKGNsay0+c3RhdGVfbnIg JiYgcHN0YXRlX2lkeCAhPSBOVktNX0NMS19QU1RBVEVfQk9PVCkgeworCWlmIChjbGstPnBzdGF0 ZXNfY250ICYmIHBzdGF0ZV9pZHggIT0gTlZLTV9DTEtfUFNUQVRFX0JPT1QpIHsKIAkJcHN0YXRl X2lkeCA9IChwc3RhdGVfaWR4IDwgMCkgPyBjbGstPmFzdGF0ZSA6IHBzdGF0ZV9pZHg7Ci0JCXBz dGF0ZV9pZHggPSBtaW4ocHN0YXRlX2lkeCwgY2xrLT5zdGF0ZV9uciAtIDEpOworCQlwc3RhdGVf aWR4ID0gbWluKHBzdGF0ZV9pZHgsIGNsay0+cHN0YXRlc19jbnQgLSAxKTsKIAkJcHN0YXRlX2lk eCA9IG1heChwc3RhdGVfaWR4LCBjbGstPmRzdGF0ZSk7CiAJfSBlbHNlIHsKIAkJcHN0YXRlX2lk eCA9IGNsay0+cHN0YXRlX2lkeCA9IE5WS01fQ0xLX1BTVEFURV9CT09UOwpAQCAtNDYzLDggKzQ2 Myw4IEBAIG52a21fcHN0YXRlX25ldyhzdHJ1Y3QgbnZrbV9jbGsgKmNsaywgaW50IGlkeCkKIAl9 CiAKIAludmttX3BzdGF0ZV9pbmZvKGNsaywgcHN0YXRlKTsKLQlsaXN0X2FkZF90YWlsKCZwc3Rh dGUtPmhlYWQsICZjbGstPnN0YXRlcyk7Ci0JY2xrLT5zdGF0ZV9ucisrOworCWxpc3RfYWRkX3Rh aWwoJnBzdGF0ZS0+aGVhZCwgJmNsay0+cHN0YXRlcyk7CisJY2xrLT5wc3RhdGVzX2NudCsrOwog CXJldHVybiAwOwogfQogCkBAIC00ODEsNyArNDgxLDcgQEAgbnZrbV9jbGtfdXN0YXRlX3VwZGF0 ZShzdHJ1Y3QgbnZrbV9jbGsgKmNsaywgaW50IHJlcSkKIAkJcmV0dXJuIC1FTk9TWVM7CiAKIAlp ZiAocmVxICE9IC0xICYmIHJlcSAhPSAtMikgewotCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHBzdGF0 ZSwgJmNsay0+c3RhdGVzLCBoZWFkKSB7CisJCWxpc3RfZm9yX2VhY2hfZW50cnkocHN0YXRlLCAm Y2xrLT5wc3RhdGVzLCBoZWFkKSB7CiAJCQlpZiAocHN0YXRlLT5pZCA9PSByZXEpCiAJCQkJYnJl YWs7CiAJCQlpKys7CkBAIC01MzYsNyArNTM2LDcgQEAgbnZrbV9jbGtfYXN0YXRlKHN0cnVjdCBu dmttX2NsayAqY2xrLCBpbnQgcmVxLCBpbnQgcmVsLCBib29sIHdhaXQpCiB7CiAJaWYgKCFyZWwp IGNsay0+YXN0YXRlICA9IHJlcTsKIAlpZiAoIHJlbCkgY2xrLT5hc3RhdGUgKz0gcmVsOwotCWNs ay0+YXN0YXRlID0gbWluKGNsay0+YXN0YXRlLCBjbGstPnN0YXRlX25yIC0gMSk7CisJY2xrLT5h c3RhdGUgPSBtaW4oY2xrLT5hc3RhdGUsIGNsay0+cHN0YXRlc19jbnQgLSAxKTsKIAljbGstPmFz dGF0ZSA9IG1heChjbGstPmFzdGF0ZSwgMCk7CiAJcmV0dXJuIG52a21fcHN0YXRlX2NhbGMoY2xr LCB3YWl0KTsKIH0KQEAgLTU1NSw3ICs1NTUsNyBAQCBudmttX2Nsa19kc3RhdGUoc3RydWN0IG52 a21fY2xrICpjbGssIGludCByZXEsIGludCByZWwpCiB7CiAJaWYgKCFyZWwpIGNsay0+ZHN0YXRl ICA9IHJlcTsKIAlpZiAoIHJlbCkgY2xrLT5kc3RhdGUgKz0gcmVsOwotCWNsay0+ZHN0YXRlID0g bWluKGNsay0+ZHN0YXRlLCBjbGstPnN0YXRlX25yIC0gMSk7CisJY2xrLT5kc3RhdGUgPSBtaW4o Y2xrLT5kc3RhdGUsIGNsay0+cHN0YXRlc19jbnQgLSAxKTsKIAljbGstPmRzdGF0ZSA9IG1heChj bGstPmRzdGF0ZSwgMCk7CiAJcmV0dXJuIG52a21fcHN0YXRlX2NhbGMoY2xrLCB0cnVlKTsKIH0K QEAgLTYxNiw3ICs2MTYsNyBAQCBudmttX2Nsa19pbml0KHN0cnVjdCBudmttX3N1YmRldiAqc3Vi ZGV2KQogCWlmIChjbGstPmZ1bmMtPmluaXQpCiAJCXJldHVybiBjbGstPmZ1bmMtPmluaXQoY2xr KTsKIAotCWNsay0+YXN0YXRlID0gY2xrLT5zdGF0ZV9uciAtIDE7CisJY2xrLT5hc3RhdGUgPSBj bGstPnBzdGF0ZXNfY250IC0gMTsKIAljbGstPmRzdGF0ZSA9IDA7CiAJY2xrLT5wc3RhdGVfaWR4 ID0gTlZLTV9DTEtfUFNUQVRFX0JPT1Q7CiAJY2xrLT50ZW1wID0gOTA7IC8qIHJlYXNvbmFibGUg ZGVmYXVsdCB2YWx1ZSAqLwpAQCAtNjM2LDcgKzYzNiw3IEBAIG52a21fY2xrX2R0b3Ioc3RydWN0 IG52a21fc3ViZGV2ICpzdWJkZXYpCiAJaWYgKGNsay0+ZnVuYy0+cHN0YXRlcykKIAkJcmV0dXJu IGNsazsKIAotCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShwc3RhdGUsIHRlbXAsICZjbGstPnN0 YXRlcywgaGVhZCkgeworCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShwc3RhdGUsIHRlbXAsICZj bGstPnBzdGF0ZXMsIGhlYWQpIHsKIAkJbnZrbV9wc3RhdGVfZGVsKHBzdGF0ZSk7CiAJfQogCkBA IC02NzEsNyArNjcxLDcgQEAgbnZrbV9jbGtfY3Rvcihjb25zdCBzdHJ1Y3QgbnZrbV9jbGtfZnVu YyAqZnVuYywgc3RydWN0IG52a21fZGV2aWNlICpkZXZpY2UsCiAJfQogCiAJY2xrLT5mdW5jID0g ZnVuYzsKLQlJTklUX0xJU1RfSEVBRCgmY2xrLT5zdGF0ZXMpOworCUlOSVRfTElTVF9IRUFEKCZj bGstPnBzdGF0ZXMpOwogCWNsay0+ZG9tYWlucyA9IGZ1bmMtPmRvbWFpbnM7CiAJY2xrLT51c3Rh dGVfYWMgPSBOVktNX0NMS19QU1RBVEVfQk9PVDsKIAljbGstPnVzdGF0ZV9kYyA9IE5WS01fQ0xL X1BTVEFURV9CT09UOwpAQCAtNjg5LDggKzY4OSw4IEBAIG52a21fY2xrX2N0b3IoY29uc3Qgc3Ry dWN0IG52a21fY2xrX2Z1bmMgKmZ1bmMsIHN0cnVjdCBudmttX2RldmljZSAqZGV2aWNlLAogCQl9 IHdoaWxlIChyZXQgPT0gMCk7CiAJfSBlbHNlIHsKIAkJZm9yIChpZHggPSAwOyBpZHggPCBmdW5j LT5ucl9wc3RhdGVzOyBpZHgrKykKLQkJCWxpc3RfYWRkX3RhaWwoJmZ1bmMtPnBzdGF0ZXNbaWR4 XS5oZWFkLCAmY2xrLT5zdGF0ZXMpOwotCQljbGstPnN0YXRlX25yID0gZnVuYy0+bnJfcHN0YXRl czsKKwkJCWxpc3RfYWRkX3RhaWwoJmZ1bmMtPnBzdGF0ZXNbaWR4XS5oZWFkLCAmY2xrLT5wc3Rh dGVzKTsKKwkJY2xrLT5wc3RhdGVzX2NudCA9IGZ1bmMtPm5yX3BzdGF0ZXM7CiAJfQogCiAJcmV0 ID0gbnZrbV9ub3RpZnlfaW5pdChOVUxMLCAmZGV2aWNlLT5ldmVudCwgbnZrbV9jbGtfcHdyc3Jj LCB0cnVlLApkaWZmIC0tZ2l0IGEvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvcG11L2drMjBhLmMg Yi9kcm0vbm91dmVhdS9udmttL3N1YmRldi9wbXUvZ2syMGEuYwppbmRleCAwYzE2OTIxNS4uZjVh YmM2NjQgMTAwNjQ0Ci0tLSBhL2RybS9ub3V2ZWF1L252a20vc3ViZGV2L3BtdS9nazIwYS5jCisr KyBiL2RybS9ub3V2ZWF1L252a20vc3ViZGV2L3BtdS9nazIwYS5jCkBAIC03NSwxMiArNzUsMTMg QEAgZ2syMGFfcG11X2R2ZnNfZ2V0X3RhcmdldF9zdGF0ZShzdHJ1Y3QgZ2syMGFfcG11ICpwbXUs CiAJbGV2ZWwgPSBjdXJfbGV2ZWwgPSBjbGstPnBzdGF0ZV9pZHg7CiAKIAlpZiAobG9hZCA+IGRh dGEtPnBfbG9hZF9tYXgpIHsKLQkJbGV2ZWwgPSBtaW4oY2xrLT5zdGF0ZV9uciAtIDEsIGxldmVs ICsgKGNsay0+c3RhdGVfbnIgLyAzKSk7CisJCWxldmVsID0gbWluKGNsay0+cHN0YXRlc19jbnQg LSAxLAorCQkJICAgIGxldmVsICsgKGNsay0+cHN0YXRlc19jbnQgLyAzKSk7CiAJfSBlbHNlIHsK IAkJbGV2ZWwgKz0gKChsb2FkIC0gZGF0YS0+cF9sb2FkX3RhcmdldCkgKiAxMCAvCiAJCQkJZGF0 YS0+cF9sb2FkX3RhcmdldCkgLyAyOwogCQlsZXZlbCA9IG1heCgwLCBsZXZlbCk7Ci0JCWxldmVs ID0gbWluKGNsay0+c3RhdGVfbnIgLSAxLCBsZXZlbCk7CisJCWxldmVsID0gbWluKGNsay0+cHN0 YXRlc19jbnQgLSAxLCBsZXZlbCk7CiAJfQogCiAJbnZrbV90cmFjZSgmcG11LT5iYXNlLnN1YmRl diwgImN1ciBsZXZlbCA9ICVkLCBuZXcgbGV2ZWwgPSAlZFxuIiwKLS0gCjIuMTUuMAoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTm91dmVhdSBtYWlsaW5n IGxpc3QKTm91dmVhdUBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9ub3V2ZWF1Cg==