From: Sean Paul Subject: [PATCH 2/9] drm/msm: Don't track encoders in msm private struct Date: Wed, 5 Dec 2018 11:29:34 -0500 Message-ID: <20181205162958.25025-2-sean@poorly.run> References: <20181205162958.25025-1-sean@poorly.run> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181205162958.25025-1-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Sean Paul , jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+Cgpkcm0gY29yZSBhbHJlYWR5 IHRyYWNrcyB0aGlzLCBzbyB3ZSBjYW4ganVzdCBsZWFuIG9uIHRoYXQgaW5zdGVhZCBvZgp0cmFj a2luZyBvdXJzZWx2ZXMuCgpTaWduZWQtb2ZmLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9t aXVtLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfa21zLmMgIHwg MTYgKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL21kcDQvbWRwNF9r bXMuYyB8ICA1IC0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvbWRwNS9tZHA1X2ttcy5j IHwgMTIgKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuaCAgICAgICAg ICAgIHwgIDMgLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDI0IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9r bXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9rbXMuYwppbmRleCAzNzk2 YTI5NzhhNDBiLi5jYmViYzA0ZTJkNmVmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNt L2Rpc3AvZHB1MS9kcHVfa21zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEv ZHB1X2ttcy5jCkBAIC00NTcsOCArNDU3LDYgQEAgc3RhdGljIHZvaWQgX2RwdV9rbXNfaW5pdGlh bGl6ZV9kc2koc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJcmV0dXJuOwogCX0KIAotCXByaXYt PmVuY29kZXJzW3ByaXYtPm51bV9lbmNvZGVycysrXSA9IGVuY29kZXI7Ci0KIAlmb3IgKGkgPSAw OyBpIDwgQVJSQVlfU0laRShwcml2LT5kc2kpOyBpKyspIHsKIAkJaWYgKCFwcml2LT5kc2lbaV0p IHsKIAkJCURQVV9ERUJVRygiaW52YWxpZCBtc21fZHNpIGZvciBjdHJsICVkXG4iLCBpKTsKQEAg LTQ5OCw2ICs0OTYsNyBAQCBzdGF0aWMgdm9pZCBfZHB1X2ttc19kcm1fb2JqX2Rlc3Ryb3koc3Ry dWN0IGRwdV9rbXMgKmRwdV9rbXMpCiB7CiAJc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSAqcHJpdjsK IAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CisJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOwog CWludCBpOwogCiAJaWYgKCFkcHVfa21zKSB7CkBAIC01MjMsOSArNTIyLDggQEAgc3RhdGljIHZv aWQgX2RwdV9rbXNfZHJtX29ial9kZXN0cm95KHN0cnVjdCBkcHVfa21zICpkcHVfa21zKQogCQlw cml2LT5jb25uZWN0b3JzW2ldLT5mdW5jcy0+ZGVzdHJveShwcml2LT5jb25uZWN0b3JzW2ldKTsK IAlwcml2LT5udW1fY29ubmVjdG9ycyA9IDA7CiAKLQlmb3IgKGkgPSAwOyBpIDwgcHJpdi0+bnVt X2VuY29kZXJzOyBpKyspCi0JCXByaXYtPmVuY29kZXJzW2ldLT5mdW5jcy0+ZGVzdHJveShwcml2 LT5lbmNvZGVyc1tpXSk7Ci0JcHJpdi0+bnVtX2VuY29kZXJzID0gMDsKKwlkcm1fZm9yX2VhY2hf ZW5jb2RlcihlbmNvZGVyLCBkcHVfa21zLT5kZXYpCisJCWVuY29kZXItPmZ1bmNzLT5kZXN0cm95 KGVuY29kZXIpOwogfQogCiBzdGF0aWMgaW50IF9kcHVfa21zX2RybV9vYmpfaW5pdChzdHJ1Y3Qg ZHB1X2ttcyAqZHB1X2ttcykKQEAgLTUzNCw2ICs1MzIsNyBAQCBzdGF0aWMgaW50IF9kcHVfa21z X2RybV9vYmpfaW5pdChzdHJ1Y3QgZHB1X2ttcyAqZHB1X2ttcykKIAlzdHJ1Y3QgZHJtX3BsYW5l ICpwcmltYXJ5X3BsYW5lc1tNQVhfUExBTkVTXSwgKnBsYW5lOwogCXN0cnVjdCBkcm1fcGxhbmUg KmN1cnNvcl9wbGFuZXNbTUFYX1BMQU5FU10gPSB7IE5VTEwgfTsKIAlzdHJ1Y3QgZHJtX2NydGMg KmNydGM7CisJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOwogCiAJc3RydWN0IG1zbV9kcm1f cHJpdmF0ZSAqcHJpdjsKIAlzdHJ1Y3QgZHB1X21kc3NfY2ZnICpjYXRhbG9nOwpAQCAtNTU2LDcg KzU1NSw4IEBAIHN0YXRpYyBpbnQgX2RwdV9rbXNfZHJtX29ial9pbml0KHN0cnVjdCBkcHVfa21z ICpkcHVfa21zKQogCSAqLwogCV9kcHVfa21zX3NldHVwX2Rpc3BsYXlzKGRldiwgcHJpdiwgZHB1 X2ttcyk7CiAKLQltYXhfY3J0Y19jb3VudCA9IG1pbihjYXRhbG9nLT5taXhlcl9jb3VudCwgcHJp di0+bnVtX2VuY29kZXJzKTsKKwltYXhfY3J0Y19jb3VudCA9IG1pbihjYXRhbG9nLT5taXhlcl9j b3VudCwKKwkJCSAgICAgKHUzMilkZXYtPm1vZGVfY29uZmlnLm51bV9lbmNvZGVyKTsKIAogCS8q IENyZWF0ZSB0aGUgcGxhbmVzLCBrZWVwaW5nIHRyYWNrIG9mIG9uZSBwcmltYXJ5L2N1cnNvciBw ZXIgY3J0YyAqLwogCWZvciAoaSA9IDA7IGkgPCBjYXRhbG9nLT5zc3BwX2NvdW50OyBpKyspIHsK QEAgLTYwMSw4ICs2MDEsOCBAQCBzdGF0aWMgaW50IF9kcHVfa21zX2RybV9vYmpfaW5pdChzdHJ1 Y3QgZHB1X2ttcyAqZHB1X2ttcykKIAl9CiAKIAkvKiBBbGwgQ1JUQ3MgYXJlIGNvbXBhdGlibGUg d2l0aCBhbGwgZW5jb2RlcnMgKi8KLQlmb3IgKGkgPSAwOyBpIDwgcHJpdi0+bnVtX2VuY29kZXJz OyBpKyspCi0JCXByaXYtPmVuY29kZXJzW2ldLT5wb3NzaWJsZV9jcnRjcyA9ICgxIDw8IG1heF9j cnRjX2NvdW50KSAtIDE7CisJZHJtX2Zvcl9lYWNoX2VuY29kZXIoZW5jb2RlciwgZHB1X2ttcy0+ ZGV2KQorCQllbmNvZGVyLT5wb3NzaWJsZV9jcnRjcyA9ICgxIDw8IG1heF9jcnRjX2NvdW50KSAt IDE7CiAKIAlyZXR1cm4gMDsKIGZhaWw6CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNt L2Rpc3AvbWRwNC9tZHA0X2ttcy5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL21kcDQvbWRw NF9rbXMuYwppbmRleCBmN2Y2NzhjNTVlM2FjLi41MjdhNGVlMDY4MTlmIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvbWRwNC9tZHA0X2ttcy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9tc20vZGlzcC9tZHA0L21kcDRfa21zLmMKQEAgLTI2Niw3ICsyNjYsNiBAQCBzdGF0aWMg aW50IG1kcDRfbW9kZXNldF9pbml0X2ludGYoc3RydWN0IG1kcDRfa21zICptZHA0X2ttcywKIAkJ CXJldHVybiBQVFJfRVJSKGNvbm5lY3Rvcik7CiAJCX0KIAotCQlwcml2LT5lbmNvZGVyc1twcml2 LT5udW1fZW5jb2RlcnMrK10gPSBlbmNvZGVyOwogCQlwcml2LT5jb25uZWN0b3JzW3ByaXYtPm51 bV9jb25uZWN0b3JzKytdID0gY29ubmVjdG9yOwogCiAJCWJyZWFrOwpAQCAtMjg4LDkgKzI4Nyw2 IEBAIHN0YXRpYyBpbnQgbWRwNF9tb2Rlc2V0X2luaXRfaW50ZihzdHJ1Y3QgbWRwNF9rbXMgKm1k cDRfa21zLAogCQkJCXJldHVybiByZXQ7CiAJCQl9CiAJCX0KLQotCQlwcml2LT5lbmNvZGVyc1tw cml2LT5udW1fZW5jb2RlcnMrK10gPSBlbmNvZGVyOwotCiAJCWJyZWFrOwogCWNhc2UgRFJNX01P REVfRU5DT0RFUl9EU0k6CiAJCS8qIG9ubHkgRFNJMSBzdXBwb3J0ZWQgZm9yIG5vdyAqLwpAQCAt MzA5LDcgKzMwNSw2IEBAIHN0YXRpYyBpbnQgbWRwNF9tb2Rlc2V0X2luaXRfaW50ZihzdHJ1Y3Qg bWRwNF9rbXMgKm1kcDRfa21zLAogCiAJCS8qIFRPRE86IEFkZCBETUFfUyBsYXRlcj8gKi8KIAkJ ZW5jb2Rlci0+cG9zc2libGVfY3J0Y3MgPSAxIDw8IERNQV9QOwotCQlwcml2LT5lbmNvZGVyc1tw cml2LT5udW1fZW5jb2RlcnMrK10gPSBlbmNvZGVyOwogCiAJCXJldCA9IG1zbV9kc2lfbW9kZXNl dF9pbml0KHByaXYtPmRzaVtkc2lfaWRdLCBkZXYsIGVuY29kZXIpOwogCQlpZiAocmV0KSB7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvbWRwNS9tZHA1X2ttcy5jIGIvZHJp dmVycy9ncHUvZHJtL21zbS9kaXNwL21kcDUvbWRwNV9rbXMuYwppbmRleCA0ZmI3MDUzMmIwNDg0 Li43Y2Y1NDczNzk0NGU0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvbWRw NS9tZHA1X2ttcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9tZHA1L21kcDVfa21z LmMKQEAgLTMzMiw3ICszMzIsNiBAQCBzdGF0aWMgc3RydWN0IGRybV9lbmNvZGVyICpjb25zdHJ1 Y3RfZW5jb2RlcihzdHJ1Y3QgbWRwNV9rbXMgKm1kcDVfa21zLAogCQkJCQkgICAgIHN0cnVjdCBt ZHA1X2N0bCAqY3RsKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBtZHA1X2ttcy0+ZGV2 OwotCXN0cnVjdCBtc21fZHJtX3ByaXZhdGUgKnByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0 cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcjsKIAogCWVuY29kZXIgPSBtZHA1X2VuY29kZXJfaW5p dChkZXYsIGludGYsIGN0bCk7CkBAIC0zNDEsOCArMzQwLDYgQEAgc3RhdGljIHN0cnVjdCBkcm1f ZW5jb2RlciAqY29uc3RydWN0X2VuY29kZXIoc3RydWN0IG1kcDVfa21zICptZHA1X2ttcywKIAkJ cmV0dXJuIGVuY29kZXI7CiAJfQogCi0JcHJpdi0+ZW5jb2RlcnNbcHJpdi0+bnVtX2VuY29kZXJz KytdID0gZW5jb2RlcjsKLQogCXJldHVybiBlbmNvZGVyOwogfQogCkBAIC00NTUsNiArNDUyLDcg QEAgc3RhdGljIGludCBtb2Rlc2V0X2luaXQoc3RydWN0IG1kcDVfa21zICptZHA1X2ttcykKIHsK IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbWRwNV9rbXMtPmRldjsKIAlzdHJ1Y3QgbXNtX2Ry bV9wcml2YXRlICpwcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgZHJtX2VuY29kZXIg KmVuY29kZXI7CiAJY29uc3Qgc3RydWN0IG1kcDVfY2ZnX2h3ICpod19jZmc7CiAJdW5zaWduZWQg aW50IG51bV9jcnRjczsKIAlpbnQgaSwgcmV0LCBwaSA9IDAsIGNpID0gMDsKQEAgLTQ3OCw3ICs0 NzYsOCBAQCBzdGF0aWMgaW50IG1vZGVzZXRfaW5pdChzdHJ1Y3QgbWRwNV9rbXMgKm1kcDVfa21z KQogCSAqIHRoZSBNRFA1IGludGVyZmFjZXMpIHRoYW4gdGhlIG51bWJlciBvZiBsYXllciBtaXhl cnMgcHJlc2VudCBpbiBIVywKIAkgKiBidXQgbGV0J3MgYmUgc2FmZSBoZXJlIGFueXdheQogCSAq LwotCW51bV9jcnRjcyA9IG1pbihwcml2LT5udW1fZW5jb2RlcnMsIG1kcDVfa21zLT5udW1faHdt aXhlcnMpOworCW51bV9jcnRjcyA9IG1pbigodW5zaWduZWQpZGV2LT5tb2RlX2NvbmZpZy5udW1f ZW5jb2RlciwKKwkJCW1kcDVfa21zLT5udW1faHdtaXhlcnMpOwogCiAJLyoKIAkgKiBDb25zdHJ1 Y3QgcGxhbmVzIGVxdWFsaW5nIHRoZSBudW1iZXIgb2YgaHcgcGlwZXMsIGFuZCBDUlRDcyBmb3Ig dGhlCkBAIC01MjYsMTEgKzUyNSw4IEBAIHN0YXRpYyBpbnQgbW9kZXNldF9pbml0KHN0cnVjdCBt ZHA1X2ttcyAqbWRwNV9rbXMpCiAJICogTm93IHRoYXQgd2Uga25vdyB0aGUgbnVtYmVyIG9mIGNy dGNzIHdlJ3ZlIGNyZWF0ZWQsIHNldCB0aGUgcG9zc2libGUKIAkgKiBjcnRjcyBmb3IgdGhlIGVu Y29kZXJzCiAJICovCi0JZm9yIChpID0gMDsgaSA8IHByaXYtPm51bV9lbmNvZGVyczsgaSsrKSB7 Ci0JCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciA9IHByaXYtPmVuY29kZXJzW2ldOwotCisJ ZHJtX2Zvcl9lYWNoX2VuY29kZXIoZW5jb2RlciwgZGV2KQogCQllbmNvZGVyLT5wb3NzaWJsZV9j cnRjcyA9ICgxIDw8IG51bV9jcnRjcykgLSAxOwotCX0KIAogCXJldHVybiAwOwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9tc20v bXNtX2Rydi5oCmluZGV4IGZjNjc3ZGEwNmUzM2IuLmM2ZWZmMDhlODAxNzAgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20v bXNtX2Rydi5oCkBAIC0xOTcsOSArMTk3LDYgQEAgc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSB7CiAJ c3RydWN0IG1zbV9kcm1fdGhyZWFkIGRpc3BfdGhyZWFkW01BWF9DUlRDU107CiAJc3RydWN0IG1z bV9kcm1fdGhyZWFkIGV2ZW50X3RocmVhZFtNQVhfQ1JUQ1NdOwogCi0JdW5zaWduZWQgaW50IG51 bV9lbmNvZGVyczsKLQlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXJzW01BWF9FTkNPREVSU107 Ci0KIAl1bnNpZ25lZCBpbnQgbnVtX2JyaWRnZXM7CiAJc3RydWN0IGRybV9icmlkZ2UgKmJyaWRn ZXNbTUFYX0JSSURHRVNdOwogCi0tIApTZWFuIFBhdWwsIFNvZnR3YXJlIEVuZ2luZWVyLCBHb29n bGUgLyBDaHJvbWl1bSBPUwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KRnJlZWRyZW5vIG1haWxpbmcgbGlzdApGcmVlZHJlbm9AbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZnJl ZWRyZW5vCg==