From: John Stultz Subject: [PATCH v4 18/25] drm: kirin: Move drm driver to driver data Date: Mon, 19 Aug 2019 23:03:14 +0000 Message-ID: <20190819230321.56480-19-john.stultz@linaro.org> References: <20190819230321.56480-1-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by gabe.freedesktop.org (Postfix) with ESMTPS id 639226E47C for ; Mon, 19 Aug 2019 23:03:54 +0000 (UTC) Received: by mail-pl1-x644.google.com with SMTP id m12so1691220plt.5 for ; Mon, 19 Aug 2019 16:03:54 -0700 (PDT) In-Reply-To: <20190819230321.56480-1-john.stultz@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: lkml Cc: Xu YiPing , David Airlie , dri-devel , Xinliang Liu , Rongrong Zou , Sam Ravnborg List-Id: dri-devel@lists.freedesktop.org RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggbW92ZXMgdGhlIGRybV9kcml2ZXIKc3RydWN0dXJl IHRvIGJlIHVuZGVyIGRldmljZSBzcGVjaWZpYyBkcml2ZXIgZGF0YS4KClRoaXMgd2lsbCBhbGxv dyB1cyB0byBtb3JlIGVhc2lseSBhZGQgc3VwcG9ydCBmb3Iga2lyaW45NjAKaGFyZHdhcmUgd2l0 aCBsYXRlciBwYXRjaGVzLgoKQ2M6IFJvbmdyb25nIFpvdSA8em91cm9uZ3JvbmdAZ21haWwuY29t PgpDYzogWGlubGlhbmcgTGl1IDx6LmxpdXhpbmxpYW5nQGhpc2lsaWNvbi5jb20+CkNjOiBEYXZp ZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3 bGwuY2g+CkNjOiBkcmktZGV2ZWwgPGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmc+CkNj OiBTYW0gUmF2bmJvcmcgPHNhbUByYXZuYm9yZy5vcmc+CkFja2VkLWJ5OiBYaW5saWFuZyBMaXUg PHoubGl1eGlubGlhbmdAaGlzaWxpY29uLmNvbT4KUmV2aWV3ZWQtYnk6IFNhbSBSYXZuYm9yZyA8 c2FtQHJhdm5ib3JnLm9yZz4KU2lnbmVkLW9mZi1ieTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNp bGljb24uY29tPgpbanN0dWx0ejogUmV3b3JkZWQgY29tbWl0IG1lc3NhZ2VdClNpZ25lZC1vZmYt Ynk6IEpvaG4gU3R1bHR6IDxqb2huLnN0dWx0ekBsaW5hcm8ub3JnPgotLS0KIC4uLi9ncHUvZHJt L2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMgICB8IDI0ICsrKysrKysrKysrKysKIC4u Li9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmMgICB8IDM1ICstLS0tLS0t LS0tLS0tLS0tLS0KIC4uLi9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2Lmgg ICB8ICAxICsKIDMgZmlsZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9k cm1fYWRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUu YwppbmRleCAyZTI5YTIyOGYzZjQuLjdkYjJjZjkzYTI0NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMKQEAgLTEwNDksNiArMTA0OSwyOSBA QCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9tb2RlX2NvbmZpZ19mdW5jcyBhZGVfbW9kZV9jb25m aWdfZnVuY3MgPSB7CiAKIH07CiAKK0RFRklORV9EUk1fR0VNX0NNQV9GT1BTKGFkZV9mb3BzKTsK Kworc3RhdGljIHN0cnVjdCBkcm1fZHJpdmVyIGFkZV9kcml2ZXIgPSB7CisJLmRyaXZlcl9mZWF0 dXJlcyA9IERSSVZFUl9HRU0gfCBEUklWRVJfTU9ERVNFVCB8IERSSVZFUl9BVE9NSUMsCisJLmZv cHMgPSAmYWRlX2ZvcHMsCisJLmdlbV9mcmVlX29iamVjdF91bmxvY2tlZCA9IGRybV9nZW1fY21h X2ZyZWVfb2JqZWN0LAorCS5nZW1fdm1fb3BzID0gJmRybV9nZW1fY21hX3ZtX29wcywKKwkuZHVt Yl9jcmVhdGUgPSBkcm1fZ2VtX2NtYV9kdW1iX2NyZWF0ZV9pbnRlcm5hbCwKKwkucHJpbWVfaGFu ZGxlX3RvX2ZkCT0gZHJtX2dlbV9wcmltZV9oYW5kbGVfdG9fZmQsCisJLnByaW1lX2ZkX3RvX2hh bmRsZQk9IGRybV9nZW1fcHJpbWVfZmRfdG9faGFuZGxlLAorCS5nZW1fcHJpbWVfZ2V0X3NnX3Rh YmxlID0gZHJtX2dlbV9jbWFfcHJpbWVfZ2V0X3NnX3RhYmxlLAorCS5nZW1fcHJpbWVfaW1wb3J0 X3NnX3RhYmxlID0gZHJtX2dlbV9jbWFfcHJpbWVfaW1wb3J0X3NnX3RhYmxlLAorCS5nZW1fcHJp bWVfdm1hcCA9IGRybV9nZW1fY21hX3ByaW1lX3ZtYXAsCisJLmdlbV9wcmltZV92dW5tYXAgPSBk cm1fZ2VtX2NtYV9wcmltZV92dW5tYXAsCisJLmdlbV9wcmltZV9tbWFwID0gZHJtX2dlbV9jbWFf cHJpbWVfbW1hcCwKKworCS5uYW1lID0gImtpcmluIiwKKwkuZGVzYyA9ICJIaXNpbGljb24gS2ly aW42MjAgU29DIERSTSBEcml2ZXIiLAorCS5kYXRlID0gIjIwMTUwNzE4IiwKKwkubWFqb3IgPSAx LAorCS5taW5vciA9IDAsCit9OworCiBzdHJ1Y3Qga2lyaW5fZHJtX2RhdGEgYWRlX2RyaXZlcl9k YXRhID0gewogCS5udW1fcGxhbmVzID0gQURFX0NIX05VTSwKIAkucHJpbV9wbGFuZSA9IEFERV9D SDEsCkBAIC0xMDU2LDYgKzEwNzksNyBAQCBzdHJ1Y3Qga2lyaW5fZHJtX2RhdGEgYWRlX2RyaXZl cl9kYXRhID0gewogCS5jaGFubmVsX2Zvcm1hdHNfY250ID0gQVJSQVlfU0laRShjaGFubmVsX2Zv cm1hdHMpLAogCS5jb25maWdfbWF4X3dpZHRoID0gMjA0OCwKIAkuY29uZmlnX21heF9oZWlnaHQg PSAyMDQ4LAorCS5kcml2ZXIgPSAmYWRlX2RyaXZlciwKIAkuY3J0Y19oZWxwZXJfZnVuY3MgPSAm YWRlX2NydGNfaGVscGVyX2Z1bmNzLAogCS5jcnRjX2Z1bmNzID0gJmFkZV9jcnRjX2Z1bmNzLAog CS5wbGFuZV9oZWxwZXJfZnVuY3MgPSAmYWRlX3BsYW5lX2hlbHBlcl9mdW5jcywKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Rydi5jIGIvZHJp dmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmMKaW5kZXggMmFiMzJj MmUzZjk1Li5jOWZhYWE4NDhjYzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGlj b24va2lyaW4va2lyaW5fZHJtX2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24v a2lyaW4va2lyaW5fZHJtX2Rydi5jCkBAIC05MywzOCArOTMsNiBAQCBzdGF0aWMgaW50IGtpcmlu X2RybV9rbXNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXJldHVybiByZXQ7CiB9CiAK LURFRklORV9EUk1fR0VNX0NNQV9GT1BTKGtpcmluX2RybV9mb3BzKTsKLQotc3RhdGljIGludCBr aXJpbl9nZW1fY21hX2R1bWJfY3JlYXRlKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKLQkJCQkgICAg IHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJICAgICBzdHJ1Y3QgZHJtX21vZGVfY3JlYXRl X2R1bWIgKmFyZ3MpCi17Ci0JcmV0dXJuIGRybV9nZW1fY21hX2R1bWJfY3JlYXRlX2ludGVybmFs KGZpbGUsIGRldiwgYXJncyk7Ci19Ci0KLXN0YXRpYyBzdHJ1Y3QgZHJtX2RyaXZlciBraXJpbl9k cm1fZHJpdmVyID0gewotCS5kcml2ZXJfZmVhdHVyZXMJPSBEUklWRVJfR0VNIHwgRFJJVkVSX01P REVTRVQgfCBEUklWRVJfQVRPTUlDLAotCS5mb3BzCQkJPSAma2lyaW5fZHJtX2ZvcHMsCi0KLQku Z2VtX2ZyZWVfb2JqZWN0X3VubG9ja2VkID0gZHJtX2dlbV9jbWFfZnJlZV9vYmplY3QsCi0JLmdl bV92bV9vcHMJCT0gJmRybV9nZW1fY21hX3ZtX29wcywKLQkuZHVtYl9jcmVhdGUJCT0ga2lyaW5f Z2VtX2NtYV9kdW1iX2NyZWF0ZSwKLQotCS5wcmltZV9oYW5kbGVfdG9fZmQJPSBkcm1fZ2VtX3By aW1lX2hhbmRsZV90b19mZCwKLQkucHJpbWVfZmRfdG9faGFuZGxlCT0gZHJtX2dlbV9wcmltZV9m ZF90b19oYW5kbGUsCi0JLmdlbV9wcmltZV9nZXRfc2dfdGFibGUgPSBkcm1fZ2VtX2NtYV9wcmlt ZV9nZXRfc2dfdGFibGUsCi0JLmdlbV9wcmltZV9pbXBvcnRfc2dfdGFibGUgPSBkcm1fZ2VtX2Nt YV9wcmltZV9pbXBvcnRfc2dfdGFibGUsCi0JLmdlbV9wcmltZV92bWFwCQk9IGRybV9nZW1fY21h X3ByaW1lX3ZtYXAsCi0JLmdlbV9wcmltZV92dW5tYXAJPSBkcm1fZ2VtX2NtYV9wcmltZV92dW5t YXAsCi0JLmdlbV9wcmltZV9tbWFwCQk9IGRybV9nZW1fY21hX3ByaW1lX21tYXAsCi0KLQkubmFt ZQkJCT0gImtpcmluIiwKLQkuZGVzYwkJCT0gIkhpc2lsaWNvbiBLaXJpbiBTb0NzJyBEUk0gRHJp dmVyIiwKLQkuZGF0ZQkJCT0gIjIwMTUwNzE4IiwKLQkubWFqb3IJCQk9IDEsCi0JLm1pbm9yCQkJ PSAwLAotfTsKLQogc3RhdGljIGludCBjb21wYXJlX29mKHN0cnVjdCBkZXZpY2UgKmRldiwgdm9p ZCAqZGF0YSkKIHsKIAlyZXR1cm4gZGV2LT5vZl9ub2RlID09IGRhdGE7CkBAIC0xMzIsMTEgKzEw MCwxMCBAQCBzdGF0aWMgaW50IGNvbXBhcmVfb2Yoc3RydWN0IGRldmljZSAqZGV2LCB2b2lkICpk YXRhKQogCiBzdGF0aWMgaW50IGtpcmluX2RybV9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldikKIHsK LQlzdHJ1Y3QgZHJtX2RyaXZlciAqZHJpdmVyID0gJmtpcmluX2RybV9kcml2ZXI7CiAJc3RydWN0 IGRybV9kZXZpY2UgKmRybV9kZXY7CiAJaW50IHJldDsKIAotCWRybV9kZXYgPSBkcm1fZGV2X2Fs bG9jKGRyaXZlciwgZGV2KTsKKwlkcm1fZGV2ID0gZHJtX2Rldl9hbGxvYyhkcml2ZXJfZGF0YS0+ ZHJpdmVyLCBkZXYpOwogCWlmIChJU19FUlIoZHJtX2RldikpCiAJCXJldHVybiBQVFJfRVJSKGRy bV9kZXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tp cmluX2RybV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJt X2Rydi5oCmluZGV4IDQzYmU2NWY4MmEwMy4uZmRiZmM0YTkwZjIyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuaApAQCAtNDIsNiArNDIsNyBA QCBzdHJ1Y3Qga2lyaW5fZHJtX2RhdGEgewogCXUzMiBudW1fcGxhbmVzOwogCXUzMiBwcmltX3Bs YW5lOwogCisJc3RydWN0IGRybV9kcml2ZXIgKmRyaXZlcjsKIAljb25zdCBzdHJ1Y3QgZHJtX2Ny dGNfaGVscGVyX2Z1bmNzICpjcnRjX2hlbHBlcl9mdW5jczsKIAljb25zdCBzdHJ1Y3QgZHJtX2Ny dGNfZnVuY3MgKmNydGNfZnVuY3M7CiAJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVu Y3MgKnBsYW5lX2hlbHBlcl9mdW5jczsKLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVs