From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karol Herbst Subject: [PATCH 3/9] clk: Make pstate a pointer to nvkm_pstate Date: Sun, 5 Mar 2017 17:35:01 +0100 Message-ID: <20170305163507.2002-4-karolherbst@gmail.com> References: <20170305163507.2002-1-karolherbst@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170305163507.2002-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 V2Ugd2lsbCBhY2Nlc3MgdGhlIGN1cnJlbnQgc2V0IGNzdGF0ZSBhdCBsZWFzdCBldmVyeSBzZWNv bmQgYW5kIHRoaXMgc2FmZXMKdXMgc29tZSBDUFUgY3ljbGVzIGxvb2tpbmcgdGhlbSB1cCBldmVy eSBzZWNvbmQuCgpTaWduZWQtb2ZmLWJ5OiBLYXJvbCBIZXJic3QgPGthcm9saGVyYnN0QGdtYWls LmNvbT4KUmV2aWV3ZWQtYnk6IE1hcnRpbiBQZXJlcyA8bWFydGluLnBlcmVzQGZyZWUuZnI+Ci0t LQogZHJtL25vdXZlYXUvaW5jbHVkZS9udmttL3N1YmRldi9jbGsuaCB8ICA0ICsrKy0KIGRybS9u b3V2ZWF1L252a20vZW5naW5lL2RldmljZS9jdHJsLmMgfCAgNSArKysrLQogZHJtL25vdXZlYXUv bnZrbS9zdWJkZXYvY2xrL2Jhc2UuYyAgICB8IDE3ICsrKysrKysrKysrKy0tLS0tCiBkcm0vbm91 dmVhdS9udmttL3N1YmRldi9wbXUvZ2syMGEuYyAgIHwgMTggKysrKysrKy0tLS0tLS0tLS0tCiA0 IGZpbGVzIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RybS9ub3V2ZWF1L2luY2x1ZGUvbnZrbS9zdWJkZXYvY2xrLmggYi9kcm0vbm91dmVh dS9pbmNsdWRlL252a20vc3ViZGV2L2Nsay5oCmluZGV4IDY5OTQyYjE0Li4zNzI2M2I3ZiAxMDA2 NDQKLS0tIGEvZHJtL25vdXZlYXUvaW5jbHVkZS9udmttL3N1YmRldi9jbGsuaAorKysgYi9kcm0v bm91dmVhdS9pbmNsdWRlL252a20vc3ViZGV2L2Nsay5oCkBAIC0xMCw2ICsxMCw4IEBAIHN0cnVj dCBudmttX3BsbF92YWxzOwogI2RlZmluZSBOVktNX0NMS19DU1RBVEVfQkFTRSAgICAtMiAvKiBw c3RhdGUgYmFzZSAqLwogI2RlZmluZSBOVktNX0NMS19DU1RBVEVfSElHSEVTVCAtMyAvKiBoaWdo ZXN0IHBvc3NpYmxlICovCiAKKyNkZWZpbmUgTlZLTV9DTEtfUFNUQVRFX0RFRkFVTFQgLTEKKwog ZW51bSBudl9jbGtfc3JjIHsKIAludl9jbGtfc3JjX2NyeXN0YWwsCiAJbnZfY2xrX3NyY19ocmVm LApAQCAtOTUsNyArOTcsNyBAQCBzdHJ1Y3QgbnZrbV9jbGsgewogCiAJc3RydWN0IG52a21fbm90 aWZ5IHB3cnNyY19udGZ5OwogCWludCBwd3JzcmM7Ci0JaW50IHBzdGF0ZTsgLyogY3VycmVudCAq LworCXN0cnVjdCBudmttX3BzdGF0ZSAqcHN0YXRlOyAvKiBjdXJyZW50ICovCiAJaW50IHVzdGF0 ZV9hYzsgLyogdXNlci1yZXF1ZXN0ZWQgKC0xIGRpc2FibGVkLCAtMiBwZXJmbW9uKSAqLwogCWlu dCB1c3RhdGVfZGM7IC8qIHVzZXItcmVxdWVzdGVkICgtMSBkaXNhYmxlZCwgLTIgcGVyZm1vbikg Ki8KIAlpbnQgYXN0YXRlOyAvKiBwZXJmbW9uIGFkanVzdG1lbnQgKGJhc2UpICovCmRpZmYgLS1n aXQgYS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9kZXZpY2UvY3RybC5jIGIvZHJtL25vdXZlYXUv bnZrbS9lbmdpbmUvZGV2aWNlL2N0cmwuYwppbmRleCBiMGVjZTcxYS4uZGE3MDYyNmMgMTAwNjQ0 Ci0tLSBhL2RybS9ub3V2ZWF1L252a20vZW5naW5lL2RldmljZS9jdHJsLmMKKysrIGIvZHJtL25v dXZlYXUvbnZrbS9lbmdpbmUvZGV2aWNlL2N0cmwuYwpAQCAtNTIsNyArNTIsMTAgQEAgbnZrbV9j b250cm9sX210aGRfcHN0YXRlX2luZm8oc3RydWN0IG52a21fY29udHJvbCAqY3RybCwgdm9pZCAq ZGF0YSwgdTMyIHNpemUpCiAJCWFyZ3MtPnYwLnVzdGF0ZV9hYyA9IGNsay0+dXN0YXRlX2FjOwog CQlhcmdzLT52MC51c3RhdGVfZGMgPSBjbGstPnVzdGF0ZV9kYzsKIAkJYXJncy0+djAucHdyc3Jj ID0gY2xrLT5wd3JzcmM7Ci0JCWFyZ3MtPnYwLnBzdGF0ZSA9IGNsay0+cHN0YXRlOworCQlpZiAo Y2xrLT5wc3RhdGUpCisJCQlhcmdzLT52MC5wc3RhdGUgPSBjbGstPnBzdGF0ZS0+cHN0YXRlOwor CQllbHNlCisJCQlhcmdzLT52MC5wc3RhdGUgPSBOVktNX0NMS19QU1RBVEVfREVGQVVMVDsKIAl9 IGVsc2UgewogCQlhcmdzLT52MC5jb3VudCA9IDA7CiAJCWFyZ3MtPnYwLnVzdGF0ZV9hYyA9IE5W SUZfQ09OVFJPTF9QU1RBVEVfSU5GT19WMF9VU1RBVEVfRElTQUJMRTsKZGlmZiAtLWdpdCBhL2Ry bS9ub3V2ZWF1L252a20vc3ViZGV2L2Nsay9iYXNlLmMgYi9kcm0vbm91dmVhdS9udmttL3N1YmRl di9jbGsvYmFzZS5jCmluZGV4IDA3ZDUzMGVkLi4wZDRkOWZkZiAxMDA2NDQKLS0tIGEvZHJtL25v dXZlYXUvbnZrbS9zdWJkZXYvY2xrL2Jhc2UuYworKysgYi9kcm0vbm91dmVhdS9udmttL3N1YmRl di9jbGsvYmFzZS5jCkBAIC0yNzEsMTMgKzI3MSwxNiBAQCBudmttX3BzdGF0ZV9wcm9nKHN0cnVj dCBudmttX2NsayAqY2xrLCBpbnQgcHN0YXRlaSkKIAlzdHJ1Y3QgbnZrbV9wc3RhdGUgKnBzdGF0 ZTsKIAlpbnQgcmV0LCBpZHggPSAwOwogCisJaWYgKHBzdGF0ZWkgPT0gTlZLTV9DTEtfUFNUQVRF X0RFRkFVTFQpCisJCXJldHVybiAwOworCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShwc3RhdGUsICZj bGstPnN0YXRlcywgaGVhZCkgewogCQlpZiAoaWR4KysgPT0gcHN0YXRlaSkKIAkJCWJyZWFrOwog CX0KIAogCW52a21fZGVidWcoc3ViZGV2LCAic2V0dGluZyBwZXJmb3JtYW5jZSBzdGF0ZSAlZFxu IiwgcHN0YXRlaSk7Ci0JY2xrLT5wc3RhdGUgPSBwc3RhdGVpOworCWNsay0+cHN0YXRlID0gcHN0 YXRlOwogCiAJbnZrbV9wY2llX3NldF9saW5rKHBjaSwgcHN0YXRlLT5wY2llX3NwZWVkLCBwc3Rh dGUtPnBjaWVfd2lkdGgpOwogCkBAIC0zMDYsOCArMzA5LDEyIEBAIG52a21fY2xrX3VwZGF0ZV93 b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkJcmV0dXJuOwogCWNsay0+cHdyc3JjID0g cG93ZXJfc3VwcGx5X2lzX3N5c3RlbV9zdXBwbGllZCgpOwogCisJaWYgKGNsay0+cHN0YXRlKQor CQlwc3RhdGUgPSBjbGstPnBzdGF0ZS0+cHN0YXRlOworCWVsc2UKKwkJcHN0YXRlID0gTlZLTV9D TEtfUFNUQVRFX0RFRkFVTFQ7CiAJbnZrbV90cmFjZShzdWJkZXYsICJQICVkIFBXUiAlZCBVKEFD KSAlZCBVKERDKSAlZCBBICVkIFQgJWTCsENcbiIsCi0JCSAgIGNsay0+cHN0YXRlLCBjbGstPnB3 cnNyYywgY2xrLT51c3RhdGVfYWMsIGNsay0+dXN0YXRlX2RjLAorCQkgICBwc3RhdGUsIGNsay0+ cHdyc3JjLCBjbGstPnVzdGF0ZV9hYywgY2xrLT51c3RhdGVfZGMsCiAJCSAgIGNsay0+YXN0YXRl LCBjbGstPnRlbXApOwogCiAJcHN0YXRlID0gY2xrLT5wd3JzcmMgPyBjbGstPnVzdGF0ZV9hYyA6 IGNsay0+dXN0YXRlX2RjOwpAQCAtMzE1LDExICszMjIsMTEgQEAgbnZrbV9jbGtfdXBkYXRlX3dv cmsoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCQlwc3RhdGUgPSAocHN0YXRlIDwgMCkgPyBj bGstPmFzdGF0ZSA6IHBzdGF0ZTsKIAkJcHN0YXRlID0gbWluKHBzdGF0ZSwgY2xrLT5zdGF0ZV9u ciAtIDEpOwogCX0gZWxzZSB7Ci0JCXBzdGF0ZSA9IGNsay0+cHN0YXRlID0gLTE7CisJCXBzdGF0 ZSA9IE5WS01fQ0xLX1BTVEFURV9ERUZBVUxUOwogCX0KIAogCW52a21fdHJhY2Uoc3ViZGV2LCAi LT4gJWRcbiIsIHBzdGF0ZSk7Ci0JaWYgKHBzdGF0ZSAhPSBjbGstPnBzdGF0ZSkgeworCWlmICgh Y2xrLT5wc3RhdGUgfHwgcHN0YXRlICE9IGNsay0+cHN0YXRlLT5wc3RhdGUpIHsKIAkJaW50IHJl dCA9IG52a21fcHN0YXRlX3Byb2coY2xrLCBwc3RhdGUpOwogCQlpZiAocmV0KSB7CiAJCQludmtt X2Vycm9yKHN1YmRldiwgImVycm9yIHNldHRpbmcgcHN0YXRlICVkOiAlZFxuIiwKQEAgLTYxMCw3 ICs2MTcsNyBAQCBudmttX2Nsa19pbml0KHN0cnVjdCBudmttX3N1YmRldiAqc3ViZGV2KQogCQly ZXR1cm4gY2xrLT5mdW5jLT5pbml0KGNsayk7CiAKIAljbGstPmFzdGF0ZSA9IGNsay0+c3RhdGVf bnIgLSAxOwotCWNsay0+cHN0YXRlID0gLTE7CisJY2xrLT5wc3RhdGUgPSBOVUxMOwogCWNsay0+ dGVtcCA9IDkwOyAvKiByZWFzb25hYmxlIGRlZmF1bHQgdmFsdWUgKi8KIAludmttX2Nsa191cGRh dGUoY2xrLCB0cnVlKTsKIAlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RybS9ub3V2ZWF1L252a20v c3ViZGV2L3BtdS9nazIwYS5jIGIvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvcG11L2drMjBhLmMK aW5kZXggOWNhMGRiNzkuLjQzYTlhNzRhIDEwMDY0NAotLS0gYS9kcm0vbm91dmVhdS9udmttL3N1 YmRldi9wbXUvZ2syMGEuYworKysgYi9kcm0vbm91dmVhdS9udmttL3N1YmRldi9wbXUvZ2syMGEu YwpAQCAtNTUsMjQgKzU1LDIyIEBAIGdrMjBhX3BtdV9kdmZzX3RhcmdldChzdHJ1Y3QgZ2syMGFf cG11ICpwbXUsIGludCAqc3RhdGUpCiAJcmV0dXJuIG52a21fY2xrX2FzdGF0ZShjbGssICpzdGF0 ZSwgMCwgZmFsc2UpOwogfQogCi1zdGF0aWMgdm9pZAotZ2syMGFfcG11X2R2ZnNfZ2V0X2N1cl9z dGF0ZShzdHJ1Y3QgZ2syMGFfcG11ICpwbXUsIGludCAqc3RhdGUpCi17Ci0Jc3RydWN0IG52a21f Y2xrICpjbGsgPSBwbXUtPmJhc2Uuc3ViZGV2LmRldmljZS0+Y2xrOwotCi0JKnN0YXRlID0gY2xr LT5wc3RhdGU7Ci19Ci0KIHN0YXRpYyBpbnQKIGdrMjBhX3BtdV9kdmZzX2dldF90YXJnZXRfc3Rh dGUoc3RydWN0IGdrMjBhX3BtdSAqcG11LAogCQkJCWludCAqc3RhdGUsIGludCBsb2FkKQogewog CXN0cnVjdCBnazIwYV9wbXVfZHZmc19kYXRhICpkYXRhID0gcG11LT5kYXRhOwogCXN0cnVjdCBu dmttX2NsayAqY2xrID0gcG11LT5iYXNlLnN1YmRldi5kZXZpY2UtPmNsazsKKwlzdHJ1Y3QgbnZr bV9wc3RhdGUgKnBzdGF0ZSA9IGNsay0+cHN0YXRlOwogCWludCBjdXJfbGV2ZWwsIGxldmVsOwog CisJaWYgKCFwc3RhdGUpIHsKKwkJKnN0YXRlID0gMDsKKwkJcmV0dXJuIDE7CisJfQorCiAJLyog Rm9yIEdLMjBBLCB0aGUgcGVyZm9ybWFuY2UgbGV2ZWwgaXMgZGlyZWN0bHkgbWFwcGVkIHRvIHBz dGF0ZSAqLwotCWxldmVsID0gY3VyX2xldmVsID0gY2xrLT5wc3RhdGU7CisJbGV2ZWwgPSBjdXJf bGV2ZWwgPSBjbGstPnBzdGF0ZS0+cHN0YXRlOwogCiAJaWYgKGxvYWQgPiBkYXRhLT5wX2xvYWRf bWF4KSB7CiAJCWxldmVsID0gbWluKGNsay0+c3RhdGVfbnIgLSAxLCBsZXZlbCArIChjbGstPnN0 YXRlX25yIC8gMykpOwpAQCAtMTQyLDggKzE0MCw2IEBAIGdrMjBhX3BtdV9kdmZzX3dvcmsoc3Ry dWN0IG52a21fYWxhcm0gKmFsYXJtKQogCW52a21fdHJhY2Uoc3ViZGV2LCAidXRpbGl6YXRpb24g PSAlZCAlJSwgYXZnX2xvYWQgPSAlZCAlJVxuIiwKIAkJICAgdXRpbGl6YXRpb24sIGRhdGEtPmF2 Z19sb2FkKTsKIAotCWdrMjBhX3BtdV9kdmZzX2dldF9jdXJfc3RhdGUocG11LCAmc3RhdGUpOwot CiAJaWYgKGdrMjBhX3BtdV9kdmZzX2dldF90YXJnZXRfc3RhdGUocG11LCAmc3RhdGUsIGRhdGEt PmF2Z19sb2FkKSkgewogCQludmttX3RyYWNlKHN1YmRldiwgInNldCBuZXcgc3RhdGUgdG8gJWRc biIsIHN0YXRlKTsKIAkJZ2syMGFfcG11X2R2ZnNfdGFyZ2V0KHBtdSwgJnN0YXRlKTsKLS0gCjIu MTIuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTm91 dmVhdSBtYWlsaW5nIGxpc3QKTm91dmVhdUBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9ub3V2ZWF1Cg==