From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH v3 17/26] drm: kirin: Move plane number and primay plane in driver data Date: Thu, 1 Aug 2019 03:44:30 +0000 Message-ID: <20190801034439.98227-18-john.stultz@linaro.org> References: <20190801034439.98227-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 3ABFC6E34A for ; Thu, 1 Aug 2019 03:45:13 +0000 (UTC) Received: by mail-pl1-x644.google.com with SMTP id y8so31515666plr.12 for ; Wed, 31 Jul 2019 20:45:13 -0700 (PDT) In-Reply-To: <20190801034439.98227-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 , Rongrong Zou , Sam Ravnborg List-Id: dri-devel@lists.freedesktop.org RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggbW92ZXMgdGhlIG51bWJlciBvZgpwbGFuZXMgYW5k IHRoZSBwcmltYXJ5IHBsYW5lIHZhbHVlIHRvIHRoZSBraXJpbl9kcm1fZGF0YQpzdHJ1Y3R1cmUK ClRoaXMgd2lsbCBtYWtlIGl0IGVhc2llciB0byBhZGQgc3VwcG9ydCBmb3IgbmV3IGRldmljZXMK dmlhIGEgbmV3IGtpcmluX2RybV9kYXRhIHN0cnVjdHVyZS4KCkNjOiBSb25ncm9uZyBab3UgPHpv dXJvbmdyb25nQGdtYWlsLmNvbT4KQ2M6IERhdmlkIEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT4K Q2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4KQ2M6IGRyaS1kZXZlbCA8ZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZz4KQ2M6IFNhbSBSYXZuYm9yZyA8c2FtQHJhdm5ib3Jn Lm9yZz4KUmV2aWV3ZWQtYnk6IFNhbSBSYXZuYm9yZyA8c2FtQHJhdm5ib3JnLm9yZz4KU2lnbmVk LW9mZi1ieTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgpTaWduZWQtb2ZmLWJ5 OiBKb2huIFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KLS0tCiAuLi4vZ3B1L2RybS9o aXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jICAgfCAyMSArKysrKysrKysrKystLS0tLS0t CiAuLi4vZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Rydi5oICAgfCAgMiArKwog MiBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jIGIv ZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMKaW5kZXggYmNh MDgwZTE0MDA5Li5mYzBmNGMwNGQxYzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNp bGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGlj b24va2lyaW4va2lyaW5fZHJtX2FkZS5jCkBAIC0zNSw3ICszNSw2IEBACiAjaW5jbHVkZSAia2ly aW5fZHJtX2Rydi5oIgogI2luY2x1ZGUgImtpcmluX2FkZV9yZWcuaCIKIAotI2RlZmluZSBQUklN QVJZX0NICUFERV9DSDEgLyogcHJpbWFyeSBwbGFuZSAqLwogI2RlZmluZSBPVVRfT1ZMWQlBREVf T1ZMWTIgLyogb3V0cHV0IG92ZXJsYXkgY29tcG9zaXRvciAqLwogI2RlZmluZSBBREVfREVCVUcJ MQogCkBAIC05OTEsNyArOTkwLDcgQEAgc3RhdGljIGludCBhZGVfZHJtX2luaXQoc3RydWN0IHBs YXRmb3JtX2RldmljZSAqcGRldikKIAlzdHJ1Y3Qga2lyaW5fcGxhbmUgKmtwbGFuZTsKIAllbnVt IGRybV9wbGFuZV90eXBlIHR5cGU7CiAJaW50IHJldDsKLQlpbnQgaTsKKwl1MzIgY2g7CiAKIAlh ZGUgPSBkZXZtX2t6YWxsb2MoZGV2LT5kZXYsIHNpemVvZigqYWRlKSwgR0ZQX0tFUk5FTCk7CiAJ aWYgKCFhZGUpIHsKQEAgLTEwMTUsMTIgKzEwMTQsMTUgQEAgc3RhdGljIGludCBhZGVfZHJtX2lu aXQoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAkgKiBUT0RPOiBOb3cgb25seSBzdXBw b3J0IHByaW1hcnkgcGxhbmUsIG92ZXJsYXkgcGxhbmVzCiAJICogbmVlZCB0byBkby4KIAkgKi8K LQlmb3IgKGkgPSAwOyBpIDwgQURFX0NIX05VTTsgaSsrKSB7Ci0JCWtwbGFuZSA9ICZhZGUtPnBs YW5lc1tpXTsKLQkJa3BsYW5lLT5jaCA9IGk7CisJZm9yIChjaCA9IDA7IGNoIDwgYWRlX2RyaXZl cl9kYXRhLm51bV9wbGFuZXM7IGNoKyspIHsKKwkJa3BsYW5lID0gJmFkZS0+cGxhbmVzW2NoXTsK KwkJa3BsYW5lLT5jaCA9IGNoOwogCQlrcGxhbmUtPmh3X2N0eCA9IGN0eDsKLQkJdHlwZSA9IGkg PT0gUFJJTUFSWV9DSCA/IERSTV9QTEFORV9UWVBFX1BSSU1BUlkgOgotCQkJRFJNX1BMQU5FX1RZ UEVfT1ZFUkxBWTsKKworCQlpZiAoY2ggPT0gYWRlX2RyaXZlcl9kYXRhLnByaW1fcGxhbmUpCisJ CQl0eXBlID0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWTsKKwkJZWxzZQorCQkJdHlwZSA9IERSTV9Q TEFORV9UWVBFX09WRVJMQVk7CiAKIAkJcmV0ID0gYWRlX3BsYW5lX2luaXQoZGV2LCBrcGxhbmUs IHR5cGUpOwogCQlpZiAocmV0KQpAQCAtMTAyOCw3ICsxMDMwLDggQEAgc3RhdGljIGludCBhZGVf ZHJtX2luaXQoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAl9CiAKIAkvKiBjcnRjIGlu aXQgKi8KLQlyZXQgPSBhZGVfY3J0Y19pbml0KGRldiwgJmtjcnRjLT5iYXNlLCAmYWRlLT5wbGFu ZXNbUFJJTUFSWV9DSF0uYmFzZSk7CisJcmV0ID0gYWRlX2NydGNfaW5pdChkZXYsICZrY3J0Yy0+ YmFzZSwKKwkJCQkmYWRlLT5wbGFuZXNbYWRlX2RyaXZlcl9kYXRhLnByaW1fcGxhbmVdLmJhc2Up OwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEwNDcsNiArMTA1MCw4IEBAIHN0YXRp YyBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfY29uZmlnX2Z1bmNzIGFkZV9tb2RlX2NvbmZpZ19mdW5j cyA9IHsKIH07CiAKIHN0cnVjdCBraXJpbl9kcm1fZGF0YSBhZGVfZHJpdmVyX2RhdGEgPSB7CisJ Lm51bV9wbGFuZXMgPSBBREVfQ0hfTlVNLAorCS5wcmltX3BsYW5lID0gQURFX0NIMSwKIAkuY2hh bm5lbF9mb3JtYXRzID0gY2hhbm5lbF9mb3JtYXRzLAogCS5jaGFubmVsX2Zvcm1hdHNfY250ID0g QVJSQVlfU0laRShjaGFubmVsX2Zvcm1hdHMpLAogCS5jcnRjX2hlbHBlcl9mdW5jcyA9ICZhZGVf Y3J0Y19oZWxwZXJfZnVuY3MsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29u L2tpcmluL2tpcmluX2RybV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4v a2lyaW5fZHJtX2Rydi5oCmluZGV4IGNlOWRkY2NjNjdhOC4uMmI2NjBkZjYwMjkzIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuaApAQCAtMzcs NiArMzcsOCBAQCBzdHJ1Y3Qga2lyaW5fcGxhbmUgewogc3RydWN0IGtpcmluX2RybV9kYXRhIHsK IAljb25zdCB1MzIgKmNoYW5uZWxfZm9ybWF0czsKIAl1MzIgY2hhbm5lbF9mb3JtYXRzX2NudDsK Kwl1MzIgbnVtX3BsYW5lczsKKwl1MzIgcHJpbV9wbGFuZTsKIAogCWNvbnN0IHN0cnVjdCBkcm1f Y3J0Y19oZWxwZXJfZnVuY3MgKmNydGNfaGVscGVyX2Z1bmNzOwogCWNvbnN0IHN0cnVjdCBkcm1f Y3J0Y19mdW5jcyAqY3J0Y19mdW5jczsKLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVs