From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH 16/25] drm: kirin: Move plane number and primay plane in driver data Date: Tue, 23 Apr 2019 16:20:47 -0700 Message-ID: <1556061656-1733-17-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id 80DBB89789 for ; Tue, 23 Apr 2019 23:21:24 +0000 (UTC) Received: by mail-pg1-x543.google.com with SMTP id y3so8345320pgk.12 for ; Tue, 23 Apr 2019 16:21:24 -0700 (PDT) In-Reply-To: <1556061656-1733-1-git-send-email-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 , Chen Feng , dri-devel , Xinliang Liu , Xinwei Kong , Rongrong Zou List-Id: dri-devel@lists.freedesktop.org RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggbW92ZXMgdGhlIG51bWJlciBvZgpwbGFuZXMgYW5k IHRoZSBwcmltYXJ5IHBsYW5lIHZhbHVlIHRvIHRoZSBraXJpbl9kcm1fZGF0YQpzdHJ1Y3R1cmUK ClRoaXMgd2lsbCBtYWtlIGl0IGVhc2llciB0byBhZGQgc3VwcG9ydCBmb3IgbmV3IGRldmljZXMK dmlhIGEgbmV3IGtpcmluX2RybV9kYXRhIHN0cnVjdHVyZS4KCkNjOiBYaW5saWFuZyBMaXUgPHou bGl1eGlubGlhbmdAaGlzaWxpY29uLmNvbT4KQ2M6IFJvbmdyb25nIFpvdSA8em91cm9uZ3JvbmdA Z21haWwuY29tPgpDYzogWGlud2VpIEtvbmcgPGtvbmcua29uZ3hpbndlaUBoaXNpbGljb24uY29t PgpDYzogQ2hlbiBGZW5nIDxwdWNrLmNoZW5AaGlzaWxpY29uLmNvbT4KQ2M6IERhdmlkIEFpcmxp ZSA8YWlybGllZEBsaW51eC5pZT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4K Q2M6IGRyaS1kZXZlbCA8ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZz4KU2lnbmVkLW9m Zi1ieTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgpbanN0dWx0ejogUmV3b3Jk ZWQgY29taXQgbWVzc2FnZV0KU2lnbmVkLW9mZi1ieTogSm9obiBTdHVsdHogPGpvaG4uc3R1bHR6 QGxpbmFyby5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9k cm1fYWRlLmMgfCAyMSArKysrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9oaXNp bGljb24va2lyaW4va2lyaW5fZHJtX2Rydi5oIHwgIDIgKysKIDIgZmlsZXMgY2hhbmdlZCwgMTUg aW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNp bGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCmluZGV4IDBlNjgyNTcuLmI2YjFkYTYgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCkBAIC0z NSw3ICszNSw2IEBACiAjaW5jbHVkZSAia2lyaW5fZHJtX2Rydi5oIgogI2luY2x1ZGUgImtpcmlu X2FkZV9yZWcuaCIKIAotI2RlZmluZSBQUklNQVJZX0NICUFERV9DSDEgLyogcHJpbWFyeSBwbGFu ZSAqLwogI2RlZmluZSBPVVRfT1ZMWQlBREVfT1ZMWTIgLyogb3V0cHV0IG92ZXJsYXkgY29tcG9z aXRvciAqLwogI2RlZmluZSBBREVfREVCVUcJMQogCkBAIC05OTEsNyArOTkwLDcgQEAgc3RhdGlj IGludCBhZGVfZHJtX2luaXQoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAlzdHJ1Y3Qg a2lyaW5fcGxhbmUgKmtwbGFuZTsKIAllbnVtIGRybV9wbGFuZV90eXBlIHR5cGU7CiAJaW50IHJl dDsKLQlpbnQgaTsKKwl1MzIgY2g7CiAKIAlhZGUgPSBkZXZtX2t6YWxsb2MoZGV2LT5kZXYsIHNp emVvZigqYWRlKSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCFhZGUpIHsKQEAgLTEwMTUsMTIgKzEwMTQs MTUgQEAgc3RhdGljIGludCBhZGVfZHJtX2luaXQoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRl dikKIAkgKiBUT0RPOiBOb3cgb25seSBzdXBwb3J0IHByaW1hcnkgcGxhbmUsIG92ZXJsYXkgcGxh bmVzCiAJICogbmVlZCB0byBkby4KIAkgKi8KLQlmb3IgKGkgPSAwOyBpIDwgQURFX0NIX05VTTsg aSsrKSB7Ci0JCWtwbGFuZSA9ICZhZGUtPnBsYW5lc1tpXTsKLQkJa3BsYW5lLT5jaCA9IGk7CisJ Zm9yIChjaCA9IDA7IGNoIDwgYWRlX2RyaXZlcl9kYXRhLm51bV9wbGFuZXM7IGNoKyspIHsKKwkJ a3BsYW5lID0gJmFkZS0+cGxhbmVzW2NoXTsKKwkJa3BsYW5lLT5jaCA9IGNoOwogCQlrcGxhbmUt Pmh3X2N0eCA9IGN0eDsKLQkJdHlwZSA9IGkgPT0gUFJJTUFSWV9DSCA/IERSTV9QTEFORV9UWVBF X1BSSU1BUlkgOgotCQkJRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWTsKKworCQlpZiAoY2ggPT0gYWRl X2RyaXZlcl9kYXRhLnByaW1fcGxhbmUpCisJCQl0eXBlID0gRFJNX1BMQU5FX1RZUEVfUFJJTUFS WTsKKwkJZWxzZQorCQkJdHlwZSA9IERSTV9QTEFORV9UWVBFX09WRVJMQVk7CiAKIAkJcmV0ID0g YWRlX3BsYW5lX2luaXQoZGV2LCBrcGxhbmUsIHR5cGUpOwogCQlpZiAocmV0KQpAQCAtMTAyOCw3 ICsxMDMwLDggQEAgc3RhdGljIGludCBhZGVfZHJtX2luaXQoc3RydWN0IHBsYXRmb3JtX2Rldmlj ZSAqcGRldikKIAl9CiAKIAkvKiBjcnRjIGluaXQgKi8KLQlyZXQgPSBhZGVfY3J0Y19pbml0KGRl diwgJmtjcnRjLT5iYXNlLCAmYWRlLT5wbGFuZXNbUFJJTUFSWV9DSF0uYmFzZSk7CisJcmV0ID0g YWRlX2NydGNfaW5pdChkZXYsICZrY3J0Yy0+YmFzZSwKKwkJCQkmYWRlLT5wbGFuZXNbYWRlX2Ry aXZlcl9kYXRhLnByaW1fcGxhbmVdLmJhc2UpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAK QEAgLTEwNDcsNiArMTA1MCw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfY29uZmln X2Z1bmNzIGFkZV9tb2RlX2NvbmZpZ19mdW5jcyA9IHsKIH07CiAKIHN0cnVjdCBraXJpbl9kcm1f ZGF0YSBhZGVfZHJpdmVyX2RhdGEgPSB7CisJLm51bV9wbGFuZXMgPSBBREVfQ0hfTlVNLAorCS5w cmltX3BsYW5lID0gQURFX0NIMSwKIAkuY2hhbm5lbF9mb3JtYXRzID0gY2hhbm5lbF9mb3JtYXRz LAogCS5jaGFubmVsX2Zvcm1hdHNfY250ID0gQVJSQVlfU0laRShjaGFubmVsX2Zvcm1hdHMpLAog CS5jcnRjX2hlbHBlcl9mdW5jcyA9ICZhZGVfY3J0Y19oZWxwZXJfZnVuY3MsCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Rydi5oCmluZGV4IDcwMGEyMDMu LjU5ZmM4ODggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2ly aW5fZHJtX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5f ZHJtX2Rydi5oCkBAIC00MSw2ICs0MSw4IEBAIHN0cnVjdCBraXJpbl9wbGFuZSB7CiBzdHJ1Y3Qg a2lyaW5fZHJtX2RhdGEgewogCWNvbnN0IHUzMiAqY2hhbm5lbF9mb3JtYXRzOwogCXUzMiBjaGFu bmVsX2Zvcm1hdHNfY250OworCXUzMiBudW1fcGxhbmVzOworCXUzMiBwcmltX3BsYW5lOwogCiAJ Y29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5jcyAqY3J0Y19oZWxwZXJfZnVuY3M7CiAJ Y29uc3Qgc3RydWN0IGRybV9jcnRjX2Z1bmNzICpjcnRjX2Z1bmNzOwotLSAKMi43LjQKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87F85C10F03 for ; Tue, 23 Apr 2019 23:22:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57B68218D2 for ; Tue, 23 Apr 2019 23:22:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="AYPTBmaP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729208AbfDWXWW (ORCPT ); Tue, 23 Apr 2019 19:22:22 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:33826 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728886AbfDWXVY (ORCPT ); Tue, 23 Apr 2019 19:21:24 -0400 Received: by mail-pg1-f193.google.com with SMTP id v12so8375998pgq.1 for ; Tue, 23 Apr 2019 16:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yGwLHd/QsORrF/a1ijwtnZ+FE24YlLye7sgtz4UzsFE=; b=AYPTBmaPULPqQbE+sL+NfzdmJ/NSE/o6yP6F6cIWoYXmY0CqMRVYk/UqRfdeT4uWTu FQdwL60ib0zDfBNSOWNEuX694R0uH2Q9CsYZ6cr0WqglN6ZwWFkOV+H45t9HzzwIHfF6 TI6pgwM0e7lwezJzRWb8S/5jUO4lyyb+wNYhtZUOn36PlKzewKJIGzcfo2q+JVMNnxTJ wEiGjR5F0Vt9rkPbPUA6c5ldPVlCHSSYwiJlzTFoYBjKqKC8p1p3c4J1up/bV8J/s+Z8 AHvc9WgLr89MkVCoyF7TFjEgPCQ2l354ROa52gpn4GqMXWHhhrm6JSus+CzcxEkbheR+ 5IRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yGwLHd/QsORrF/a1ijwtnZ+FE24YlLye7sgtz4UzsFE=; b=WWfN2PJysnesHBFZov0Z3JC8lx3pnGmO5IDw2z4ROaaEEYTniY28rxLMUL/0KbJa8W W+/yZD0YGNNzDgm94NoLSsFAR0FZcWP8GFLuHx9Oa+bxkp4ekXulGUe+OVReqIrNMica cIPaGdrYKZ1GeR/Uqufvdlc3hN9TP2mxjSd1GcmG4JePovCtTxIWtl9X7fHcrN5M4XAT 7hfQMb+6eU2pFE0rpZ1/Fukoy/bBXnWyVLYXKVuWL/6fmBwxLLBLW5UPvg0V4YQKNvYF onpByDxWafAISiNHP99JO2IZnWq+QuvvhGaCpirTmTFUrsLWKZdOFh0jNfPrBIpKa1Df CurQ== X-Gm-Message-State: APjAAAX8SyrplL+tQiye86Oat3+/tYgTQJKFBNlBWznm6HMMBvUvVDFc Qtg2Jm+vb5wXfXIRZMeFC5C05yUu2Gc= X-Google-Smtp-Source: APXvYqx4xkcgjslUOx5dI/zefCl0o3ZiR4S9OssYEKtes1yNrH8CUQdAzRyAgv7ZkgB3p9XTSiFj6w== X-Received: by 2002:a62:5ec2:: with SMTP id s185mr30576470pfb.16.1556061683551; Tue, 23 Apr 2019 16:21:23 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c28sm6984235pgm.42.2019.04.23.16.21.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:22 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , dri-devel , John Stultz Subject: [PATCH 16/25] drm: kirin: Move plane number and primay plane in driver data Date: Tue, 23 Apr 2019 16:20:47 -0700 Message-Id: <1556061656-1733-17-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch moves the number of planes and the primary plane value to the kirin_drm_data structure This will make it easier to add support for new devices via a new kirin_drm_data structure. Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Signed-off-by: Xu YiPing [jstultz: Reworded comit message] Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 21 +++++++++++++-------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 2 ++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 0e68257..b6b1da6 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -35,7 +35,6 @@ #include "kirin_drm_drv.h" #include "kirin_ade_reg.h" -#define PRIMARY_CH ADE_CH1 /* primary plane */ #define OUT_OVLY ADE_OVLY2 /* output overlay compositor */ #define ADE_DEBUG 1 @@ -991,7 +990,7 @@ static int ade_drm_init(struct platform_device *pdev) struct kirin_plane *kplane; enum drm_plane_type type; int ret; - int i; + u32 ch; ade = devm_kzalloc(dev->dev, sizeof(*ade), GFP_KERNEL); if (!ade) { @@ -1015,12 +1014,15 @@ static int ade_drm_init(struct platform_device *pdev) * TODO: Now only support primary plane, overlay planes * need to do. */ - for (i = 0; i < ADE_CH_NUM; i++) { - kplane = &ade->planes[i]; - kplane->ch = i; + for (ch = 0; ch < ade_driver_data.num_planes; ch++) { + kplane = &ade->planes[ch]; + kplane->ch = ch; kplane->hw_ctx = ctx; - type = i == PRIMARY_CH ? DRM_PLANE_TYPE_PRIMARY : - DRM_PLANE_TYPE_OVERLAY; + + if (ch == ade_driver_data.prim_plane) + type = DRM_PLANE_TYPE_PRIMARY; + else + type = DRM_PLANE_TYPE_OVERLAY; ret = ade_plane_init(dev, kplane, type); if (ret) @@ -1028,7 +1030,8 @@ static int ade_drm_init(struct platform_device *pdev) } /* crtc init */ - ret = ade_crtc_init(dev, &kcrtc->base, &ade->planes[PRIMARY_CH].base); + ret = ade_crtc_init(dev, &kcrtc->base, + &ade->planes[ade_driver_data.prim_plane].base); if (ret) return ret; @@ -1047,6 +1050,8 @@ static const struct drm_mode_config_funcs ade_mode_config_funcs = { }; struct kirin_drm_data ade_driver_data = { + .num_planes = ADE_CH_NUM, + .prim_plane = ADE_CH1, .channel_formats = channel_formats, .channel_formats_cnt = ARRAY_SIZE(channel_formats), .crtc_helper_funcs = &ade_crtc_helper_funcs, diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h index 700a203..59fc888 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -41,6 +41,8 @@ struct kirin_plane { struct kirin_drm_data { const u32 *channel_formats; u32 channel_formats_cnt; + u32 num_planes; + u32 prim_plane; const struct drm_crtc_helper_funcs *crtc_helper_funcs; const struct drm_crtc_funcs *crtc_funcs; -- 2.7.4